Commit 51ecb30e authored by Matt Roper's avatar Matt Roper Committed by José Roberto de Souza
Browse files

drm/i915/adl_s: Re-use TGL GuC/HuC firmware 



ADL-S, like RKL, uses the same internal device ID for the GuC and HuC as
TGL did, making them all firmware-compatible.  Let's re-use TGL's
firmware for ADL-S.

Bspec: 50668
Cc: John Harrison <John.C.Harrison@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarAditya Swarup <aditya.swarup@intel.com>
Reviewed-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210129182945.217078-4-aditya.swarup@intel.com
parent a7ffb815

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

+3 −1
Original line number Diff line number Diff line
@@ -44,9 +44,11 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, 
 * List of required GuC and HuC binaries per-platform.

 * Must be ordered based on platform + revid, from newer to older.

 *

 * Note that RKL uses the same firmware as TGL.

 * Note that RKL and ADL-S have the same GuC/HuC device ID's and use the same

 * firmware as TGL.

 */

#define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \

	fw_def(ALDERLAKE_S, 0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7, 5, 0)) \

	fw_def(ROCKETLAKE,  0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7, 5, 0)) \

	fw_def(TIGERLAKE,   0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7, 5, 0)) \

	fw_def(JASPERLAKE,  0, guc_def(ehl, 49, 0, 1), huc_def(ehl,  9, 0, 0)) \