FAILED: patch "[PATCH] drm/i915/icl+/tc: Convert AUX powered WARN to a debug message" failed to apply to 6.12-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.12-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.12.y
git checkout FETCH_HEAD
git cherry-pick -x d7fa5754e83cd36c4327eb2d806064e598a72ff6
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025082347-unstuck-spiral-493c@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d7fa5754e83cd36c4327eb2d806064e598a72ff6 Mon Sep 17 00:00:00 2001
From: Imre Deak <[email protected]>
Date: Mon, 11 Aug 2025 11:01:52 +0300
Subject: [PATCH] drm/i915/icl+/tc: Convert AUX powered WARN to a debug message
The BIOS can leave the AUX power well enabled on an output, even if this isn't required (on platforms where the AUX power is only needed for an AUX access). This was observed at least on PTL. To avoid the WARN which would be triggered by this during the HW readout, convert the WARN to a debug message.
drivers/gpu/drm/i915/display/intel_tc.c +3 -3
@@ -1498,11 +1498,11 @@ static void intel_tc_port_reset_mode(struct intel_tc_port *tc,intel_display_power_flush_work (display);if (!intel_tc_cold_requires_aux_pw (dig_port)) {enum intel_display_power_domain aux_domain; -bool aux_powered; aux_domain =intel_aux_power_domain (dig_port); - aux_powered =intel_display_power_is_enabled (display, aux_domain); -drm_WARN_ON (display->drm, aux_powered); +if (intel_display_power_is_enabled (display, aux_domain)) +drm_dbg_kms (display->drm,"Port %s: AUX unexpectedly powered\n" , + tc->port_name); }tc_phy_disconnect (tc);
Sasha Levin
maintainerPATCH 1/1 drm/i915/icl+/tc: Convert AUX powered WARN to a debug message
From: Imre Deak <[email protected]>
[ Upstream commit d7fa5754e83cd36c4327eb2d806064e598a72ff6 ]
The BIOS can leave the AUX power well enabled on an output, even if this isn't required (on platforms where the AUX power is only needed for an AUX access). This was observed at least on PTL. To avoid the WARN which would be triggered by this during the HW readout, convert the WARN to a debug message.
--- drivers/gpu/drm/i915/display/intel_tc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_tc.c +2 -1
@@ -1416,7 +1416,8 @@ static void intel_tc_port_reset_mode(struct intel_tc_port *tc, aux_domain =intel_aux_power_domain (dig_port); aux_powered =intel_display_power_is_enabled (i915, aux_domain); -drm_WARN_ON (&i915->drm, aux_powered); +drm_dbg_kms (&i915->drm,"Port %s: AUX powered %d\n" , + tc->port_name, aux_powered); }tc_phy_disconnect (tc);
Signature · 1 line
2.50.1