On Tue, Apr 09, 2013 at 05:25:50PM -0700, Ben Widawsky wrote: > Looks like a some remnant from a rebase. > > Signed-off-by: Ben Widawsky <ben at bwidawsk.net> Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index b77e98c..50df194 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -815,7 +815,6 @@ int i915_gem_gtt_init(struct drm_device *dev) > { > struct drm_i915_private *dev_priv = dev->dev_private; > struct i915_gtt *gtt = &dev_priv->gtt; > - unsigned long gtt_size; > int ret; > > if (INTEL_INFO(dev)->gen <= 5) { > @@ -833,8 +832,6 @@ int i915_gem_gtt_init(struct drm_device *dev) > if (ret) > return ret; > > - gtt_size = (dev_priv->gtt.total >> PAGE_SHIFT) * sizeof(gen6_gtt_pte_t); > - > /* GMADR is the PCI mmio aperture into the global GTT. */ > DRM_INFO("Memory usable by graphics device = %zdM\n", > dev_priv->gtt.total >> 20); > -- > 1.8.2.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch