drm/i915/gt: Do not suspend bonded requests if one hangs
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 20 Jan 2021 12:17:17 +0000 (12:17 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 21 Jan 2021 12:34:12 +0000 (12:34 +0000)
Treat the dependency between bonded requests as weak and leave the
remainder of the pair on the GPU if one hangs.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210120121718.26435-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/gt/intel_execlists_submission.c

index 740ff05..524c8b5 100644 (file)
@@ -1990,6 +1990,9 @@ static void __execlists_hold(struct i915_request *rq)
                        struct i915_request *w =
                                container_of(p->waiter, typeof(*w), sched);
 
+                       if (p->flags & I915_DEPENDENCY_WEAK)
+                               continue;
+
                        /* Leave semaphores spinning on the other engines */
                        if (w->engine != rq->engine)
                                continue;
@@ -2088,6 +2091,9 @@ static void __execlists_unhold(struct i915_request *rq)
                        struct i915_request *w =
                                container_of(p->waiter, typeof(*w), sched);
 
+                       if (p->flags & I915_DEPENDENCY_WEAK)
+                               continue;
+
                        /* Propagate any change in error status */
                        if (rq->fence.error)
                                i915_request_set_error_once(w, rq->fence.error);