Commit add354dd authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Record BSD engine error state 



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 6aa56062

drivers/gpu/drm/i915/i915_debugfs.c

+6 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_drv.h

+5 −0
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/i915_irq.c

+9 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_reg.h

+4 −0
Original line number Diff line number Diff line
@@ -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