drm/amd/display: remove dpp pipes on failure to update pipe params

[why]
There are cases where update pipe params could fail but dpp pipes are already
added to the state. In this case, we should remove dpp pipes so dc state is
restored back. If it is not restored, dc state is corrupted after calling this
function, so if we call the same interface with the corrupted state again, we
may end up programming pipe topology based on a corrupted dc state.

Reviewed-by: Dillon Varone <dillon.varone@amd.com>
Acked-by: Zaeem Mohamed <zaeem.mohamed@amd.com>
Signed-off-by: Wenjing Liu <wenjing.liu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 6d4d4c95243fd2ba41fbfe3ce24568b10f1f1abf..7894d3e52a2768d30ca9b77c218dca2b2dbb3c8d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -2789,6 +2789,7 @@ bool resource_append_dpp_pipes_for_plane_composition(
                struct dc_plane_state *plane_state)
 {
        bool success;
+
        if (otg_master_pipe->plane_state == NULL)
                success = add_plane_to_opp_head_pipes(otg_master_pipe,
                                plane_state, new_ctx);
@@ -2796,10 +2797,15 @@ bool resource_append_dpp_pipes_for_plane_composition(
                success = acquire_secondary_dpp_pipes_and_add_plane(
                                otg_master_pipe, plane_state, new_ctx,
                                cur_ctx, pool);
-       if (success)
+       if (success) {
                /* when appending a plane mpc slice count changes from 0 to 1 */
                success = update_pipe_params_after_mpc_slice_count_change(
                                plane_state, new_ctx, pool);
+               if (!success)
+                       resource_remove_dpp_pipes_for_plane_composition(new_ctx,
+                                       pool, plane_state);
+       }
+
        return success;
 }
 
@@ -2809,6 +2815,7 @@ void resource_remove_dpp_pipes_for_plane_composition(
                const struct dc_plane_state *plane_state)
 {
        int i;
+
        for (i = pool->pipe_count - 1; i >= 0; i--) {
                struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];