Skip to contentSkip to conversation

FAILED: patch "[PATCH] drm/amd/display: [FIX] update clock under two conditions" failed to apply to 5.9-stable tree

PATCH [email protected] 1 participant 1 message Nov 3, 2020

Subsystems (4)
Stable branch DRM drivers Radeon and amdgpu DRM drivers AMD display core
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.9-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,

greg k-h

------------------ original commit in Linus's tree ------------------

From 12dbd1f7578feb51bc95e5a90eb617889cc0b04e Mon Sep 17 00:00:00 2001
From: Lewis Huang <[email protected]>
Date: Wed, 16 Sep 2020 17:13:11 -0400
Subject: [PATCH] drm/amd/display: [FIX] update clock under two conditions

[Why]
Update clock only when non-seamless boot stream exists creates regression on multiple scenerios.

[How]
Update clock in two conditions
1. Non-seamless boot stream exist.
2. Stream_count = 0

Fixes 598c13b21e25 ("drm/amd/display: update clock when non-seamless boot stream exist")
Signed-off-by Lewis Huang <[email protected]>
Reviewed-by Martin Leung <[email protected]>
Acked-by Qingqing Zhuo <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
Cc <[email protected]>
drivers/gpu/drm/amd/display/dc/core/dc.c +4 -2
index 1efc823c2a14..7e74ddc1c708 100644
@@ -1286,7 +1286,8 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c
 			dc->optimize_seamless_boot_streams++;
 	}
 
-	if (context->stream_count > dc->optimize_seamless_boot_streams)
+	if (context->stream_count > dc->optimize_seamless_boot_streams ||
+		context->stream_count == 0)
 		dc->hwss.prepare_bandwidth(dc, context);
 
 	disable_dangling_plane(dc, context);

@@ -1368,7 +1369,8 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c
 
 	dc_enable_stereo(dc, context, dc_streams, context->stream_count);
 
-	if (context->stream_count > dc->optimize_seamless_boot_streams) {
+	if (context->stream_count > dc->optimize_seamless_boot_streams ||
+		context->stream_count == 0) {
 		/* Must wait for no flips to be pending before doing optimize bw */
 		wait_for_no_pipes_pending(dc, context);
 		/* pplib is notified if disp_num changed */