HuC depends on GuC, so be it.
v2: if version is 0, the fw was not loaded.
Suggested-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx>
Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Michel Thierry <michel.thierry@xxxxxxxxx>
---
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/i915_gpu_error.c | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 37cda64f07ad..98b78c7a012f 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -956,6 +956,7 @@ struct i915_gpu_state {
/* Firmware load state */
u32 dmc_version;
u32 guc_version;
+ u32 huc_version;
u32 nfence;
u64 fence[I915_MAX_NUM_FENCES];
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index bb1b9e916638..32639b1fc668 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -634,6 +634,10 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
err_printf(m, "GuC fw version: %d.%d\n",
error->guc_version >> 16,
error->guc_version & 0xffff);
+ err_printf(m, "HuC loaded: %s\n", yesno(error->huc_version));
+ err_printf(m, "HuC fw version: %d.%d\n",
+ error->huc_version >> 16,
+ error->huc_version & 0xffff);
}
err_printf(m, "EIR: 0x%08x\n", error->eir);
@@ -1601,10 +1605,15 @@ static void i915_capture_fw_state(struct drm_i915_private *dev_priv,
if (HAS_GUC(dev_priv)) {
struct intel_guc *guc = &dev_priv->guc;
+ struct intel_huc *huc = &dev_priv->huc;
error->guc_version =
(guc->fw.major_ver_found << 16 |
guc->fw.minor_ver_found);
+
+ error->huc_version =
+ (huc->fw.major_ver_found << 16 |
+ huc->fw.minor_ver_found);
}
}
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
