drm/i915/guc: Update 'recommended' version to 70.12.1 for DG2/ADL-S/ADL-P/MTL

The latest GuC has new features and new workarounds that we wish to
enable. So let the universe know that it is useful to update their
firmware.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231006145801.161868-1-John.C.Harrison@Intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index fc0d05d2df5932c293762ed01a2971c255302739..6c480bd1460bf6d3e9e4a651983fa803dc03ff8e 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -88,12 +88,12 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  * security fixes, etc. to be enabled.
  */
 #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_maj, guc_mmp) \
-       fw_def(METEORLAKE,   0, guc_maj(mtl,  70, 6, 6)) \
-       fw_def(DG2,          0, guc_maj(dg2,  70, 5, 1)) \
-       fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5, 1)) \
+       fw_def(METEORLAKE,   0, guc_maj(mtl,  70, 12, 1)) \
+       fw_def(DG2,          0, guc_maj(dg2,  70, 12, 1)) \
+       fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 12, 1)) \
        fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 70, 1, 1)) \
        fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 69, 0, 3)) \
-       fw_def(ALDERLAKE_S,  0, guc_maj(tgl,  70, 5, 1)) \
+       fw_def(ALDERLAKE_S,  0, guc_maj(tgl,  70, 12, 1)) \
        fw_def(ALDERLAKE_S,  0, guc_mmp(tgl,  70, 1, 1)) \
        fw_def(ALDERLAKE_S,  0, guc_mmp(tgl,  69, 0, 3)) \
        fw_def(DG1,          0, guc_maj(dg1,  70, 5, 1)) \