Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e7d12d4 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

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: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c81dbe05

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −2
Original line number Diff line number Diff line
@@ -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)