Commit b9695405 authored by Chris Wilson's avatar Chris Wilson

drm/i915/gt: Ignore repeated attempts to suspend request flow across reset

Before reseting the engine, we suspend the execution of the guilty
request, so that we can continue execution with a new context while we
slowly compress the captured error state for the guilty context. However,
if the reset fails, we will promptly attempt to reset the same request
again, and discover the ongoing capture. Ignore the second attempt to
suspend and capture the same request.

Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1168
Fixes: 32ff621f ("drm/i915/gt: Allow temporary suspension of inflight requests")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: <stable@vger.kernel.org> # v5.7+
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201204151234.19729-1-chris@chris-wilson.co.uk
parent ba38b79e
...@@ -2823,6 +2823,9 @@ static void __execlists_hold(struct i915_request *rq) ...@@ -2823,6 +2823,9 @@ static void __execlists_hold(struct i915_request *rq)
static bool execlists_hold(struct intel_engine_cs *engine, static bool execlists_hold(struct intel_engine_cs *engine,
struct i915_request *rq) struct i915_request *rq)
{ {
if (i915_request_on_hold(rq))
return false;
spin_lock_irq(&engine->active.lock); spin_lock_irq(&engine->active.lock);
if (i915_request_completed(rq)) { /* too late! */ if (i915_request_completed(rq)) { /* too late! */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment