summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/dcn10
diff options
context:
space:
mode:
authorAlvin Lee <alvin.lee2@amd.com>2023-08-23 10:18:36 -0400
committerAlex Deucher <alexander.deucher@amd.com>2023-09-11 17:11:44 -0400
commitcbb4c9bc55427774ca4d819933e1b5fa38a6fb44 (patch)
tree0cb2512f4fc7a948b8c728fee069298b7357e4c9 /drivers/gpu/drm/amd/display/dc/dcn10
parente87a6c5b7780b5f423797351eb586ed96cc6d151 (diff)
downloadlinux-stable-cbb4c9bc55427774ca4d819933e1b5fa38a6fb44.tar.gz
linux-stable-cbb4c9bc55427774ca4d819933e1b5fa38a6fb44.tar.bz2
linux-stable-cbb4c9bc55427774ca4d819933e1b5fa38a6fb44.zip
drm/amd/display: Don't lock phantom pipe on disabling
[Description] - When disabling a phantom pipe, we first enable the phantom OTG so the double buffer update can successfully take place - However, want to avoid locking the phantom otherwise setting DPG_EN=1 for the phantom pipe is blocked (without this we could hit underflow due to phantom HUBP being blanked by default) Reviewed-by: Samson Tam <samson.tam@amd.com> Acked-by: Stylon Wang <stylon.wang@amd.com> Signed-off-by: Alvin Lee <alvin.lee2@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dcn10')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c3
1 files changed, 2 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 9834b75f1837..79befa17bb03 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
@@ -111,7 +111,8 @@ void dcn10_lock_all_pipes(struct dc *dc,
if (pipe_ctx->top_pipe ||
!pipe_ctx->stream ||
(!pipe_ctx->plane_state && !old_pipe_ctx->plane_state) ||
- !tg->funcs->is_tg_enabled(tg))
+ !tg->funcs->is_tg_enabled(tg) ||
+ pipe_ctx->stream->mall_stream_config.type == SUBVP_PHANTOM)
continue;
if (lock)