Skip to content

Commit 5701a66

Browse files
icklerodrigovivi
authored andcommitted
drm/i915: Redo "Remove i915_request.lock requirement for execution callbacks"
The reordering and rebasing of commit 2e4c6c1 ("drm/i915: Remove i915_request.lock requirement for execution callbacks") caused it to revert an earlier correction. Let us restore commit 99f0a64 ("drm/i915: Remove requirement for holding i915_request.lock for breadcrumbs") Fixes: 2e4c6c1 ("drm/i915: Remove i915_request.lock requirement for execution callbacks") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200925101107.27869-1-chris@chris-wilson.co.uk (cherry picked from commit 35faeb7) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent 4fe9af8 commit 5701a66

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

drivers/gpu/drm/i915/i915_request.c

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -593,16 +593,8 @@ bool __i915_request_submit(struct i915_request *request)
593593
__notify_execute_cb_irq(request);
594594

595595
/* We may be recursing from the signal callback of another i915 fence */
596-
if (!i915_request_signaled(request)) {
597-
spin_lock_nested(&request->lock, SINGLE_DEPTH_NESTING);
598-
599-
if (test_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT,
600-
&request->fence.flags) &&
601-
!i915_request_enable_breadcrumb(request))
602-
intel_engine_signal_breadcrumbs(engine);
603-
604-
spin_unlock(&request->lock);
605-
}
596+
if (test_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT, &request->fence.flags))
597+
i915_request_enable_breadcrumb(request);
606598

607599
return result;
608600
}

0 commit comments

Comments
 (0)