Commit d595bd4b authored Nov 25, 2013 by Ben Widawsky Committed by Daniel Vetter Nov 26, 2013

drm/i915: Fix BDW PPGTT error path



When we fail for some reason on loading the PDPs, it would be wise to
disable the PPGTT in the ring registers. If we do not do this, we have
undefined results.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent d629336b

drivers/gpu/drm/i915/i915_gem_gtt.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -238,10 +238,16 @@ static int gen8_ppgtt_enable(struct drm_device *dev)
		for_each_ring(ring, dev_priv, j) {
		ret = gen8_write_pdp(ring, i, addr);
		if (ret)
		return ret;
		goto err_out;
		}
		}
		return 0;

		err_out:
		for_each_ring(ring, dev_priv, j)
		I915_WRITE(RING_MODE_GEN7(ring),
		_MASKED_BIT_DISABLE(GFX_PPGTT_ENABLE));
		return ret;
		}

		static void gen8_ppgtt_clear_range(struct i915_address_space *vm,