summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_irq.c
diff options
context:
space:
mode:
authorBen Widawsky <benjamin.widawsky@intel.com>2014-04-29 14:52:28 -0700
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-05-05 10:56:52 +0200
commitebc348b2ad59ed5c9b22269f422d12095b640ff5 (patch)
tree95214dba103316f526beb40ebdc4df4dff2dc260 /drivers/gpu/drm/i915/i915_irq.c
parent0d116a29a8f80260380f608c033dba42240e26a8 (diff)
downloadblackbird-op-linux-ebc348b2ad59ed5c9b22269f422d12095b640ff5.tar.gz
blackbird-op-linux-ebc348b2ad59ed5c9b22269f422d12095b640ff5.zip
drm/i915: Move semaphore specific ring members to struct
This will be helpful in abstracting some of the code in preparation for gen8 semaphores. v2: Move mbox stuff to a separate struct v3: Rebased over VCS2 work Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> (v1) Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index ed30a5ec2f3d..1e60f24736da 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2582,8 +2582,7 @@ semaphore_wait_to_signaller_ring(struct intel_ring_buffer *ring, u32 ipehr)
if(ring == signaller)
continue;
- if (sync_bits ==
- signaller->semaphore_register[ring->id])
+ if (sync_bits == signaller->semaphore.mbox.wait[ring->id])
return signaller;
}
}
OpenPOWER on IntegriCloud