On Thu, May 04, 2023 at 01:45:24PM -0700, John Harrison wrote:
On 5/4/2023 13:29, Lucas De Marchi wrote:On Thu, May 04, 2023 at 01:22:52PM -0700, John.C.Harrison@xxxxxxxxx wrote:Oh. Because the current line is coming from the for-CI branch and is not actually upstream already. Yeah, forgot that!From: John Harrison <John.C.Harrison@xxxxxxxxx> Also switch to using reduced version file naming as it is no longer such a work-in-progress and likely to change. Signed-off-by: John Harrison <John.C.Harrison@xxxxxxxxx>commit message here will be bogus as it will be the first time MTL will actually have the define.Better to do it like this: git revert 5c71b8b8ac87 then this patch, with a better commit message or I can change the commit message of this commit while applying to: drm/i915/mtl: Define GuC firmware version for MTL First release of GuC for Meteorlake. Signed-off-by: John Harrison <John.C.Harrison@xxxxxxxxx> Reviewed-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> Lucas De MarchiThat works for me :).
applied both commits to drm-intel-gt-next branch and removed the other one from topic/core-for-CI. Closing https://gitlab.freedesktop.org/drm/intel/-/issues/8343 Thanks Lucas De Marchi
--- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.cindex 55e50bd08d7ff..10e48cbcf494a 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c@@ -79,7 +79,7 @@ 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_mmp(mtl, 70, 6, 5)) \ + 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(ALDERLAKE_P, 0, guc_mmp(adlp, 70, 1, 1)) \ -- 2.39.1
