Commit ea7ea2a8 authored by Eric Yang's avatar Eric Yang Committed by Alex Deucher
Browse files

drm/amd/display: fix missing az disable in reset backend 



Optimization in reset backend skips disable stream if it is
already done in dc_stream_set_dpms. However that path does
not disable az in order to prevent audio from toggling
between internal and external displays. This still need to
be done.

Signed-off-by: default avatarEric Yang <Eric.Yang2@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e9df9930

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+16 −0
Original line number Diff line number Diff line
@@ -536,6 +536,22 @@ static void reset_back_end_for_pipe( 
		/* DPMS may already disable */

		if (!pipe_ctx->stream->dpms_off)

			core_link_disable_stream(pipe_ctx, FREE_ACQUIRED_RESOURCE);

		else if (pipe_ctx->stream_res.audio) {

			/*

			 * if stream is already disabled outside of commit streams path,

			 * audio disable was skipped. Need to do it here

			 */

			pipe_ctx->stream_res.audio->funcs->az_disable(pipe_ctx->stream_res.audio);



			if (dc->caps.dynamic_audio == true) {

				/*we have to dynamic arbitrate the audio endpoints*/

				pipe_ctx->stream_res.audio = NULL;

				/*we free the resource, need reset is_audio_acquired*/

				update_audio_usage(&dc->current_state->res_ctx, dc->res_pool, pipe_ctx->stream_res.audio, false);

			}



		}



	}



	/* by upper caller loop, parent pipe: pipe0, will be reset last.