From c0838cbee2d05c3eb8a2b5a3d1ce706a73008044 Mon Sep 17 00:00:00 2001 From: Hugo Hu Date: Wed, 20 May 2020 12:31:19 +0800 Subject: [PATCH] drm/amd/display: Revert "enable plane if plane_status changed" This reverts commmit fd0293dd5b68a67a8731d54a6b334945e4e95757. Signed-off-by: Hugo Hu Reviewed-by: Tony Cheng Acked-by: Qingqing Zhuo Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c index 0b318f799db3..65e83fdd7b44 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c @@ -1209,20 +1209,13 @@ void dcn20_pipe_control_lock( static void dcn20_detect_pipe_changes(struct pipe_ctx *old_pipe, struct pipe_ctx *new_pipe) { - bool plane_state_update = false; new_pipe->update_flags.raw = 0; /* Exit on unchanged, unused pipe */ if (!old_pipe->plane_state && !new_pipe->plane_state) return; - - /* Detect plane state update */ - if (old_pipe->plane_state && new_pipe->plane_state - && (old_pipe->plane_state != new_pipe->plane_state)) { - plane_state_update = true; - } /* Detect pipe enable/disable */ - if ((!old_pipe->plane_state && new_pipe->plane_state) || plane_state_update) { + if (!old_pipe->plane_state && new_pipe->plane_state) { new_pipe->update_flags.bits.enable = 1; new_pipe->update_flags.bits.mpcc = 1; new_pipe->update_flags.bits.dppclk = 1;