FAILED: Patch "drm/amd/display: Fix idle check for shared firmware state" failed to apply to 6.6-stable tree
Sasha Levin
maintainerThe patch below does not apply to the 6.6-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]>.
Thanks,
Sasha
------------------ original commit in Linus's tree ------------------
From 3d066f9547dd58329b526db44f42c487a7974703 Mon Sep 17 00:00:00 2001
From: Nicholas Kazlauskas <[email protected]>
Date: Wed, 21 Feb 2024 12:27:31 -0500
Subject: [PATCH] drm/amd/display: Fix idle check for shared firmware state
[WHY]
We still had an instance of get_idle_state checking the PMFW scratch register instead of the actual idle allow signal.
[HOW]
Replace it with the SW state check for whether we had allowed idle through notify_idle.
Cc Mario Limonciello <[email protected]>
Cc Alex Deucher <[email protected]>
Reviewed-by Duncan Ma <[email protected]>
Acked-by Alex Hung <[email protected]>
Signed-off-by Nicholas Kazlauskas <[email protected]>
Tested-by Daniel Wheeler <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +3 -9
@@ -4847,22 +4847,16 @@ void dc_exit_ips_for_hw_access(struct dc *dc)bool dc_dmub_is_ips_idle_state (struct dc *dc) { -uint32_t idle_state =0 ; -if (dc->debug.disable_idle_power_optimizations)return false;if (!dc->caps.ips_support || (dc->config.disable_ips ==DMUB_IPS_DISABLE_ALL ))return false; -if (dc->hwss.get_idle_state) - idle_state = dc->hwss.get_idle_state (dc); - -if (!(idle_state &DMUB_IPS1_ALLOW_MASK ) || - !(idle_state &DMUB_IPS2_ALLOW_MASK )) -return true; +if (!dc->ctx->dmub_srv) +return false; -return false; +return dc->ctx->dmub_srv->idle_allowed; }/* set min and max memory clock to lowest and highest DPM level, respectively */
Signature · 1 line
2.43.0