Skip to content

Commit 2aaaa5e

Browse files
icklejnikula
authored andcommitted
drm/i915: Mark the removal of the i915_request from the sched.link
Keep the rq->fence.flags consistent with the status of the rq->sched.link, and clear the associated bits when decoupling the link on retirement (as we may wish to inspect those flags independent of other state). Fixes: c3f1ed9 ("drm/i915/gt: Allow temporary suspension of inflight requests") References: https://gitlab.freedesktop.org/drm/intel/issues/997 Signed-off-by: Chris Wilson <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Reviewed-by: Tvrtko Ursulin <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit b4a9a14) Signed-off-by: Jani Nikula <[email protected]>
1 parent a2f90f4 commit 2aaaa5e

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/gpu/drm/i915/i915_request.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,8 @@ static void remove_from_engine(struct i915_request *rq)
221221
locked = engine;
222222
}
223223
list_del_init(&rq->sched.link);
224+
clear_bit(I915_FENCE_FLAG_PQUEUE, &rq->fence.flags);
225+
clear_bit(I915_FENCE_FLAG_HOLD, &rq->fence.flags);
224226
spin_unlock_irq(&locked->active.lock);
225227
}
226228

0 commit comments

Comments
 (0)