diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2013-04-08 21:43:51 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-18 03:43:13 -0400 |
commit | 1e7d12d46733d5a6ddf3f07a1f9ab75ec12d5a19 (patch) | |
tree | a5db9f1c919ce1142a21369f9402523178456688 | |
parent | c81dbe056317659ddd7d17779933e5f09d33ffeb (diff) |
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 <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_gtt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 923c70525f16..0f214fb1a75f 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) | |||
201 | ppgtt->pt_dma_addr[i] = pt_addr; | 201 | ppgtt->pt_dma_addr[i] = pt_addr; |
202 | } | 202 | } |
203 | 203 | ||
204 | ppgtt->scratch_page_dma_addr = dev_priv->gtt.scratch_page_dma; | ||
205 | |||
206 | ppgtt->clear_range(ppgtt, 0, | 204 | ppgtt->clear_range(ppgtt, 0, |
207 | ppgtt->num_pd_entries*I915_PPGTT_PT_ENTRIES); | 205 | ppgtt->num_pd_entries*I915_PPGTT_PT_ENTRIES); |
208 | 206 | ||
@@ -238,6 +236,7 @@ static int i915_gem_init_aliasing_ppgtt(struct drm_device *dev) | |||
238 | return -ENOMEM; | 236 | return -ENOMEM; |
239 | 237 | ||
240 | ppgtt->dev = dev; | 238 | ppgtt->dev = dev; |
239 | ppgtt->scratch_page_dma_addr = dev_priv->gtt.scratch_page_dma; | ||
241 | 240 | ||
242 | ret = gen6_ppgtt_init(ppgtt); | 241 | ret = gen6_ppgtt_init(ppgtt); |
243 | if (ret) | 242 | if (ret) |