Commit 3ed124b2 authored Apr 08, 2013 by Ben Widawsky Committed by Daniel Vetter Apr 18, 2013

drm/i915: Rework PPGTT init code



This rework will help if future platforms choose to be a bit different.
Should have no functional impact.

v2: Don't move around the vtable setup (Daniel)

v3: Squash in the disable-by-default patch.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 3eb1c005

drivers/gpu/drm/i915/i915_gem_gtt.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -238,7 +238,11 @@ static int i915_gem_init_aliasing_ppgtt(struct drm_device *dev)
		ppgtt->dev = dev;
		ppgtt->scratch_page_dma_addr = dev_priv->gtt.scratch_page_dma;

		if (INTEL_INFO(dev)->gen < 8)
		ret = gen6_ppgtt_init(ppgtt);
		else
		BUG();

		if (ret)
		kfree(ppgtt);
		else