FAILED: patch "[PATCH] drm/i915/psr: Use DC_OFF wake reference to block DC6 on" 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 3549a9649dc7c5fc586ab12f675279283cdcb2a7
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026060434-tattoo-wise-091f@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3549a9649dc7c5fc586ab12f675279283cdcb2a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jouni=20H=C3=B6gander?= <[email protected]>
Date: Wed, 20 May 2026 13:49:44 +0300
Subject: [PATCH] drm/i915/psr: Use DC_OFF wake reference to block DC6 on
vblank enable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We are observing following warnings:
*ERROR* power well DC_off state mismatch (refcount 0/enabled 1)
gen9_dc_off_power_well_enabled is considering target state DC_STATE_DISABLE as DC_OFF power well being enabled. Fix this by using wakeref for the purpose.
To achieve this we need to modify notification code as well. Currently it is possible that PSR gets notified vblank enable/disable twice on same status. This is currently not a problem as it is just triggering call to intel_display_power_set_target_dc_state with same target state as a parameter. When using wakeref this becomes a problem due to reference counting. Fix this storing vbank status on last notification and use that to ensure there are no more than one notification with same vblank status.
v2: ensure there is no subsequent notifications with same status
drivers/gpu/drm/i915/display/intel_display_core.h +1 -0
@@ -497,6 +497,7 @@ struct intel_display {u8 vblank_enabled;int vblank_enable_count; +bool vblank_status_last_notified;struct work_struct vblank_notify_work;
drivers/gpu/drm/i915/display/intel_display_irq.c +6 -2
@@ -1773,8 +1773,12 @@ static void intel_display_vblank_notify_work(struct work_struct *work)struct intel_display *display =container_of (work,typeof (*display), irq.vblank_notify_work);int vblank_enable_count =READ_ONCE (display->irq.vblank_enable_count); +bool vblank_status = !!vblank_enable_count; -intel_psr_notify_vblank_enable_disable (display, vblank_enable_count); +if (display->irq.vblank_status_last_notified != vblank_status) { +intel_psr_notify_vblank_enable_disable (display, vblank_status); + display->irq.vblank_status_last_notified = vblank_status; + } }int bdw_enable_vblank (struct drm_crtc *_crtc)
@@ -1787,10 +1791,10 @@ int bdw_enable_vblank(struct drm_crtc *_crtc)if (gen11_dsi_configure_te (crtc, true))return 0 ; +spin_lock_irqsave (&display->irq.lock, irqflags);if (crtc->vblank_psr_notify && display->irq.vblank_enable_count++ ==0 )schedule_work (&display->irq.vblank_notify_work); -spin_lock_irqsave (&display->irq.lock, irqflags);bdw_enable_pipe_irq (display, pipe,GEN8_PIPE_VBLANK );spin_unlock_irqrestore (&display->irq.lock, irqflags);
drivers/gpu/drm/i915/display/intel_display_types.h +2 -0
@@ -1790,6 +1790,8 @@ struct intel_psr {u8 active_non_psr_pipes;const char *no_psr_reason; + +struct ref_tracker *vblank_wakeref; };struct intel_dp {
drivers/gpu/drm/i915/display/intel_psr.c +9 -15
@@ -4151,14 +4151,20 @@ void intel_psr_notify_vblank_enable_disable(struct intel_display *display, bool enable) {struct intel_encoder *encoder; -bool block_dc_states = false;for_each_intel_encoder_with_psr (display->drm, encoder) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder);mutex_lock (&intel_dp->psr.lock); -if (CAN_PANEL_REPLAY (intel_dp)) - block_dc_states = true; +if (CAN_PANEL_REPLAY (intel_dp)) { +if (enable) + intel_dp->psr.vblank_wakeref = +intel_display_power_get (display, +POWER_DOMAIN_DC_OFF ); +else +intel_display_power_put (display,POWER_DOMAIN_DC_OFF , + intel_dp->psr.vblank_wakeref); + }if (intel_dp->psr.enabled && !intel_dp->psr.panel_replay_enabled && intel_dp->psr.pkg_c_latency_used)
@@ -4166,18 +4172,6 @@ void intel_psr_notify_vblank_enable_disable(struct intel_display *display,mutex_unlock (&intel_dp->psr.lock); } - -/* -* NOTE: intel_display_power_set_target_dc_state is used -* only by PSR code for DC3CO handling. DC3CO target -* state is currently disabled in * PSR code. If DC3CO -* is taken into use we need take that into account here -* as well. -*/ -if (block_dc_states) -intel_display_power_set_target_dc_state (display, enable ? -DC_STATE_DISABLE : -DC_STATE_EN_UPTO_DC6 ); } static void
Sasha Levin
maintainerPATCH 1/2 drm/i915/psr: Block DC states on vblank enable when Panel Replay supported
From: Jouni Högander <[email protected]>
[ Upstream commit 8bb9093df555f9e89fdbe1405118b11384c03e04 ]
Currently we are blocking DC states only when Panel Replay is enabled on vblank enable. It may happen that Panel Replay is getting enabled when vblank is already enabled. Fix this by blocking DC states always if Panel Replay is supported.
While at it take care of possible dual eDP case by looping all encoders supporting PSR.
Stable-dep-of: 3549a9649dc7 ("drm/i915/psr: Use DC_OFF wake reference to block DC6 on vblank enable")
--- drivers/gpu/drm/i915/display/intel_psr.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +10 -9
@@ -3949,32 +3949,33 @@ void intel_psr_notify_vblank_enable_disable(struct intel_display *display, bool enable) {struct intel_encoder *encoder; +bool block_dc_states = false;for_each_intel_encoder_with_psr (display->drm, encoder) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder);mutex_lock (&intel_dp->psr.lock); -if (intel_dp->psr.panel_replay_enabled) { -mutex_unlock (&intel_dp->psr.lock); -break ; - } +if (CAN_PANEL_REPLAY (intel_dp)) + block_dc_states = true; -if (intel_dp->psr.enabled && intel_dp->psr.pkg_c_latency_used) +if (intel_dp->psr.enabled && !intel_dp->psr.panel_replay_enabled && + intel_dp->psr.pkg_c_latency_used)intel_psr_apply_underrun_on_idle_wa_locked (intel_dp);mutex_unlock (&intel_dp->psr.lock); -return ; }/* * NOTE: intel_display_power_set_target_dc_state is used -* only by PSR * code for DC3CO handling. DC3CO target +* only by PSR code for DC3CO handling. DC3CO target * state is currently disabled in * PSR code. If DC3CO * is taken into use we need take that into account here * as well. */ -intel_display_power_set_target_dc_state (display, enable ?DC_STATE_DISABLE : -DC_STATE_EN_UPTO_DC6 ); +if (block_dc_states) +intel_display_power_set_target_dc_state (display, enable ? +DC_STATE_DISABLE : +DC_STATE_EN_UPTO_DC6 ); } static void
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 drm/i915/psr: Use DC_OFF wake reference to block DC6 on vblank enable
From: Jouni Högander <[email protected]>
[ Upstream commit 3549a9649dc7c5fc586ab12f675279283cdcb2a7 ]
We are observing following warnings:
*ERROR* power well DC_off state mismatch (refcount 0/enabled 1)
gen9_dc_off_power_well_enabled is considering target state DC_STATE_DISABLE as DC_OFF power well being enabled. Fix this by using wakeref for the purpose.
To achieve this we need to modify notification code as well. Currently it is possible that PSR gets notified vblank enable/disable twice on same status. This is currently not a problem as it is just triggering call to intel_display_power_set_target_dc_state with same target state as a parameter. When using wakeref this becomes a problem due to reference counting. Fix this storing vbank status on last notification and use that to ensure there are no more than one notification with same vblank status.
v2: ensure there is no subsequent notifications with same status
--- .../gpu/drm/i915/display/intel_display_core.h | 1 + .../gpu/drm/i915/display/intel_display_irq.c | 8 +++++-- .../drm/i915/display/intel_display_types.h | 2 ++ drivers/gpu/drm/i915/display/intel_psr.c | 24 +++++++------------ 4 files changed, 18 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/display/intel_display_core.h +1 -0
@@ -472,6 +472,7 @@ struct intel_display {u8 vblank_enabled;int vblank_enable_count; +bool vblank_status_last_notified;struct work_struct vblank_notify_work;
drivers/gpu/drm/i915/display/intel_display_irq.c +6 -2
@@ -1707,8 +1707,12 @@ static void intel_display_vblank_notify_work(struct work_struct *work)struct intel_display *display =container_of (work,typeof (*display), irq.vblank_notify_work);int vblank_enable_count =READ_ONCE (display->irq.vblank_enable_count); +bool vblank_status = !!vblank_enable_count; -intel_psr_notify_vblank_enable_disable (display, vblank_enable_count); +if (display->irq.vblank_status_last_notified != vblank_status) { +intel_psr_notify_vblank_enable_disable (display, vblank_status); + display->irq.vblank_status_last_notified = vblank_status; + } }int bdw_enable_vblank (struct drm_crtc *_crtc)
@@ -1721,10 +1725,10 @@ int bdw_enable_vblank(struct drm_crtc *_crtc)if (gen11_dsi_configure_te (crtc, true))return 0 ; +spin_lock_irqsave (&display->irq.lock, irqflags);if (crtc->vblank_psr_notify && display->irq.vblank_enable_count++ ==0 )schedule_work (&display->irq.vblank_notify_work); -spin_lock_irqsave (&display->irq.lock, irqflags);bdw_enable_pipe_irq (display, pipe,GEN8_PIPE_VBLANK );spin_unlock_irqrestore (&display->irq.lock, irqflags);
drivers/gpu/drm/i915/display/intel_display_types.h +2 -0
@@ -1690,6 +1690,8 @@ struct intel_psr {bool pkg_c_latency_used;u8 active_non_psr_pipes; + +struct ref_tracker *vblank_wakeref; };struct intel_dp {
drivers/gpu/drm/i915/display/intel_psr.c +9 -15
@@ -3949,14 +3949,20 @@ void intel_psr_notify_vblank_enable_disable(struct intel_display *display, bool enable) {struct intel_encoder *encoder; -bool block_dc_states = false;for_each_intel_encoder_with_psr (display->drm, encoder) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder);mutex_lock (&intel_dp->psr.lock); -if (CAN_PANEL_REPLAY (intel_dp)) - block_dc_states = true; +if (CAN_PANEL_REPLAY (intel_dp)) { +if (enable) + intel_dp->psr.vblank_wakeref = +intel_display_power_get (display, +POWER_DOMAIN_DC_OFF ); +else +intel_display_power_put (display,POWER_DOMAIN_DC_OFF , + intel_dp->psr.vblank_wakeref); + }if (intel_dp->psr.enabled && !intel_dp->psr.panel_replay_enabled && intel_dp->psr.pkg_c_latency_used)
@@ -3964,18 +3970,6 @@ void intel_psr_notify_vblank_enable_disable(struct intel_display *display,mutex_unlock (&intel_dp->psr.lock); } - -/* -* NOTE: intel_display_power_set_target_dc_state is used -* only by PSR code for DC3CO handling. DC3CO target -* state is currently disabled in * PSR code. If DC3CO -* is taken into use we need take that into account here -* as well. -*/ -if (block_dc_states) -intel_display_power_set_target_dc_state (display, enable ? -DC_STATE_DISABLE : -DC_STATE_EN_UPTO_DC6 ); } static void
Signature · 1 line
2.53.0