From aa9850705fc05b7e7f44558e30705ac54579e724 Mon Sep 17 00:00:00 2001 From: Eric Yang Date: Thu, 20 Jul 2017 16:17:17 -0400 Subject: [PATCH] drm/amd/display: fix locking in apply_ctx_for_surface Signed-off-by: Eric Yang Reviewed-by: Tony Cheng Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 d607ca9..6db78d9 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 @@ -1696,8 +1696,14 @@ static void dcn10_apply_ctx_for_surface( */ if (pipe_ctx->surface && !old_pipe_ctx->surface) { - if (pipe_ctx->mpcc->opp_id != 0xf && pipe_ctx->tg->inst == be_idx) + if (pipe_ctx->mpcc->opp_id != 0xf && pipe_ctx->tg->inst == be_idx) { dcn10_power_down_fe(dc, pipe_ctx->pipe_idx); + /* + * power down fe will unlock when calling reset, need + * to lock it back here. Messy, need rework. + */ + pipe_ctx->tg->funcs->lock(pipe_ctx->tg); + } } -- 2.7.4