[Bug 76554] [gm45 regression] [drm:init_ring_common]: *ERROR* render ring initialization failed

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=76554

--- Comment #22 from Chris Wilson <chris at chris-wilson.co.uk> ---
One more random rearrangement that should apply on top of that branch:

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c
b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 602432eaf346..bbcd6b5446f3 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -456,9 +456,9 @@ static bool stop_ring(struct intel_ring_buffer *ring)
         }
     }

+    I915_WRITE_CTL(ring, 0);
     I915_WRITE_HEAD(ring, 0);
     ring->write_tail(ring, 0);
-    I915_WRITE_CTL(ring, 0);

     if (!IS_GEN2(ring->dev)) {
         (void)I915_READ_CTL(ring);
@@ -513,18 +513,19 @@ static int init_ring_common(struct intel_ring_buffer
*ring)
     I915_WRITE_CTL(ring,
             ((ring->size - PAGE_SIZE) & RING_NR_PAGES)
             | RING_VALID);
+    I915_WRITE_HEAD(ring, 0);
+    ring->write_tail(ring, 0);

     /* If the head is still not zero, the ring is dead */
     if (wait_for((I915_READ_CTL(ring) & RING_VALID) != 0 &&
              I915_READ_START(ring) == i915_gem_obj_ggtt_offset(obj) &&
              (I915_READ_HEAD(ring) & HEAD_ADDR) == 0, 50)) {
         DRM_ERROR("%s initialization failed "
-                "ctl %08x head %08x tail %08x start %08x\n",
-                ring->name,
-                I915_READ_CTL(ring),
-                I915_READ_HEAD(ring),
-                I915_READ_TAIL(ring),
-                I915_READ_START(ring));
+              "ctl %08x (valid? %d) head %08x tail %08x start %08x [expected
%08x]\n",
+              ring->name,
+              I915_READ_CTL(ring), I915_READ_CTL(ring) & RING_VALID,
+              I915_READ_HEAD(ring), I915_READ_TAIL(ring),
+              I915_READ_START(ring), i915_gem_obj_ggtt_offset(obj));
         ret = -EIO;
         goto out;
     }

You may also want to cherry-pick ec9da60002b2390a3932db36d61d1d4e30c4ee21 from
the bug76554 branch to prevent uxa from freezing.

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20140402/37bc9669/attachment.html>