drm/i915: refactor ring error state capture to use arrays

The code already got unwieldy and we want to dump more per-ring
registers.

Only functional change is that we now also capture the video
ring registers on ilk.

v2: fixup a refactor fumble spotted by Chris Wilson.

Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 5 insertions, 15 deletions

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1d10b8c26c98..766ef1c10ce5 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -152,25 +152,15 @@ struct drm_i915_error_state {
         u32 eir;
         u32 pgtbl_er;
         u32 pipestat[I915_MAX_PIPES];
-        u32 ipeir;
-        u32 ipehr;
-        u32 instdone;
-        u32 acthd;
+        u32 ipeir[I915_NUM_RINGS];
+        u32 ipehr[I915_NUM_RINGS];
+        u32 instdone[I915_NUM_RINGS];
+        u32 acthd[I915_NUM_RINGS];
         u32 error; /* gen6+ */
-        u32 bcs_acthd; /* gen6+ blt engine */
-        u32 bcs_ipehr;
-        u32 bcs_ipeir;
-        u32 bcs_instdone;
-        u32 bcs_seqno;
-        u32 vcs_acthd; /* gen6+ bsd engine */
-        u32 vcs_ipehr;
-        u32 vcs_ipeir;
-        u32 vcs_instdone;
-        u32 vcs_seqno;
         u32 instpm;
         u32 instps;
         u32 instdone1;
-        u32 seqno;
+        u32 seqno[I915_NUM_RINGS];
         u64 bbaddr;
         u64 fence[I915_MAX_NUM_FENCES];
         struct timeval time;