]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/amd/display: Revert "enable plane if plane_status changed"
authorHugo Hu <hugo.hu@amd.com>
Wed, 20 May 2020 04:31:19 +0000 (12:31 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 1 Jul 2020 05:59:20 +0000 (01:59 -0400)
This reverts commmit fd0293dd5b68a67a8731d54a6b334945e4e95757.

Signed-off-by: Hugo Hu <hugo.hu@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Qingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c

index 0b318f799db362186aabad557d909712c751c0a0..65e83fdd7b4434948b44ca872b81b20e9167cb3c 100644 (file)
@@ -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;