[Intel-xe] [PATCH] drm/xe/guc: Switch to major-only GuC FW tracking for MTL

[Lucas De Marchi]

On Wed, Sep 06, 2023 at 04:00:10PM -0700, Daniele Ceraolo Spurio wrote:
>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 <daniele.ceraolospurio at intel.com>
>Cc: John Harrison <John.C.Harrison at Intel.com>


Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi

>---
> drivers/gpu/drm/xe/xe_uc_fw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/xe/xe_uc_fw.c b/drivers/gpu/drm/xe/xe_uc_fw.c
>index 37ad238148b0..8fc1fbc551c2 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))		\
>-- 
>2.41.0
>