[Intel-gfx] [PATCH 06/10] drm/i915: Extract semaphore error collection

[Rodrigo Vivi]

From: Ben Widawsky benjamin.widaw...@intel.com

v2: s/ring_buffer/engine_cs (Rodrigo)

Reviewed-by: Rodrigo Vivi rodrigo.v...@intel.com
Signed-off-by: Ben Widawsky b...@bwidawsk.net
Signed-off-by: Rodrigo Vivi rodrigo.v...@intel.com
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 30 ++
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c 
b/drivers/gpu/drm/i915/i915_gpu_error.c
index 66cf417..9d42b6a 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -746,6 +746,23 @@ static void i915_gem_record_fences(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)
+{
+   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_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)
@@ -755,18 +772,7 @@ static void i915_record_ring_state(struct drm_device *dev,
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_seqno[0] = ring-semaphore.sync_seqno[0];
-   ering-semaphore_seqno[1] = ring-semaphore.sync_seqno[1];
-   }
-
-   if (HAS_VEBOX(dev)) {
-   ering-semaphore_mboxes[2] =
-   I915_READ(RING_SYNC_2(ring-mmio_base));
-   ering-semaphore_seqno[2] = ring-semaphore.sync_seqno[2];
+   gen6_record_semaphore_state(dev_priv, ring, ering);
}
 
if (INTEL_INFO(dev)-gen = 4) {
-- 
1.9.3

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

[Intel-gfx] [PATCH 06/10] drm/i915: Extract semaphore error collection

[Ben Widawsky]

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

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c 
b/drivers/gpu/drm/i915/i915_gpu_error.c
index 2d81985..a7eaab2 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -744,6 +744,23 @@ static void i915_gem_record_fences(struct drm_device *dev,
}
 }
 
+
+static void gen6_record_semaphore_state(struct drm_i915_private *dev_priv,
+   struct intel_ring_buffer *ring,
+   struct drm_i915_error_ring *ering)
+{
+   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_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_ring_buffer *ring,
   struct drm_i915_error_ring *ering)
@@ -753,18 +770,7 @@ static void i915_record_ring_state(struct drm_device *dev,
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_seqno[0] = ring-semaphore.sync_seqno[0];
-   ering-semaphore_seqno[1] = ring-semaphore.sync_seqno[1];
-   }
-
-   if (HAS_VEBOX(dev)) {
-   ering-semaphore_mboxes[2] =
-   I915_READ(RING_SYNC_2(ring-mmio_base));
-   ering-semaphore_seqno[2] = ring-semaphore.sync_seqno[2];
+   gen6_record_semaphore_state(dev_priv, ring, ering);
}
 
if (INTEL_INFO(dev)-gen = 4) {
-- 
1.9.2

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