From: Dillon Varone <Dillon.Varone@amd.com>
Date: Wed, 10 Sep 2025 20:55:23 +0000 (-0400)
Subject: drm/amd/display: Set wm_pending when disable stutter w/a used
X-Git-Tag: v6.18-rc1~134^2^2~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c480d074b3ff27a8d582505dfd53c9b091b63d57;p=thirdparty%2Fkernel%2Flinux.git

drm/amd/display: Set wm_pending when disable stutter w/a used

[WHY&HOW]
When stutter is disabled prior to watermark programming due to a w/a,
wm_pending should be returned as true.

Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Dillon Varone <Dillon.Varone@amd.com>
Signed-off-by: Ivan Lipski <ivan.lipski@amd.com>
Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c
index 3b71bfaca2914..4d4ca6d77bbda 100644
--- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c
+++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c
@@ -770,6 +770,7 @@ static bool hubbub32_program_watermarks(
 			(ASICREV_IS_GC_11_0_0(dc->ctx->asic_id.hw_internal_rev) ||
 			ASICREV_IS_GC_11_0_3(dc->ctx->asic_id.hw_internal_rev))) {
 		/* before raising watermarks, SDP control give to DF, stutter must be disabled */
+		wm_pending = true;
 		hubbub32_set_sdp_control(hubbub, false);
 		hubbub1_allow_self_refresh_control(hubbub, false);
 	}