Commit 1391b9cf authored by Daniele Ceraolo Spurio's avatar Daniele Ceraolo Spurio Committed by Rodrigo Vivi
Browse files

drm/i915/guc: ADL-N should use the same GuC FW as ADL-S 



The only difference between the ADL S and P GuC FWs is the HWConfig
support. ADL-N does not support HWConfig, so we should use the same
binary as ADL-S, otherwise the GuC might attempt to fetch a config
table that does not exist. ADL-N is internally identified as an ADL-P,
so we need to special-case it in the FW selection code.

Fixes: 7e28d0b2 ("drm/i915/adl-n: Enable ADL-N platform")
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Tejas Upadhyay <tejas.upadhyay@intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220621233005.3952293-1-daniele.ceraolospurio@intel.com


(cherry picked from commit 971e4a97)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 046cd8a2

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

+9 −0
Original line number Diff line number Diff line
@@ -162,6 +162,15 @@ __uc_fw_auto_select(struct drm_i915_private *i915, struct intel_uc_fw *uc_fw) 
	u8 rev = INTEL_REVID(i915);

	int i;



	/*

	 * The only difference between the ADL GuC FWs is the HWConfig support.

	 * ADL-N does not support HWConfig, so we should use the same binary as

	 * ADL-S, otherwise the GuC might attempt to fetch a config table that

	 * does not exist.

	 */

	if (IS_ADLP_N(i915))

		p = INTEL_ALDERLAKE_S;



	GEM_BUG_ON(uc_fw->type >= ARRAY_SIZE(blobs_all));

	fw_blobs = blobs_all[uc_fw->type].blobs;

	fw_count = blobs_all[uc_fw->type].count;