Skip to content

Commit

Permalink
drm/i915: Execute signal callbacks from no-op i915_request_wait
Browse files Browse the repository at this point in the history
If we enter i915_request_wait() with an already completed request, but
unsignaled dma-fence, signal the fence before returning. This allows us
to execute any of the signal callbacks at the earliest opportunity.

v2: Also signal after busyspin success

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190614111053.25615-2-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Jun 14, 2019
1 parent a095076 commit 6e4e970
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/gpu/drm/i915/i915_request.c
Original file line number Diff line number Diff line change
Expand Up @@ -1437,7 +1437,7 @@ long i915_request_wait(struct i915_request *rq,
might_sleep();
GEM_BUG_ON(timeout < 0);

if (i915_request_completed(rq))
if (dma_fence_is_signaled(&rq->fence))
return timeout;

if (!timeout)
Expand Down Expand Up @@ -1470,8 +1470,10 @@ long i915_request_wait(struct i915_request *rq,
* duration, which we currently lack.
*/
if (CONFIG_DRM_I915_SPIN_REQUEST &&
__i915_spin_request(rq, state, CONFIG_DRM_I915_SPIN_REQUEST))
__i915_spin_request(rq, state, CONFIG_DRM_I915_SPIN_REQUEST)) {
dma_fence_signal(&rq->fence);
goto out;
}

/*
* This client is about to stall waiting for the GPU. In many cases
Expand Down

0 comments on commit 6e4e970

Please sign in to comment.