Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e065f1f authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Joonas Lahtinen
Browse files

drm/i915/uc: Add intel_uc_fw_type_repr() 



Some of the DRM_NOTE messages are just using "uC" without specifying
which uc they are related to. We can be more user friendly.

v2: moved to the header (Joonas)

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 4f1cd3eb

drivers/gpu/drm/i915/intel_uc.c

+4 −2
Original line number Diff line number Diff line
@@ -182,10 +182,12 @@ static void fetch_uc_fw(struct drm_i915_private *dev_priv, 
	}



	if (uc_fw->major_ver_wanted == 0 && uc_fw->minor_ver_wanted == 0) {

		DRM_NOTE("Skipping uC firmware version check\n");

		DRM_NOTE("Skipping %s firmware version check\n",

			 intel_uc_fw_type_repr(uc_fw->type));

	} else if (uc_fw->major_ver_found != uc_fw->major_ver_wanted ||

		   uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) {

		DRM_NOTE("uC firmware version %d.%d, required %d.%d\n",

		DRM_NOTE("%s firmware version %d.%d, required %d.%d\n",

			 intel_uc_fw_type_repr(uc_fw->type),

			 uc_fw->major_ver_found, uc_fw->minor_ver_found,

			 uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);

		err = -ENOEXEC;

drivers/gpu/drm/i915/intel_uc.h

+14 −0
Original line number Diff line number Diff line
@@ -125,6 +125,20 @@ enum intel_uc_fw_type { 
	INTEL_UC_FW_TYPE_HUC

};



/* User-friendly representation of an enum */

static inline const char *intel_uc_fw_type_repr(enum intel_uc_fw_type type)

{

	switch (type) {

	case INTEL_UC_FW_TYPE_GUC:

		return "GuC";

	case INTEL_UC_FW_TYPE_HUC:

		return "HuC";

	default:

		MISSING_CASE(type);

		return "<invalid>";

	}

}



/*

 * This structure encapsulates all the data needed during the process

 * of fetching, caching, and loading the firmware image into the GuC.