The firmware may change between the hang and cat /sys/class/drm/card0/error
Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Michel Thierry <michel.thierry@xxxxxxxxx>
---
drivers/gpu/drm/i915/i915_drv.h | 4 ++++
drivers/gpu/drm/i915/i915_gpu_error.c | 22 ++++++++++++++++------
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a74b87b1b5a9..3b0cff05f5f7 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -953,6 +953,10 @@ struct i915_gpu_state {
u32 gab_ctl;
u32 gfx_mode;
+ /* Firmware load state */
+ u32 dmc_loaded;
+ u32 dmc_version;
+
u32 nfence;
u64 fence[I915_MAX_NUM_FENCES];
struct intel_overlay_error_state *overlay;
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 2b1d15668192..ae6f0092b046 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -623,13 +623,10 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
err_printf(m, "IOMMU enabled?: %d\n", error->iommu);
if (HAS_CSR(dev_priv)) {
- struct intel_csr *csr = &dev_priv->csr;
-
- err_printf(m, "DMC loaded: %s\n",
- yesno(csr->dmc_payload != NULL));
+ err_printf(m, "DMC loaded: %s\n", yesno(error->dmc_loaded));
err_printf(m, "DMC fw version: %d.%d\n",
- CSR_VERSION_MAJOR(csr->version),
- CSR_VERSION_MINOR(csr->version));
+ CSR_VERSION_MAJOR(error->dmc_version),
+ CSR_VERSION_MINOR(error->dmc_version));
}
err_printf(m, "EIR: 0x%08x\n", error->eir);
@@ -1585,6 +1582,18 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv,
error->pgtbl_er = I915_READ(PGTBL_ER);
}
+/* Capture all firmware related information. */
+static void i915_capture_fw_state(struct drm_i915_private *dev_priv,
+ struct i915_gpu_state *error)
+{
+ if (HAS_CSR(dev_priv)) {
+ struct intel_csr *csr = &dev_priv->csr;
+
+ error->dmc_loaded = (csr->dmc_payload != NULL);
+ error->dmc_version = csr->version;
+ }
+}
+
static void i915_error_capture_msg(struct drm_i915_private *dev_priv,
struct i915_gpu_state *error,
u32 engine_mask,
@@ -1650,6 +1659,7 @@ static int capture(void *data)
i915_capture_gen_state(error->i915, error);
i915_capture_reg_state(error->i915, error);
+ i915_capture_fw_state(error->i915, error);
i915_gem_record_fences(error->i915, error);
i915_gem_record_rings(error->i915, error);
i915_capture_active_buffers(error->i915, error);
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
