Commit 3005e437 authored by Wenjing Liu's avatar Wenjing Liu Committed by Alex Deucher
Browse files

drm/amd/display: re-enable audio after LT test 



[Description]
Audio should be attached to the same pipe once it is attached.
We will not remove audio endpoint in disable stream.
We will reeanble the audio after automated link training test

Signed-off-by: default avatarWenjing Liu <Wenjing.Liu@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9799624a

drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c

+14 −0
Original line number Diff line number Diff line
@@ -310,6 +310,20 @@ void dp_retrain_link_dp_test(struct dc_link *link, 


			link->dc->hwss.unblank_stream(&pipes[i],

					link_setting);



			if (pipes[i].stream_res.audio) {

				/* notify audio driver for

				 * audio modes of monitor */

				pipes[i].stream_res.audio->funcs->az_enable(

						pipes[i].stream_res.audio);



				/* un-mute audio */

				/* TODO: audio should be per stream rather than

				 * per link */

				pipes[i].stream_res.stream_enc->funcs->

				audio_mute_control(

					pipes[i].stream_res.stream_enc, false);

			}

		}

	}

}

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

+0 −2
Original line number Diff line number Diff line
@@ -758,8 +758,6 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx) 
			pipe_ctx->stream_res.stream_enc->funcs->hdmi_audio_disable(

					pipe_ctx->stream_res.stream_enc);



		pipe_ctx->stream_res.audio = NULL;



		/* TODO: notify audio driver for if audio modes list changed

		 * add audio mode list change flag */

		/* dal_audio_disable_azalia_audio_jack_presence(stream->audio,