diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2020-01-22 14:02:43 +0000 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-02-12 17:04:33 +0200 |
| commit | 2aaaa5ee1c3d624a5bcad4ee25f954559c565bc2 (patch) | |
| tree | 31658cef2abfd6ed1d2386a6c1ac8cd5a7ff10b4 /drivers/gpu | |
| parent | a2f90f4ff3746c92896e2b7af8763d6fe5206dbc (diff) | |
| download | lwn-2aaaa5ee1c3d624a5bcad4ee25f954559c565bc2.tar.gz lwn-2aaaa5ee1c3d624a5bcad4ee25f954559c565bc2.zip | |
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: c3f1ed90e6ff ("drm/i915/gt: Allow temporary suspension of inflight requests")
References: https://gitlab.freedesktop.org/drm/intel/issues/997
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200122140243.495621-3-chris@chris-wilson.co.uk
(cherry picked from commit b4a9a149f91ea345da76bcfe3f8a39715ac346a6)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_request.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c index 9ed0d3bc7249..78a5f5d3c070 100644 --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -221,6 +221,8 @@ static void remove_from_engine(struct i915_request *rq) locked = engine; } list_del_init(&rq->sched.link); + clear_bit(I915_FENCE_FLAG_PQUEUE, &rq->fence.flags); + clear_bit(I915_FENCE_FLAG_HOLD, &rq->fence.flags); spin_unlock_irq(&locked->active.lock); } |