From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 6/6 v2] drm/i915: Make GSM void Date: Thu, 20 Dec 2012 16:33:28 +0100 Message-ID: <20121220153328.GH5737@phenom.ffwll.local> References: <1355855487-20424-1-git-send-email-ben@bwidawsk.net> <1355855487-20424-6-git-send-email-ben@bwidawsk.net> <20121219114523.GR29018@intel.com> <20121219192015.GA8902@lundgren> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 9998AE5C36 for ; Thu, 20 Dec 2012 07:31:52 -0800 (PST) Received: by mail-ee0-f52.google.com with SMTP id d17so1713454eek.25 for ; Thu, 20 Dec 2012 07:31:51 -0800 (PST) Content-Disposition: inline In-Reply-To: <20121219192015.GA8902@lundgren> 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: Ben Widawsky Cc: intel-gfx@lists.freedesktop.org, Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org On Wed, Dec 19, 2012 at 11:20:15AM -0800, Ben Widawsky wrote: > On Wed, Dec 19, 2012 at 01:45:23PM +0200, Ville Syrj=E4l=E4 wrote: > > On Tue, Dec 18, 2012 at 10:31:27AM -0800, Ben Widawsky wrote: > > > The iomapping of the register region has historically been a uint32_t > > > for the obvious reason that our PTE size was always 4b. In the future > > > however, we cannot make this assumption. > > > = > > > By making the type void, it makes the upcoming pointer math we will do > > > much easier, and hopefully gives the compiler opportunities to warn us > > > when we do stupid things. > > > = > > > v2: Cast to __iomem, caught by Ville > > > = > > > Signed-off-by: Ben Widawsky > > > --- > > > drivers/gpu/drm/i915/i915_drv.h | 2 +- > > > drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +++-- > > > 2 files changed, 4 insertions(+), 3 deletions(-) > > > = > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i= 915_drv.h > > > index 49f465a..90dfbd5 100644 > > > --- a/drivers/gpu/drm/i915/i915_drv.h > > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > > @@ -800,7 +800,7 @@ typedef struct drm_i915_private { > > > unsigned long stolen_base; /* limited to low memory (32-bit) */ > > > = > > > /** "Graphics Stolen Memory" holds the global PTEs */ > > > - uint32_t __iomem *gsm; > > > + void __iomem *gsm; > > > = > > > struct io_mapping *gtt_mapping; > > > phys_addr_t gtt_base_addr; > > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i9= 15/i915_gem_gtt.c > > > index b4c1e34..a52e784 100644 > > > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > > > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > > > @@ -290,7 +290,7 @@ void i915_gem_init_ppgtt(struct drm_device *dev) > > > return; > > > = > > > = > > > - pd_addr =3D dev_priv->mm.gsm + ppgtt->pd_offset/sizeof(gtt_pte_t); > > > + pd_addr =3D (gtt_pte_t *)dev_priv->mm.gsm + ppgtt->pd_offset/sizeof= (gtt_pte_t); > > = > > This cast is still missing __iomem. > = > That looks to be correct. But it wasn't introduced by me, right? Ie. > separate patch to fix it before this one? Very much, and right in this patch - pd_addr and mm.gsm are both __iomem, so you need to keep that annotation in the cast from void* to gtt_pte_t *. Fixed up and the remaining three patches applied. Thanks, Daniel -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch