summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>2017-06-01 12:27:00 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 18:07:47 -0400
commitdcf6c1456ef555c4a1c0d28326a7bac2fc6923de (patch)
tree78f01e7b50d998631ec3e75a65fc17645e479ac1 /drivers
parente7b1322e15ea66c135ff98c1eb15fc542ef79c89 (diff)
downloadlinux-dcf6c1456ef555c4a1c0d28326a7bac2fc6923de.tar.bz2
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c14
1 files 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 24c1a0f5febe..877e2b6a7dd5 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;