Skip to content

Commit 65fbfb0

Browse files
zhikzhaialexdeucher
authored andcommitted
drm/amd/display: skip audio setup when audio stream is enabled
[why] We have minimal pipe split transition method to avoid pipe allocation outage.However, this method will invoke audio setup which cause audio output stuck once pipe reallocate. [how] skip audio setup for pipelines which audio stream has been enabled Reviewed-by: Charlene Liu <Charlene.Liu@amd.com> Acked-by: Wayne Lin <wayne.lin@amd.com> Signed-off-by: zhikzhai <zhikai.zhai@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 52bb214 commit 65fbfb0

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2164,7 +2164,8 @@ static void dce110_setup_audio_dto(
21642164
continue;
21652165
if (pipe_ctx->stream->signal != SIGNAL_TYPE_HDMI_TYPE_A)
21662166
continue;
2167-
if (pipe_ctx->stream_res.audio != NULL) {
2167+
if (pipe_ctx->stream_res.audio != NULL &&
2168+
pipe_ctx->stream_res.audio->enabled == false) {
21682169
struct audio_output audio_output;
21692170

21702171
build_audio_output(context, pipe_ctx, &audio_output);
@@ -2204,7 +2205,8 @@ static void dce110_setup_audio_dto(
22042205
if (!dc_is_dp_signal(pipe_ctx->stream->signal))
22052206
continue;
22062207

2207-
if (pipe_ctx->stream_res.audio != NULL) {
2208+
if (pipe_ctx->stream_res.audio != NULL &&
2209+
pipe_ctx->stream_res.audio->enabled == false) {
22082210
struct audio_output audio_output;
22092211

22102212
build_audio_output(context, pipe_ctx, &audio_output);

0 commit comments

Comments
 (0)