[PATCH 05/21] drm/amd/display: Add minimal pipe split transition state

[Alan Liu]

From: Dillon Varone <dillon.var...@amd.com>

[WHY?] When adding/removng a plane to some configurations,
unsupported pipe programming can occur when moving to a new plane.

[HOW?]
Add a safe transistion state before programming new configuration.

Reviewed-by: Aric Cyr <aric....@amd.com>
Acked-by: Alan Liu <haoping....@amd.com>
Signed-off-by: Dillon Varone <dillon.var...@amd.com>
---
 drivers/gpu/drm/amd/display/dc/core/dc.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c 
b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 61e3bb99375f..01b5996fa3aa 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1082,7 +1082,8 @@ static void disable_dangling_plane(struct dc *dc, struct 
dc_state *context)
                                break;
                        }
                }
-               if (!should_disable && pipe_split_change)
+               if (!should_disable && pipe_split_change &&
+                               dc->current_state->stream_count != 
context->stream_count)
                        should_disable = true;
 
                if (should_disable && old_stream) {
@@ -1690,6 +1691,7 @@ static enum dc_status dc_commit_state_no_check(struct dc 
*dc, struct dc_state *c
        struct pipe_ctx *pipe;
        int i, k, l;
        struct dc_stream_state *dc_streams[MAX_STREAMS] = {0};
+       struct dc_state *old_state;
 
 #if defined(CONFIG_DRM_AMD_DC_DCN)
        dc_z10_restore(dc);
@@ -1808,10 +1810,11 @@ static enum dc_status dc_commit_state_no_check(struct 
dc *dc, struct dc_state *c
        for (i = 0; i < context->stream_count; i++)
                context->streams[i]->mode_changed = false;
 
-       dc_release_state(dc->current_state);
-
+       old_state = dc->current_state;
        dc->current_state = context;
 
+       dc_release_state(old_state);
+
        dc_retain_state(dc->current_state);
 
        return result;
-- 
2.25.1