From: Wesley Chalmers Date: Wed, 20 May 2020 19:32:31 +0000 (-0400) Subject: drm/amd/display: Move call to disable DPG X-Git-Tag: v5.10.7~1861^2~25^2~124 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7efa4f5cdb4c44311483ffacc1cfe235af28b25;p=platform%2Fkernel%2Flinux-rpi.git drm/amd/display: Move call to disable DPG [WHY] Disabling DPG should happen after setting watermarks and clocks Signed-off-by: Wesley Chalmers Reviewed-by: Tony Cheng Acked-by: Qingqing Zhuo Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c index 5b7466a..49dd310 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c @@ -1248,7 +1248,6 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c int i, k, l; struct dc_stream_state *dc_streams[MAX_STREAMS] = {0}; - disable_dangling_plane(dc, context); for (i = 0; i < context->stream_count; i++) dc_streams[i] = context->streams[i]; @@ -1264,6 +1263,7 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *c if (dc->optimize_seamless_boot_streams == 0) dc->hwss.prepare_bandwidth(dc, context); + disable_dangling_plane(dc, context); /* re-program planes for existing stream, in case we need to * free up plane resource for later use */