drm/amd/display: fix locking in apply_ctx_for_surface

Signed-off-by: Eric Yang <Eric.Yang2@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>
This commit is contained in:
Eric Yang
2017-07-20 16:17:17 -04:00
committed by Alex Deucher
parent 7f10f3c2a7
commit aa9850705f

View File

@@ -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);
}
}