diff options
| author | Eric Yang <Eric.Yang2@amd.com> | 2017-07-20 16:17:17 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:15:26 -0400 |
| commit | aa9850705fc05b7e7f44558e30705ac54579e724 (patch) | |
| tree | 8b32e07b749c742b143443910ec759bfae3222e2 /drivers/gpu | |
| parent | 7f10f3c2a761ddf3dc18be45d4ccf60db5fe10cf (diff) | |
| download | linux-aa9850705fc05b7e7f44558e30705ac54579e724.tar.bz2 | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 8 |
1 files changed, 7 insertions, 1 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 d607ca94bd13..6db78d9f8e3b 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); + } } |