Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/i915: Extend Wa_1607297627 to Alderlake-P" failed to apply to 6.1-stable tree

PATCH [email protected] 1 participant 1 message Jan 4, 2023

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

847eec69f01a ("drm/i915: Extend Wa_1607297627 to Alderlake-P")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 847eec69f01a28ca44f5ac7e1d71d3a60263d680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= <[email protected]>
Date: Mon, 17 Oct 2022 06:24:32 -0700
Subject: [PATCH] drm/i915: Extend Wa_1607297627 to Alderlake-P
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Workaround 1607297627 was missed for Alderlake-P, so here extending it to it and adding the fixes tag so this WA is backported to all stable kernels.

v2:
- fixed subject
- added Fixes tag

BSpec: 54369

Cc <[email protected]> # v5.17+
Fixes dfb924e33927 ("drm/i915/adlp: Remove require_force_probe protection")
Cc Tvrtko Ursulin <[email protected]>
drivers/gpu/drm/i915/gt/intel_workarounds.c +2 -2
index 31e129329fb0..a79798777887 100644
@@ -2293,11 +2293,11 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
 	}
 
 	if (IS_DG1_GRAPHICS_STEP(i915, STEP_A0, STEP_B0) ||
-	    IS_ROCKETLAKE(i915) || IS_TIGERLAKE(i915)) {
+	    IS_ROCKETLAKE(i915) || IS_TIGERLAKE(i915) || IS_ALDERLAKE_P(i915)) {
 		/*
 		 * Wa_1607030317:tgl
 		 * Wa_1607186500:tgl
-		 * Wa_1607297627:tgl,rkl,dg1[a0]
+		 * Wa_1607297627:tgl,rkl,dg1[a0],adlp
 		 *
 		 * On TGL and RKL there are multiple entries for this WA in the
 		 * BSpec; some indicate this is an A0-only WA, others indicate