drm/i915/uc: Include HuC firmware version in summary

After successful uC initialization we are reporting GuC
firmware version and status of GuC submission and HuC.
Add HuC fw version to this report to make it complete,
but also skip all HuC info if HuC is not supported.

v2: squeeze to one line (Chris)

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190812073949.24076-1-michal.wajdeczko@intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index aa9701cfc754daa91a0d873d0303db80efa27be8..a3a5918c67824c4121090321cf9ed1a762f0655b 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -503,12 +503,20 @@ int intel_uc_init_hw(struct intel_uc *uc)
                        goto err_communication;
        }
 
-       dev_info(i915->drm.dev, "GuC firmware version %u.%u\n",
-                guc->fw.major_ver_found, guc->fw.minor_ver_found);
-       dev_info(i915->drm.dev, "GuC submission %s\n",
+       dev_info(i915->drm.dev, "%s firmware %s version %u.%u %s:%s\n",
+                intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_GUC), guc->fw.path,
+                guc->fw.major_ver_found, guc->fw.minor_ver_found,
+                "submission",
                 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 %s version %u.%u %s:%s\n",
+                        intel_uc_fw_type_repr(INTEL_UC_FW_TYPE_HUC),
+                        huc->fw.path,
+                        huc->fw.major_ver_found, huc->fw.minor_ver_found,
+                        "authenticated",
+                        yesno(intel_huc_is_authenticated(huc)));
+       }
 
        return 0;