[PATCH v2 1/3] drm/i915: Capture dmc firmware information before reset

Michel Thierry
2017-02-24T20:01:23Z

The firmware may change between the hang and cat /sys/class/drm/card0/error

v2: if version is 0, the fw was not loaded.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 3 +++
drivers/gpu/drm/i915/i915_gpu_error.c | 21 +++++++++++++++------
2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a74b87b1b5a9..47f8d5e47c8f 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -953,6 +953,9 @@ struct i915_gpu_state {
u32 gab_ctl;
u32 gfx_mode;

+ /* Firmware load state */
+ 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..4e6cf705c779 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_version));
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,17 @@ 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_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 +1658,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);