[PATCH v2 2/2] HAX: drm/i915/guc: force fallback mode

Daniele Ceraolo Spurio daniele.ceraolospurio at intel.com
Fri Jul 15 15:05:42 UTC 2022


Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 34 ++++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

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 210c84411406..3799fd433f87 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -53,22 +53,22 @@ 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(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)) \
-	fw_def(ROCKETLAKE,   0, guc_def(tgl,  70, 1, 1)) \
-	fw_def(TIGERLAKE,    0, guc_def(tgl,  70, 1, 1)) \
-	fw_def(JASPERLAKE,   0, guc_def(ehl,  70, 1, 1)) \
-	fw_def(ELKHARTLAKE,  0, guc_def(ehl,  70, 1, 1)) \
-	fw_def(ICELAKE,      0, guc_def(icl,  70, 1, 1)) \
-	fw_def(COMETLAKE,    5, guc_def(cml,  70, 1, 1)) \
-	fw_def(COMETLAKE,    0, guc_def(kbl,  70, 1, 1)) \
-	fw_def(COFFEELAKE,   0, guc_def(kbl,  70, 1, 1)) \
-	fw_def(GEMINILAKE,   0, guc_def(glk,  70, 1, 1)) \
-	fw_def(KABYLAKE,     0, guc_def(kbl,  70, 1, 1)) \
-	fw_def(BROXTON,      0, guc_def(bxt,  70, 1, 1)) \
-	fw_def(SKYLAKE,      0, guc_def(skl,  70, 1, 1))
+	fw_def(DG2,          0, guc_def(dg2,  80, 1, 2)) \
+	fw_def(ALDERLAKE_P,  0, guc_def(adlp, 80, 1, 1)) \
+	fw_def(ALDERLAKE_S,  0, guc_def(tgl,  80, 1, 1)) \
+	fw_def(DG1,          0, guc_def(dg1,  80, 1, 1)) \
+	fw_def(ROCKETLAKE,   0, guc_def(tgl,  80, 1, 1)) \
+	fw_def(TIGERLAKE,    0, guc_def(tgl,  80, 1, 1)) \
+	fw_def(JASPERLAKE,   0, guc_def(ehl,  80, 1, 1)) \
+	fw_def(ELKHARTLAKE,  0, guc_def(ehl,  80, 1, 1)) \
+	fw_def(ICELAKE,      0, guc_def(icl,  80, 1, 1)) \
+	fw_def(COMETLAKE,    5, guc_def(cml,  80, 1, 1)) \
+	fw_def(COMETLAKE,    0, guc_def(kbl,  80, 1, 1)) \
+	fw_def(COFFEELAKE,   0, guc_def(kbl,  80, 1, 1)) \
+	fw_def(GEMINILAKE,   0, guc_def(glk,  80, 1, 1)) \
+	fw_def(KABYLAKE,     0, guc_def(kbl,  80, 1, 1)) \
+	fw_def(BROXTON,      0, guc_def(bxt,  80, 1, 1)) \
+	fw_def(SKYLAKE,      0, guc_def(skl,  80, 1, 1))
 
 #define INTEL_GUC_FIRMWARE_DEFS_FALLBACK(fw_def, guc_def) \
 	fw_def(ALDERLAKE_P,  0, guc_def(adlp, 69, 0, 3)) \
@@ -453,7 +453,7 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)
 	if (err && !intel_uc_fw_is_overridden(uc_fw) && uc_fw->fallback.path) {
 		err = request_firmware(&fw, uc_fw->fallback.path, dev);
 		if (!err) {
-			drm_warn(&i915->drm, "%s firmware %s not found, falling back to %s\n",
+			drm_notice(&i915->drm, "%s firmware %s not found, falling back to %s\n",
 					     intel_uc_fw_type_repr(uc_fw->type),
 					     uc_fw->wanted_path,
 					     uc_fw->fallback.path);
-- 
2.25.1



More information about the Intel-gfx-trybot mailing list