From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/6] drm/i915: Colocate all GT access routines in the same file Date: Thu, 18 Jul 2013 14:18:19 +0200 Message-ID: <20130718121819.GR4550@phenom.ffwll.local> References: <1374001336-10339-1-git-send-email-chris@chris-wilson.co.uk> <20130718121559.GQ4550@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f174.google.com (mail-ea0-f174.google.com [209.85.215.174]) by gabe.freedesktop.org (Postfix) with ESMTP id F3D46E686F for ; Thu, 18 Jul 2013 05:18:18 -0700 (PDT) Received: by mail-ea0-f174.google.com with SMTP id o10so1687167eaj.5 for ; Thu, 18 Jul 2013 05:18:18 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20130718121559.GQ4550@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, Jul 18, 2013 at 02:15:59PM +0200, Daniel Vetter wrote: > On Tue, Jul 16, 2013 at 08:02:11PM +0100, Chris Wilson wrote: > > Currently, the register access code is split between i915_drv.c and > > intel_pm.c. It only bares a superficial resemblance to the reset of the > > powermanagement code, so move it all into its own file. This is to ease > > further patches to enforce serialised register access. > > > > v2: Scan for random abuse of I915_WRITE_NOTRACE > > v3: Take the opportunity to rename the GT functions as uncore. Uncore is > > the term used by the hardware design (and bspec) for all functions > > outside of the GPU (and CPU) cores in what is also known as the System > > Agent. > > > > Signed-off-by: Chris Wilson > > Reviewed-by: Ben Widawsky > > I've tried to apply it, but this patch does way to many things at once. So > the oddball change we have compared to the baseline of these patches > resulted in conflict hell. > > And it's too big for -fixes. Imo the following should be dropped, at least > for -fixes: > - renaming stuff from gt to uncore > - moving code to intel_uncore.c which we don't strictly need to apply the > bugfix like the reset code. > > So just a plain boring "move code together" patch. I've forgotten to add: For -fixes I want to only merge up to "drm/i915: Serialize all register access", so wrestling just those patches is ok. We can slurp the later ones (I do like them) once I've done a backmerge into dinq. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch