From: Ben Widawsky Date: Tue, 9 Apr 2013 01:43:51 +0000 (-0700) Subject: drm/i915/ppgtt: Set scratch page "globally" X-Git-Tag: v3.12-rc1~464^2~131^2~193 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e7d12d46733d5a6ddf3f07a1f9ab75ec12d5a19;p=kernel%2Fkernel-generic.git drm/i915/ppgtt: Set scratch page "globally" The PPGTT scratch page is used for all gens, and doing it in the global part of our PPGTT setup makes the code a bit nicer. This was in a patch submitted earlier as part of the PPGTT cleanups. Grumpy maintainer must have missed it, and I didn't yell when appropriate. Apologies for everyone :-) v2: Update commit message Signed-off-by: Ben Widawsky Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 923c705..0f214fb 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -201,8 +201,6 @@ static int gen6_ppgtt_init(struct i915_hw_ppgtt *ppgtt) ppgtt->pt_dma_addr[i] = pt_addr; } - ppgtt->scratch_page_dma_addr = dev_priv->gtt.scratch_page_dma; - ppgtt->clear_range(ppgtt, 0, ppgtt->num_pd_entries*I915_PPGTT_PT_ENTRIES); @@ -238,6 +236,7 @@ static int i915_gem_init_aliasing_ppgtt(struct drm_device *dev) return -ENOMEM; ppgtt->dev = dev; + ppgtt->scratch_page_dma_addr = dev_priv->gtt.scratch_page_dma; ret = gen6_ppgtt_init(ppgtt); if (ret)