Skip to content

Commit

Permalink
drm/i915: Signal fence completion from i915_request_wait
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Chris Wilson committed Jun 19, 2019
1 parent 1ee008f commit ce94bef
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/gpu/drm/i915/i915_request.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit ce94bef

Please sign in to comment.