drm/i915: Consolidate reset_request()

Always reset the requests of the guilty context, including the hung
request that we tell the hardware to skip. This should help if the
reprogram fails entirely, but more importantly makes the guilty path
more uniform (and simplifies the subsequent patch to tweak the cancelled
requests).

Signed-off-by: Chris Wilson <[email protected]>
Cc: Tvrtko Ursulin <[email protected]>
Cc: Mika Kuoppala <[email protected]>
Reviewed-by: Tvrtko Ursulin <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 91d726f8bdfa7eda8ba85d014b1d0c16c731e2f7..fb2433175a3d80c46a6f734ddd694fe4b2c996a3 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2658,13 +2658,13 @@ static void i915_gem_reset_engine(struct intel_engine_cs *engine)
                ring_hung = false;
        }
 
-       if (ring_hung)
+       if (ring_hung) {
                i915_gem_context_mark_guilty(hung_ctx);
-       else
+               reset_request(request);
+       } else {
                i915_gem_context_mark_innocent(hung_ctx);
-
-       if (!ring_hung)
                return;
+       }
 
        DRM_DEBUG_DRIVER("resetting %s to restart from tail of request 0x%x\n",
                         engine->name, request->global_seqno);