[Bug 99977] [SNB] [i915] GPU HANG: ecode 6:0:0x85fffffc, in aquaria [2893], reason: Hang on render ring, action: reset

[bugzilla-daemon at freedesktop.org]

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

--- Comment #12 from Chris Wilson <chris at chris-wilson.co.uk> ---
(In reply to Jan Nordholz from comment #10)
> Created attachment 129968 [details]
> kernel lockdep error, drm-tip, unpatched
> 
> Rebuilt the drm-tip kernel with lockdep on - got this.

Oh. I actually fixed that earlier and then wrote another patch with exactly the
same problem.

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 4c645f8ab05d..561deab3aff6 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -466,10 +466,11 @@ i915_gem_object_wait_reservation(struct
reservation_object *resv,
        dma_fence_put(excl);

        if (prune_fences && !__read_seqcount_retry(&resv->seq, seq)) {
-               reservation_object_lock(resv, NULL);
-               if (!__read_seqcount_retry(&resv->seq, seq))
-                       reservation_object_add_excl_fence(resv, NULL);
-               reservation_object_unlock(resv);
+               if (reservation_object_trylock(resv, NULL)) {
+                       if (!__read_seqcount_retry(&resv->seq, seq))
+                               reservation_object_add_excl_fence(resv, NULL);
+                       reservation_object_unlock(resv);
+               }
        }

        return timeout;

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