drm/i915: Record BSD engine error state

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 58cf60d89f6850839471f609b5ef21b0d4ed0a5e..56f7ced16f1aab26fc40434de53d5d18be5b75f0 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -634,6 +634,12 @@ static int i915_error_state(struct seq_file *m, void *unused)
                seq_printf(m, "  IPEIR:    0x%08x\n", error->bcs_ipeir);
                seq_printf(m, "  INSTDONE: 0x%08x\n", error->bcs_instdone);
                seq_printf(m, "  seqno:    0x%08x\n", error->bcs_seqno);
+               seq_printf(m, "Video (BSD) command stream:\n");
+               seq_printf(m, "  ACTHD:    0x%08x\n", error->vcs_acthd);
+               seq_printf(m, "  IPEHR:    0x%08x\n", error->vcs_ipehr);
+               seq_printf(m, "  IPEIR:    0x%08x\n", error->vcs_ipeir);
+               seq_printf(m, "  INSTDONE: 0x%08x\n", error->vcs_instdone);
+               seq_printf(m, "  seqno:    0x%08x\n", error->vcs_seqno);
        }
        seq_printf(m, "Render command stream:\n");
        seq_printf(m, "  ACTHD: 0x%08x\n", error->acthd);

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 05bff9e6a9cbf46b4371c6f84cda05de52e47c96..ec582b6d21134fbeb43dc843b4cd006020112e57 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -154,6 +154,11 @@ struct drm_i915_error_state {
        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;

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 4ff39dee7f1c4acf3fc368eaf05882f16b1039dd..90c071d377488ec918eb5e8e22213a200b9c1101 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -595,6 +595,7 @@ static void i915_capture_error_state(struct drm_device *dev)
        error->error = 0;
        if (INTEL_INFO(dev)->gen >= 6) {
                error->error = I915_READ(ERROR_GEN6);
+
                error->bcs_acthd = I915_READ(BCS_ACTHD);
                error->bcs_ipehr = I915_READ(BCS_IPEHR);
                error->bcs_ipeir = I915_READ(BCS_IPEIR);
@@ -602,6 +603,14 @@ static void i915_capture_error_state(struct drm_device *dev)
                error->bcs_seqno = 0;
                if (dev_priv->blt_ring.get_seqno)
                        error->bcs_seqno = dev_priv->blt_ring.get_seqno(&dev_priv->blt_ring);
+
+               error->vcs_acthd = I915_READ(VCS_ACTHD);
+               error->vcs_ipehr = I915_READ(VCS_IPEHR);
+               error->vcs_ipeir = I915_READ(VCS_IPEIR);
+               error->vcs_instdone = I915_READ(VCS_INSTDONE);
+               error->vcs_seqno = 0;
+               if (dev_priv->bsd_ring.get_seqno)
+                       error->vcs_seqno = dev_priv->bsd_ring.get_seqno(&dev_priv->bsd_ring);
        }
        if (INTEL_INFO(dev)->gen >= 4) {
                error->ipeir = I915_READ(IPEIR_I965);

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index b173e5b77f96d324564c528056a07b83d636f5d9..c79d4ba4fb1223bd6b5d14983943c980ceaee97c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -305,6 +305,10 @@
 #define INSTDONE       0x02090
 #define NOPID          0x02094
 #define HWSTAM         0x02098
+#define VCS_INSTDONE   0x1206C
+#define VCS_IPEIR      0x12064
+#define VCS_IPEHR      0x12068
+#define VCS_ACTHD      0x12074
 #define BCS_INSTDONE   0x2206C
 #define BCS_IPEIR      0x22064
 #define BCS_IPEHR      0x22068