xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Add a few asserts around handling of i915_request_is_active()

Browse Source 
Let's assert that we only call the execute callbacks on making the
request active, and that we do not execute the request without calling
the callbacks.

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/20200529085809.23691-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson
2020-05-29 09:58:08 +01:00
parent a227569d1f
commit 98b7067a17
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/i915_request.c
View File

@@ -192,6 +192,7 @@ static void __notify_execute_cb(struct i915_request *rq)
lockdep_assert_held(&rq->lock); lockdep_assert_held(&rq->lock);
GEM_BUG_ON(!i915_request_is_active(rq));
if (llist_empty(&rq->execute_cb)) if (llist_empty(&rq->execute_cb))
return; return;
@@ -518,15 +519,15 @@ xfer: /* We may be recursing from the signal callback of another i915 fence */
if (!test_and_set_bit(I915_FENCE_FLAG_ACTIVE, &request->fence.flags)) { if (!test_and_set_bit(I915_FENCE_FLAG_ACTIVE, &request->fence.flags)) {
list_move_tail(&request->sched.link, &engine->active.requests); list_move_tail(&request->sched.link, &engine->active.requests);
clear_bit(I915_FENCE_FLAG_PQUEUE, &request->fence.flags); clear_bit(I915_FENCE_FLAG_PQUEUE, &request->fence.flags);
__notify_execute_cb(request);
} }
GEM_BUG_ON(!llist_empty(&request->execute_cb));
if (test_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT, &request->fence.flags) && if (test_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT, &request->fence.flags) &&
!test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &request->fence.flags) && !test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &request->fence.flags) &&
!i915_request_enable_breadcrumb(request)) !i915_request_enable_breadcrumb(request))
intel_engine_signal_breadcrumbs(engine); intel_engine_signal_breadcrumbs(engine);
__notify_execute_cb(request);
spin_unlock(&request->lock); spin_unlock(&request->lock);
return result; return result;