drm/amd/display: clean up mpc programing during fe reset

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index 24c1a0f5febef7a2e49ba511a5b56d3e27d59f38..877e2b6a7dd52f6bd1a2bd87ebe1dbc2f2068cea 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -868,16 +868,10 @@ static void reset_front_end_for_pipe(
         */
        tree_cfg = &dc->current_context->res_ctx.mpc_tree[pipe_ctx->mpc_idx];
 
-       if (pipe_ctx->top_pipe == NULL)
-               dcn10_delete_mpc_tree(mpc, tree_cfg);
-       else {
-               if (dcn10_remove_dpp(mpc, tree_cfg, pipe_ctx->pipe_idx))
-                       pipe_ctx->top_pipe->bottom_pipe = NULL;
-               else {
-                       dm_logger_write(dc->ctx->logger, LOG_RESOURCE,
-                               "%s: failed to find dpp to be removed!\n",
-                               __func__);
-               }
+       if (!dcn10_remove_dpp(mpc, tree_cfg, pipe_ctx->pipe_idx)) {
+               dm_logger_write(dc->ctx->logger, LOG_RESOURCE,
+                       "%s: failed to find dpp to be removed!\n",
+                       __func__);
        }
 
        pipe_ctx->top_pipe = NULL;