From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 6/6 v2] drm/i915: Make GSM void Date: Wed, 19 Dec 2012 13:45:23 +0200 Message-ID: <20121219114523.GR29018@intel.com> References: <1355855487-20424-1-git-send-email-ben@bwidawsk.net> <1355855487-20424-6-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id D555BE5C76 for ; Wed, 19 Dec 2012 03:45:26 -0800 (PST) Content-Disposition: inline In-Reply-To: <1355855487-20424-6-git-send-email-ben@bwidawsk.net> 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 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/i915_= 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/i915/i= 915_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. > for (i =3D 0; i < ppgtt->num_pd_entries; i++) { > dma_addr_t pt_addr; > = > @@ -432,7 +432,8 @@ static void gen6_ggtt_bind_object(struct drm_i915_gem= _object *obj, > struct scatterlist *sg =3D st->sgl; > const int first_entry =3D obj->gtt_space->start >> PAGE_SHIFT; > const int max_entries =3D dev_priv->mm.gtt->gtt_total_entries - first_e= ntry; > - gtt_pte_t __iomem *gtt_entries =3D dev_priv->mm.gsm + first_entry; > + gtt_pte_t __iomem *gtt_entries =3D > + (gtt_pte_t __iomem *)dev_priv->mm.gsm + first_entry; > int unused, i =3D 0; > unsigned int len, m =3D 0; > dma_addr_t addr; > -- = > 1.8.0.1 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC