---

yaml --- r: 228659 b: refs/heads/master c: 176f28e h: refs/heads/master i: 228657: 0d322a0 228655: 84fa8e9 v: v3
git-mirror · Oct 28, 2010 · b96a0e4 · b96a0e4
1 parent 65f07ca
commit b96a0e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4ce0f85159f77f208a62930f67b4e548576a5a3
+refs/heads/master: 176f28ebf4303b4f7e3a5bd8be7842a8bbecd9c3
diff --git a/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c b/trunk/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -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,