Commit 1f21390e authored by Aric Cyr's avatar Aric Cyr Committed by Alex Deucher
Browse files

drm/amd/display: Fix audio on display after unplugging another 



Revert "dc: skip audio setup when audio stream is enabled"

This reverts commit 65fbfb02

[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: default avatarMartin Leung <Martin.Leung@amd.com>
Acked-by: default avatarJasdeep Dhillon <jdhillon@amd.com>
Signed-off-by: default avatarAric Cyr <aric.cyr@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 567df29f

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

+2 −4
Original line number Diff line number Diff line
@@ -2178,8 +2178,7 @@ static void dce110_setup_audio_dto( 
			continue;

		if (pipe_ctx->stream->signal != SIGNAL_TYPE_HDMI_TYPE_A)

			continue;

		if (pipe_ctx->stream_res.audio != NULL &&

			pipe_ctx->stream_res.audio->enabled == false) {

		if (pipe_ctx->stream_res.audio != NULL) {

			struct audio_output audio_output;



			build_audio_output(context, pipe_ctx, &audio_output);
@@ -2219,8 +2218,7 @@ static void dce110_setup_audio_dto( 
			if (!dc_is_dp_signal(pipe_ctx->stream->signal))

				continue;



			if (pipe_ctx->stream_res.audio != NULL &&

				pipe_ctx->stream_res.audio->enabled == false) {

			if (pipe_ctx->stream_res.audio != NULL) {

				struct audio_output audio_output;



				build_audio_output(context, pipe_ctx, &audio_output);