[PATCH 1/3] drm/i915/uc: Report loaded HuC firmware version

[Michal Wajdeczko]

We were reporting loaded GuC firmware version, but for the HuC we
only reported HuC status.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko at intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 32aa4509ba1d..2e26895a0d89 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -498,12 +498,19 @@ int intel_uc_init_hw(struct intel_uc *uc)
 			goto err_communication;
 	}
 
-	dev_info(i915->drm.dev, "GuC firmware version %u.%u\n",
+	dev_info(i915->drm.dev, "%s firmware version %u.%u\n",
+		 intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_GUC),
 		 guc->fw.major_ver_found, guc->fw.minor_ver_found);
 	dev_info(i915->drm.dev, "GuC submission %s\n",
 		 enableddisabled(intel_uc_supports_guc_submission(uc)));
-	dev_info(i915->drm.dev, "HuC %s\n",
-		 enableddisabled(intel_huc_is_authenticated(huc)));
+
+	if (intel_uc_supports_huc(uc)) {
+		dev_info(i915->drm.dev, "%s firmware version %u.%u\n",
+			 intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_HUC),
+			 huc->fw.major_ver_found, huc->fw.minor_ver_found);
+		dev_info(i915->drm.dev, "HuC %s\n",
+			 enableddisabled(intel_huc_is_authenticated(huc)));
+	}
 
 	return 0;
 
-- 
2.19.2