drm/i915: Extract semaphore error collection

v2: s/ring_buffer/engine_cs (Rodrigo)
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

drivers/gpu/drm/i915/i915_gpu_error.c

@@ -746,28 +746,34 @@ static void i915_gem_record_fences(struct drm_device *dev,
 	}
 }
 
-static void i915_record_ring_state(struct drm_device *dev,
+
+static void gen6_record_semaphore_state(struct drm_i915_private *dev_priv,
 					struct intel_engine_cs *ring,
 					struct drm_i915_error_ring *ering)
 {
-	struct drm_i915_private *dev_priv = dev->dev_private;
-
-	if (INTEL_INFO(dev)->gen >= 6) {
-		ering->rc_psmi = I915_READ(ring->mmio_base + 0x50);
-		ering->fault_reg = I915_READ(RING_FAULT_REG(ring));
-		ering->semaphore_mboxes[0]
-			= I915_READ(RING_SYNC_0(ring->mmio_base));
-		ering->semaphore_mboxes[1]
-			= I915_READ(RING_SYNC_1(ring->mmio_base));
+	ering->semaphore_mboxes[0] = I915_READ(RING_SYNC_0(ring->mmio_base));
+	ering->semaphore_mboxes[1] = I915_READ(RING_SYNC_1(ring->mmio_base));
 	ering->semaphore_seqno[0] = ring->semaphore.sync_seqno[0];
 	ering->semaphore_seqno[1] = ring->semaphore.sync_seqno[1];
-	}
 
-	if (HAS_VEBOX(dev)) {
+	if (HAS_VEBOX(dev_priv->dev)) {
 		ering->semaphore_mboxes[2] =
 			I915_READ(RING_SYNC_2(ring->mmio_base));
 		ering->semaphore_seqno[2] = ring->semaphore.sync_seqno[2];
 	}
+}
+
+static void i915_record_ring_state(struct drm_device *dev,
+				   struct intel_engine_cs *ring,
+				   struct drm_i915_error_ring *ering)
+{
+	struct drm_i915_private *dev_priv = dev->dev_private;
+
+	if (INTEL_INFO(dev)->gen >= 6) {
+		ering->rc_psmi = I915_READ(ring->mmio_base + 0x50);
+		ering->fault_reg = I915_READ(RING_FAULT_REG(ring));
+		gen6_record_semaphore_state(dev_priv, ring, ering);
+	}
 
 	if (INTEL_INFO(dev)->gen >= 4) {
 		ering->faddr = I915_READ(RING_DMA_FADD(ring->mmio_base));