From: Daniele Ceraolo Spurio Date: Wed, 6 Sep 2023 23:00:10 +0000 (-0700) Subject: drm/xe/guc: Switch to major-only GuC FW tracking for MTL X-Git-Tag: v6.8-rc1~111^2~7^2~379 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=430003b85ce36e6f9dd6799b6cd5690f9b6c8a2a;p=thirdparty%2Fkernel%2Flinux.git drm/xe/guc: Switch to major-only GuC FW tracking for MTL Newer HuC binaries for MTL (8.5.1+) require GuC 70.7 or newer, so we need to move on from 70.6.4. Given that the MTL GuC uses major-only version matching in i915, we can do the same here instead of just bumping the version (and having to push the versioned binaries, because they're not there already for i915). Signed-off-by: Daniele Ceraolo Spurio Cc: John Harrison Reviewed-by: Lucas De Marchi Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c index 8aa3ae1384db2..efc70836453d0 100644 --- a/drivers/gpu/drm/xe/xe_uc_fw.c +++ b/drivers/gpu/drm/xe/xe_uc_fw.c @@ -101,7 +101,7 @@ struct fw_blobs_by_type { #define XE_GUC_FIRMWARE_DEFS(fw_def, mmp_ver, major_ver) \ fw_def(LUNARLAKE, mmp_ver(xe, guc, lnl, 70, 6, 8)) \ - fw_def(METEORLAKE, mmp_ver(i915, guc, mtl, 70, 6, 4)) \ + fw_def(METEORLAKE, major_ver(i915, guc, mtl, 70, 7)) \ fw_def(PVC, mmp_ver(xe, guc, pvc, 70, 6, 4)) \ fw_def(DG2, major_ver(i915, guc, dg2, 70, 5)) \ fw_def(DG1, major_ver(i915, guc, dg1, 70, 5)) \