From a1ff2f6547707a2b38ea1c8b3d394703f4465429 Mon Sep 17 00:00:00 2001 From: Dmytro Laktyushkin Date: Thu, 1 Jun 2017 12:27:00 -0400 Subject: [PATCH 0494/4131] drm/amd/display: clean up mpc programing during fe reset Signed-off-by: Dmytro Laktyushkin Reviewed-by: Tony Cheng Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) 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 24c1a0f..877e2b6 100644 --- 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; -- 2.7.4