diff options
| author | Tvrtko Ursulin | 2016-06-29 17:09:30 +0200 |
|---|---|---|
| committer | Tvrtko Ursulin | 2016-06-30 18:20:45 +0200 |
| commit | c38c651b39a642d5900e9c8122cfc9bff4343538 (patch) | |
| tree | f7145ef6c459c732b80e9984b91e27d13e4605ba /drivers/gpu | |
| parent | drm/i915: Compact Gen8 semaphore initialization (diff) | |
| download | kernel-qcow2-linux-c38c651b39a642d5900e9c8122cfc9bff4343538.tar.gz kernel-qcow2-linux-c38c651b39a642d5900e9c8122cfc9bff4343538.tar.xz kernel-qcow2-linux-c38c651b39a642d5900e9c8122cfc9bff4343538.zip | |
drm/i915: Compact gen8_ring_sync
Store the semaphore offset in a temporary variable to avoid
having to get the VMA offset twice.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index aef6824b4c75..6d5e861fe6c1 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1547,6 +1547,7 @@ gen8_ring_sync(struct drm_i915_gem_request *waiter_req, { struct intel_engine_cs *waiter = waiter_req->engine; struct drm_i915_private *dev_priv = waiter_req->i915; + u64 offset = GEN8_WAIT_OFFSET(waiter, signaller->id); struct i915_hw_ppgtt *ppgtt; int ret; @@ -1558,10 +1559,8 @@ gen8_ring_sync(struct drm_i915_gem_request *waiter_req, MI_SEMAPHORE_GLOBAL_GTT | MI_SEMAPHORE_SAD_GTE_SDD); intel_ring_emit(waiter, seqno); - intel_ring_emit(waiter, - lower_32_bits(GEN8_WAIT_OFFSET(waiter, signaller->id))); - intel_ring_emit(waiter, - upper_32_bits(GEN8_WAIT_OFFSET(waiter, signaller->id))); + intel_ring_emit(waiter, lower_32_bits(offset)); + intel_ring_emit(waiter, upper_32_bits(offset)); intel_ring_advance(waiter); /* When the !RCS engines idle waiting upon a semaphore, they lose their |