[Intel-gfx] [PATCH 14/17] drm/i915: Extract semaphore error collection

[Ben Widawsky]

Signed-off-by: Ben Widawsky <b...@bwidawsk.net>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c 
b/drivers/gpu/drm/i915/i915_gpu_error.c
index a577640..ebdc8a7 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -695,6 +695,24 @@ i915_error_first_batchbuffer(struct drm_i915_private 
*dev_priv,
        return NULL;
 }
 
+static void gen6_record_semaphore_state(struct drm_i915_private *dev_priv,
+                                       struct drm_i915_error_state *error,
+                                       struct intel_ring_buffer *ring)
+{
+       error->semaphore_mboxes[ring->id][0]
+                       = I915_READ(RING_SYNC_0(ring->mmio_base));
+       error->semaphore_mboxes[ring->id][1]
+               = I915_READ(RING_SYNC_1(ring->mmio_base));
+       error->semaphore_seqno[ring->id][0] = ring->semaphore.sync_seqno[0];
+       error->semaphore_seqno[ring->id][1] = ring->semaphore.sync_seqno[1];
+
+       if (HAS_VEBOX(dev_priv->dev)) {
+               error->semaphore_mboxes[ring->id][2] =
+                       I915_READ(RING_SYNC_2(ring->mmio_base));
+               error->semaphore_seqno[ring->id][2] = 
ring->semaphore.sync_seqno[2];
+       }
+}
+
 static void i915_record_ring_state(struct drm_device *dev,
                                   struct drm_i915_error_state *error,
                                   struct intel_ring_buffer *ring)
@@ -704,18 +722,7 @@ static void i915_record_ring_state(struct drm_device *dev,
        if (INTEL_INFO(dev)->gen >= 6) {
                error->rc_psmi[ring->id] = I915_READ(ring->mmio_base + 0x50);
                error->fault_reg[ring->id] = I915_READ(RING_FAULT_REG(ring));
-               error->semaphore_mboxes[ring->id][0]
-                       = I915_READ(RING_SYNC_0(ring->mmio_base));
-               error->semaphore_mboxes[ring->id][1]
-                       = I915_READ(RING_SYNC_1(ring->mmio_base));
-               error->semaphore_seqno[ring->id][0] = 
ring->semaphore.sync_seqno[0];
-               error->semaphore_seqno[ring->id][1] = 
ring->semaphore.sync_seqno[1];
-       }
-
-       if (HAS_VEBOX(dev)) {
-               error->semaphore_mboxes[ring->id][2] =
-                       I915_READ(RING_SYNC_2(ring->mmio_base));
-               error->semaphore_seqno[ring->id][2] = 
ring->semaphore.sync_seqno[2];
+               gen6_record_semaphore_state(dev_priv, error, ring);
        }
 
        if (INTEL_INFO(dev)->gen >= 4) {
-- 
1.8.5.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx