Rather than use a global modparam, we can just check to see if the engine has semaphores configured upon it. Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> --- drivers/gpu/drm/i915/i915_gem_request.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index b30d432415d8..9074303c8888 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -711,13 +711,15 @@ i915_gem_request_await_request(struct drm_i915_gem_request *to, if (!seqno) goto await_dma_fence; - if (!i915.semaphores) { + if (!to->engine->semaphore.sync_to) { if (!__i915_gem_request_started(from, seqno)) goto await_dma_fence; if (!__i915_spin_request(from, seqno, TASK_INTERRUPTIBLE, 2)) goto await_dma_fence; } else { + GEM_BUG_ON(!from->engine->semaphore.signal); + if (seqno <= to->timeline->global_sync[from->engine->id]) return 0; -- 2.11.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx