From: Daniele Ceraolo Spurio Date: Tue, 19 Dec 2023 20:00:20 +0000 (-0800) Subject: drm/xe: Remove ci-only GuC FW definitions X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=de991b9af0532a05d5206c065bf343d6a767a9d2;p=linux.git drm/xe: Remove ci-only GuC FW definitions As part of the FW definitions, we declare each blob as required via the MODULE_FIRMWARE() macro. This causes the initramfs update (or equivalent process) to look for the blobs on disk when the kernel is installed; therefore, we need to make sure that all FWs we define are available in linux-firmware. We currently don't plan to push the PVC blob to linux-firmware, while the LNL one will only be pushed once we have machines in CI to test it, so we need to remove them from the list for now. Signed-off-by: Daniele Ceraolo Spurio Cc: Rodrigo Vivi Reviewed-by: Rodrigo Vivi 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 73d6938c921d9..9dff96dfe4559 100644 --- a/drivers/gpu/drm/xe/xe_uc_fw.c +++ b/drivers/gpu/drm/xe/xe_uc_fw.c @@ -102,9 +102,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, major_ver(i915, guc, mtl, 70, 7)) \ - fw_def(PVC, mmp_ver(xe, guc, pvc, 70, 9, 1)) \ fw_def(DG2, major_ver(i915, guc, dg2, 70, 5)) \ fw_def(DG1, major_ver(i915, guc, dg1, 70, 5)) \ fw_def(ALDERLAKE_N, major_ver(i915, guc, tgl, 70, 5)) \