[PATCH 08/29] drm/amd/display: Use min transition for all SubVP plane add/remove

[Tom Chung]

From: Alvin Lee <alvin.l...@amd.com>

[Description]
- Whenever disabling a phantom pipe, we must run through the
  minimal transition sequence
- In the case where SetVisibility = false for the main pipe,
  we also need to run through the min transtion when disabling
  the phantom pipes

Reviewed-by: Jun Lei <jun....@amd.com>
Acked-by: Tom Chung <chiahsuan.ch...@amd.com>
Signed-off-by: Alvin Lee <alvin.l...@amd.com>
---
 drivers/gpu/drm/amd/display/dc/core/dc.c | 31 +++++++++++++++++-------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c 
b/drivers/gpu/drm/amd/display/dc/core/dc.c
index d90ab1867ed7..0a252a65a678 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -3749,17 +3749,17 @@ static bool 
could_mpcc_tree_change_for_active_pipes(struct dc *dc,
                }
        }
 
-       /* For SubVP when adding MPO video we need to add a minimal transition.
+       /* For SubVP when adding or removing planes we need to add a minimal 
transition
+        * (even when disabling all planes). Whenever disabling a phantom pipe, 
we
+        * must use the minimal transition path to disable the pipe correctly.
         */
        if (cur_stream_status && stream->mall_stream_config.type == SUBVP_MAIN) 
{
                /* determine if minimal transition is required due to SubVP*/
-               if (surface_count > 0) {
-                       if (cur_stream_status->plane_count > surface_count) {
-                               force_minimal_pipe_splitting = true;
-                       } else if (cur_stream_status->plane_count < 
surface_count) {
-                               force_minimal_pipe_splitting = true;
-                               *is_plane_addition = true;
-                       }
+               if (cur_stream_status->plane_count > surface_count) {
+                       force_minimal_pipe_splitting = true;
+               } else if (cur_stream_status->plane_count < surface_count) {
+                       force_minimal_pipe_splitting = true;
+                       *is_plane_addition = true;
                }
        }
 
@@ -3794,6 +3794,7 @@ static bool commit_minimal_transition_state(struct dc *dc,
        enum dc_status ret = DC_ERROR_UNEXPECTED;
        unsigned int i, j;
        unsigned int pipe_in_use = 0;
+       bool subvp_in_use = false;
 
        if (!transition_context)
                return false;
@@ -3810,6 +3811,18 @@ static bool commit_minimal_transition_state(struct dc 
*dc,
                        pipe_in_use++;
        }
 
+       /* If SubVP is enabled and we are adding or removing planes from any 
main subvp
+        * pipe, we must use the minimal transition.
+        */
+       for (i = 0; i < dc->res_pool->pipe_count; i++) {
+               struct pipe_ctx *pipe = &dc->current_state->res_ctx.pipe_ctx[i];
+
+               if (pipe->stream && pipe->stream->mall_stream_config.type == 
SUBVP_PHANTOM) {
+                       subvp_in_use = true;
+                       break;
+               }
+       }
+
        /* When the OS add a new surface if we have been used all of pipes with 
odm combine
         * and mpc split feature, it need use commit_minimal_transition_state 
to transition safely.
         * After OS exit MPO, it will back to use odm and mpc split with all of 
pipes, we need
@@ -3818,7 +3831,7 @@ static bool commit_minimal_transition_state(struct dc *dc,
         * Reduce the scenarios to use dc_commit_state_no_check in the stage of 
flip. Especially
         * enter/exit MPO when DCN still have enough resources.
         */
-       if (pipe_in_use != dc->res_pool->pipe_count) {
+       if (pipe_in_use != dc->res_pool->pipe_count && !subvp_in_use) {
                dc_release_state(transition_context);
                return true;
        }
-- 
2.25.1