FAILED: patch "[PATCH] drm/i915/vrr: Configure VRR timings after enabling" failed to apply to 6.18-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.18-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]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x 237aab549676288d9255bb8dcc284738e56eaa31
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026031731-washstand-aged-f7fc@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 237aab549676288d9255bb8dcc284738e56eaa31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <[email protected]>
Date: Tue, 3 Mar 2026 11:54:14 +0200
Subject: [PATCH] drm/i915/vrr: Configure VRR timings after enabling
TRANS_DDI_FUNC_CTL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Apparently ICL may hang with an MCE if we write TRANS_VRR_VMAX/FLIPLINE before enabling TRANS_DDI_FUNC_CTL.
Personally I was only able to reproduce a hang (on an Dell XPS 7390 2-in-1) with an external display connected via a dock using a dodgy type-C cable that made the link training fail. After the failed link training the machine would hang. TGL seemed immune to the problem for whatever reason.
BSpec does tell us to configure VRR after enabling TRANS_DDI_FUNC_CTL as well. The DMC firmware also does the VRR restore in two stages:
- first stage seems to be unconditional and includes TRANS_VRR_CTL and a few other VRR registers, among other things
- second stage is conditional on the DDI being enabled, and includes TRANS_DDI_FUNC_CTL and TRANS_VRR_VMAX/VMIN/FLIPLINE, among other things
So let's reorder the steps to match to avoid the hang, and toss in an extra WARN to make sure we don't screw this up later.
BSpec: 22243
drivers/gpu/drm/i915/display/intel_display.c +0 -1
@@ -1614,7 +1614,6 @@ static void hsw_configure_cpu_transcoder(const struct intel_crtc_state *crtc_sta }intel_set_transcoder_timings (crtc_state); -intel_vrr_set_transcoder_timings (crtc_state);if (cpu_transcoder !=TRANSCODER_EDP ) intel_de_write(display, TRANS_MULT(display, cpu_transcoder),
drivers/gpu/drm/i915/display/intel_vrr.c +14 -0
@@ -597,6 +597,18 @@ void intel_vrr_set_transcoder_timings(const struct intel_crtc_state *crtc_state)if (!HAS_VRR (display))return ; +/* +* Bspec says: +* "(note: VRR needs to be programmed after +* TRANS_DDI_FUNC_CTL and before TRANS_CONF)." +* +* In practice it turns out that ICL can hang if +* TRANS_VRR_VMAX/FLIPLINE are written before +* enabling TRANS_DDI_FUNC_CTL. +*/ +drm_WARN_ON (display->drm, + !(intel_de_read (display,TRANS_DDI_FUNC_CTL (display, cpu_transcoder)) &TRANS_DDI_FUNC_ENABLE )); +/* * This bit seems to have two meanings depending on the platform: * TGL: generate VRR "safe window" for DSB vblank waits
@@ -939,6 +951,8 @@ void intel_vrr_transcoder_enable(const struct intel_crtc_state *crtc_state) {struct intel_display *display =to_intel_display (crtc_state); +intel_vrr_set_transcoder_timings (crtc_state); +if (!intel_vrr_possible (crtc_state))return ;
Sasha Levin
maintainerPATCH 1/2 drm/i915/vrr: Move HAS_VRR() check into intel_vrr_set_transcoder_timings()
From: Ville Syrjälä <[email protected]>
[ Upstream commit 78ea8eb5b6235b3ef68fa0fb8ffe0b3b490baf38 ]
Reduce the clutter in hsw_configure_cpu_transcoder() a bit by moving the HAS_VRR() check into intel_vrr_set_transcoder_timings().
Stable-dep-of: 237aab549676 ("drm/i915/vrr: Configure VRR timings after enabling TRANS_DDI_FUNC_CTL")
--- drivers/gpu/drm/i915/display/intel_display.c | 3 +-- drivers/gpu/drm/i915/display/intel_vrr.c | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +1 -2
@@ -1642,8 +1642,7 @@ static void hsw_configure_cpu_transcoder(const struct intel_crtc_state *crtc_sta }intel_set_transcoder_timings (crtc_state); -if (HAS_VRR (display)) -intel_vrr_set_transcoder_timings (crtc_state); +intel_vrr_set_transcoder_timings (crtc_state);if (cpu_transcoder !=TRANSCODER_EDP ) intel_de_write(display, TRANS_MULT(display, cpu_transcoder),
drivers/gpu/drm/i915/display/intel_vrr.c +3 -0
@@ -461,6 +461,9 @@ void intel_vrr_set_transcoder_timings(const struct intel_crtc_state *crtc_state)struct intel_display *display =to_intel_display (crtc_state);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; +if (!HAS_VRR (display)) +return ; +/* * This bit seems to have two meanings depending on the platform: * TGL: generate VRR "safe window" for DSB vblank waits
Signature · 1 line
2.51.0
Sasha Levin
maintainerPATCH 2/2 drm/i915/vrr: Configure VRR timings after enabling TRANS_DDI_FUNC_CTL
From: Ville Syrjälä <[email protected]>
[ Upstream commit 237aab549676288d9255bb8dcc284738e56eaa31 ]
Apparently ICL may hang with an MCE if we write TRANS_VRR_VMAX/FLIPLINE before enabling TRANS_DDI_FUNC_CTL.
Personally I was only able to reproduce a hang (on an Dell XPS 7390 2-in-1) with an external display connected via a dock using a dodgy type-C cable that made the link training fail. After the failed link training the machine would hang. TGL seemed immune to the problem for whatever reason.
BSpec does tell us to configure VRR after enabling TRANS_DDI_FUNC_CTL as well. The DMC firmware also does the VRR restore in two stages:
- first stage seems to be unconditional and includes TRANS_VRR_CTL and a few other VRR registers, among other things
- second stage is conditional on the DDI being enabled, and includes TRANS_DDI_FUNC_CTL and TRANS_VRR_VMAX/VMIN/FLIPLINE, among other things
So let's reorder the steps to match to avoid the hang, and toss in an extra WARN to make sure we don't screw this up later.
BSpec: 22243
--- drivers/gpu/drm/i915/display/intel_display.c | 1 - drivers/gpu/drm/i915/display/intel_vrr.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +0 -1
@@ -1642,7 +1642,6 @@ static void hsw_configure_cpu_transcoder(const struct intel_crtc_state *crtc_sta }intel_set_transcoder_timings (crtc_state); -intel_vrr_set_transcoder_timings (crtc_state);if (cpu_transcoder !=TRANSCODER_EDP ) intel_de_write(display, TRANS_MULT(display, cpu_transcoder),
drivers/gpu/drm/i915/display/intel_vrr.c +14 -0
@@ -464,6 +464,18 @@ void intel_vrr_set_transcoder_timings(const struct intel_crtc_state *crtc_state)if (!HAS_VRR (display))return ; +/* +* Bspec says: +* "(note: VRR needs to be programmed after +* TRANS_DDI_FUNC_CTL and before TRANS_CONF)." +* +* In practice it turns out that ICL can hang if +* TRANS_VRR_VMAX/FLIPLINE are written before +* enabling TRANS_DDI_FUNC_CTL. +*/ +drm_WARN_ON (display->drm, + !(intel_de_read (display,TRANS_DDI_FUNC_CTL (display, cpu_transcoder)) &TRANS_DDI_FUNC_ENABLE )); +/* * This bit seems to have two meanings depending on the platform: * TGL: generate VRR "safe window" for DSB vblank waits
@@ -658,6 +670,8 @@ void intel_vrr_transcoder_enable(const struct intel_crtc_state *crtc_state)if (!HAS_VRR (display))return ; +intel_vrr_set_transcoder_timings (crtc_state); +if (!intel_vrr_possible (crtc_state))return ;
Signature · 1 line
2.51.0