drm/i915/dg2: Update DG2 to GuC v70.4.1

New release of GuC with a bunch of fixes specific to DG2. Some of
these require follow up i915 changes to enable.

Note also that it is not necessary to maintain backwards compatibility
with 70.1.2 for DG2 because DG2 is still under force probe protection.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220728230722.2749701-2-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 d5fca1f68eff211f68e89dfb33130cab2de01904..58547292efa0ab159bc4b542ef1b44be2f58dad4 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -53,7 +53,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  * firmware as TGL.
  */
 #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_def) \
-       fw_def(DG2,          0, guc_def(dg2,  70, 1, 2)) \
+       fw_def(DG2,          0, guc_def(dg2,  70, 4, 1)) \
        fw_def(ALDERLAKE_P,  0, guc_def(adlp, 70, 1, 1)) \
        fw_def(ALDERLAKE_S,  0, guc_def(tgl,  70, 1, 1)) \
        fw_def(DG1,          0, guc_def(dg1,  70, 1, 1)) \