Commit 176f28eb authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/ringbuffer: Check that we setup the ringbuffer 



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent b4ce0f85

drivers/gpu/drm/i915/intel_ringbuffer.c

+3 −2
Original line number Diff line number Diff line
@@ -176,9 +176,10 @@ static int init_ring_common(struct intel_ring_buffer *ring) 
			((ring->gem_object->size - PAGE_SIZE) & RING_NR_PAGES)

			| RING_NO_REPORT | RING_VALID);



	head = I915_READ_HEAD(ring) & HEAD_ADDR;

	/* If the head is still not zero, the ring is dead */

	if (head != 0) {

	if ((I915_READ_CTL(ring) & RING_VALID) == 0 ||

	    I915_READ_START(ring) != obj_priv->gtt_offset ||

	    (I915_READ_HEAD(ring) & HEAD_ADDR) != 0) {

		DRM_ERROR("%s initialization failed "

				"ctl %08x head %08x tail %08x start %08x\n",

				ring->name,