]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amd/display: [FIX] update clock under two conditions
authorLewis Huang <Lewis.Huang@amd.com>
Wed, 16 Sep 2020 21:13:11 +0000 (17:13 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 22 Sep 2020 21:37:20 +0000 (17:37 -0400)
[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 <Lewis.Huang@amd.com>
Reviewed-by: Martin Leung <Martin.Leung@amd.com>
Acked-by: Qingqing Zhuo <Qingqing.zhuo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: <stable@vger.kernel.org>
drivers/gpu/drm/amd/display/dc/core/dc.c

index 1efc823c2a14ca571b999142b08a0a720f4b3ddd..7e74ddc1c708ca5cc6786ae6810340def5a09266 100644 (file)
@@ -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 */