diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-05-03 10:39:24 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-05-03 11:08:53 +0100 |
| commit | 49f08598bf7a52eadebda851a5e8e6fa1dc2e15e (patch) | |
| tree | fb4c3a10cfb8d017875900e0fb31f7cb2c082ac0 | |
| parent | fc9d4d2b6fd5a21d7718137807d8587f6fd9e03c (diff) | |
| download | lwn-49f08598bf7a52eadebda851a5e8e6fa1dc2e15e.tar.gz lwn-49f08598bf7a52eadebda851a5e8e6fa1dc2e15e.zip | |
drm/i915: Switch the global i915.semaphores check to a local predicate
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@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170503093924.5320-7-chris@chris-wilson.co.uk
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_request.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |