Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753897AbaDOGLF (ORCPT ); Tue, 15 Apr 2014 02:11:05 -0400 Received: from mail-ve0-f179.google.com ([209.85.128.179]:55663 "EHLO mail-ve0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751152AbaDOGLB (ORCPT ); Tue, 15 Apr 2014 02:11:01 -0400 MIME-Version: 1.0 In-Reply-To: References: <1395650554-31925-1-git-send-email-acourbot@nvidia.com> <1395650554-31925-3-git-send-email-acourbot@nvidia.com> <20140324215408.GB17218@mithrandir> <53479B08.80104@nvidia.com> From: Alexandre Courbot Date: Tue, 15 Apr 2014 15:10:39 +0900 Message-ID: Subject: Re: [PATCH 02/12] drm/nouveau/timer: skip calibration on GK20A To: Ben Skeggs Cc: Alexandre Courbot , Thierry Reding , "nouveau@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , Ben Skeggs , "linux-tegra@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 14, 2014 at 5:35 PM, Ben Skeggs wrote: > On Fri, Apr 11, 2014 at 5:34 PM, Alexandre Courbot wrote: >> On 04/11/2014 04:31 PM, Ben Skeggs wrote: >>> >>> On Fri, Apr 11, 2014 at 12:46 PM, Alexandre Courbot >>> wrote: >>>> >>>> On Wed, Mar 26, 2014 at 1:19 PM, Ben Skeggs wrote: >>>>> >>>>> On Tue, Mar 25, 2014 at 7:54 AM, Thierry Reding >>>>> wrote: >>>>>> >>>>>> On Mon, Mar 24, 2014 at 05:42:24PM +0900, Alexandre Courbot wrote: >>>>>>> >>>>>>> GK20A's timer is directly attached to the system timer and cannot be >>>>>>> calibrated. Skip the calibration phase on that chip since the >>>>>>> corresponding registers do not exist. >>>>>>> >>>>>>> Signed-off-by: Alexandre Courbot >>>>>>> --- >>>>>>> drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c | 19 >>>>>>> +++++++++++++------ >>>>>>> 1 file changed, 13 insertions(+), 6 deletions(-) >>>>>>> >>>>>>> diff --git a/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c >>>>>>> b/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c >>>>>>> index c0bdd10358d7..822fe0d8a871 100644 >>>>>>> --- a/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c >>>>>>> +++ b/drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c >>>>>>> @@ -185,6 +185,10 @@ nv04_timer_init(struct nouveau_object *object) >>>>>>> if (ret) >>>>>>> return ret; >>>>>>> >>>>>>> + /* gk20a does not have the calibration registers */ >>>>>>> + if (device->chipset == 0xea) >>>>>>> + goto skip_clk_init; >>>>>> >>>>>> >>>>>> I'm concerned that this won't scale in the future. Perhaps a better >>>>>> solution would be to add a "flags" or "features" field to struct >>>>>> nouveau_device along with feature bits such as HAS_CALIBRATION or >>>>>> similar. >>>>>> >>>>>> That way we don't have to touch this code for every new future Tegra >>>>>> chip. Unless perhaps if there's a reason to expect things to change in >>>>>> newer generations. >>>>> >>>>> I've already handled this in a slightly different way in the tree I'd >>>>> previously pointed Alex at (I think!), as I needed to do the same for >>>>> GM107. >>>>> >>>>> Should just be able to use that implementation (so, just change the >>>>> probe patch) here too. >>>> >>>> >>>> I will skip this patch and use your implementation then. Btw, >>>> shouldn't the source file for the GK20A implementation be named nvea.c >>>> instead of gk20a.c? >>> >>> For the Maxwell stuff I've been using "gm107" now too. Since we're >>> working with you guys these days it seems better to use the same names >>> for things ;) >> >> >> So would you like us to use the same naming scheme as well? So far all my >> patches use "nvea.c" whenever I need to add code. > If it's not too much of a problem at this point, then that'd be good. > Right before I send -next for the next merge window I'll likely do a > mass rename anyway, so if we can get your patches merged before then > (which would be really good!), it doesn't matter much. No problem, I will update the naming to follow what you did with the timer driver and gm107. Hopefully I will soon manage to carve out some time to rebase these patches and send v2. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/