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

Commit f2bb09b6 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Downgrade scare message for unknown HuC firmware 



If we haven't shipped and enabled firmware for a particular platform,
there is nothing the user can do about it. Don't scare the user with an
unactionable, unidentifiable warning!

<6> [310.769452] i915 0000:00:02.0: GuC: No firmware known for this platform!
<4> [310.769458] [drm] HuC: No firmware known for this platform!

Unify both GuC/HuC messages to include the device for which we lack the
firmware, and provide the platform name as an aide-memoire.

v2: Move and refine the message to common site of intel_uc_fw_fetch.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190108150246.1471-1-chris@chris-wilson.co.uk
parent 5852a15c

drivers/gpu/drm/i915/intel_guc_fw.c

+0 −4
Original line number Diff line number Diff line
@@ -77,10 +77,6 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw) 
		guc_fw->path = I915_KBL_GUC_UCODE;

		guc_fw->major_ver_wanted = KBL_FW_MAJOR;

		guc_fw->minor_ver_wanted = KBL_FW_MINOR;

	} else {

		dev_info(dev_priv->drm.dev,

			 "%s: No firmware known for this platform!\n",

			 intel_uc_fw_type_repr(guc_fw->type));

	}

}

drivers/gpu/drm/i915/intel_huc_fw.c

+0 −3
Original line number Diff line number Diff line
@@ -76,9 +76,6 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw) 
		huc_fw->path = I915_KBL_HUC_UCODE;

		huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR;

		huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR;

	} else {

		DRM_WARN("%s: No firmware known for this platform!\n",

			 intel_uc_fw_type_repr(huc_fw->type));

	}

}

drivers/gpu/drm/i915/intel_uc_fw.c

+8 −3
Original line number Diff line number Diff line
@@ -46,12 +46,17 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, 
	size_t size;

	int err;



	if (!uc_fw->path) {

		dev_info(dev_priv->drm.dev,

			 "%s: No firmware was defined for %s!\n",

			 intel_uc_fw_type_repr(uc_fw->type),

			 intel_platform_name(INTEL_INFO(dev_priv)->platform));

		return;

	}



	DRM_DEBUG_DRIVER("%s fw fetch %s\n",

			 intel_uc_fw_type_repr(uc_fw->type), uc_fw->path);



	if (!uc_fw->path)

		return;



	uc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING;

	DRM_DEBUG_DRIVER("%s fw fetch %s\n",

			 intel_uc_fw_type_repr(uc_fw->type),