With the increasing number of rings,
we probably have more information to print than we were printing.

Cc: Ben Widawsky <benjamin.widaw...@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.v...@intel.com>
---
 drivers/gpu/drm/i915/i915_gpu_error.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c 
b/drivers/gpu/drm/i915/i915_gpu_error.c
index 36a7960..0beeebf 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -242,6 +242,8 @@ static void i915_ring_error_state(struct 
drm_i915_error_state_buf *m,
                                  struct drm_device *dev,
                                  struct drm_i915_error_ring *ring)
 {
+       int i;
+
        if (!ring->valid)
                return;
 
@@ -264,23 +266,15 @@ static void i915_ring_error_state(struct 
drm_i915_error_state_buf *m,
        if (INTEL_INFO(dev)->gen >= 6) {
                err_printf(m, "  RC PSMI: 0x%08x\n", ring->rc_psmi);
                err_printf(m, "  FAULT_REG: 0x%08x\n", ring->fault_reg);
-               err_printf(m, "  SYNC_0: 0x%08x [last synced 0x%08x]\n",
-                          ring->semaphore_mboxes[0],
-                          ring->semaphore_seqno[0]);
-               err_printf(m, "  SYNC_1: 0x%08x [last synced 0x%08x]\n",
-                          ring->semaphore_mboxes[1],
-                          ring->semaphore_seqno[1]);
-               if (HAS_VEBOX(dev)) {
-                       err_printf(m, "  SYNC_2: 0x%08x [last synced 0x%08x]\n",
-                                  ring->semaphore_mboxes[2],
-                                  ring->semaphore_seqno[2]);
+               for (i = 0; i < I915_NUM_RINGS - 1; i++) {
+                       err_printf(m, "  SYNC_%d: 0x%08x [last synced 
0x%08x]\n",
+                                  i, ring->semaphore_mboxes[i],
+                                  ring->semaphore_seqno[i]);
                }
        }
        if (USES_PPGTT(dev)) {
                err_printf(m, "  GFX_MODE: 0x%08x\n", ring->vm_info.gfx_mode);
-
                if (INTEL_INFO(dev)->gen >= 8) {
-                       int i;
                        for (i = 0; i < 4; i++)
                                err_printf(m, "  PDP%d: 0x%016llx\n",
                                           i, ring->vm_info.pdp[i]);
-- 
1.9.3

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

Reply via email to