Commit d8d6e5eb authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

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: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190812073949.24076-1-michal.wajdeczko@intel.com
parent ae7a3166

drivers/gpu/drm/i915/gt/uc/intel_uc.c

+13 −5
Original line number Diff line number Diff line
@@ -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;