diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2019-06-19 12:23:37 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-06-19 16:45:04 +0100 |
| commit | ce94bef9354e15b99a329e7c5a451ea0ffd59fb1 (patch) | |
| tree | cffd3fd467c1be22ee4b8545576966ae5bdfa0ad /drivers/gpu/drm/i915/i915_request.c | |
| parent | drm/i915: Update DRIVER_DATE to 20190619 (diff) | |
| download | wireguard-linux-ce94bef9354e15b99a329e7c5a451ea0ffd59fb1.tar.xz wireguard-linux-ce94bef9354e15b99a329e7c5a451ea0ffd59fb1.zip | |
drm/i915: Signal fence completion from i915_request_wait
With the upcoming change to automanaged i915_active, the intent is that
whenever we wait on the set of active fences, they are signaled and
collected. The requirement is that all successful returns from
i915_request_wait() signal the fence, so fixup the one remaining path
where we may return before the interrupt has been run.
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/20190619112341.9082-3-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_request.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_request.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c index a195a92d0105..31a631f0b9c3 100644 --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -1447,8 +1447,10 @@ long i915_request_wait(struct i915_request *rq, for (;;) { set_current_state(state); - if (i915_request_completed(rq)) + if (i915_request_completed(rq)) { + dma_fence_signal(&rq->fence); break; + } if (signal_pending_state(state, current)) { timeout = -ERESTARTSYS; |