Commit 57430404 authored by Su Sung Chung's avatar Su Sung Chung Committed by Alex Deucher
Browse files

drm/amd/display: fix audio endpoint not getting disabled issue 



[Why]
Disable_audio_stream gets enum option as a paramenter which will decide
if we free acquired resources or not. However checks for the option is
guarded by the other condition which check if audio stream is getting
diabled more than once. With both conditions combined, if we attempt to
disable audio stream twice in a row, first with keep and second with
free as an option, we will never free any resources, which will make
system think there is audio endpoint connected even after we plug out
the device

[How]
Get rid of option as parameter to disable_audio_stream and move the part
of the code that free acquired resources to outside where to keep or to
free resources is actually determined

Signed-off-by: default avatarSu Sung Chung <Su.Chung@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 67427d4f

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

+5 −1
Original line number Diff line number Diff line
@@ -1918,7 +1918,11 @@ static void commit_planes_do_stream_update(struct dc *dc, 
				dc->hwss.pipe_control_lock(dc, pipe_ctx, true);



				if (*stream_update->dpms_off) {

					core_link_disable_stream(pipe_ctx, KEEP_ACQUIRED_RESOURCE);

					core_link_disable_stream(pipe_ctx);

					/* for dpms, keep acquired resources*/

					if (pipe_ctx->stream_res.audio && !dc->debug.az_endpoint_mute_only)

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



					dc->hwss.optimize_bandwidth(dc, dc->current_state);

				} else {

					if (!dc->optimize_seamless_boot)

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

+2 −2
Original line number Diff line number Diff line
@@ -2804,7 +2804,7 @@ void core_link_enable_stream( 
#endif

}



void core_link_disable_stream(struct pipe_ctx *pipe_ctx, int option)

void core_link_disable_stream(struct pipe_ctx *pipe_ctx)

{

	struct dc  *core_dc = pipe_ctx->stream->ctx->dc;

	struct dc_stream_state *stream = pipe_ctx->stream;
@@ -2839,7 +2839,7 @@ void core_link_disable_stream(struct pipe_ctx *pipe_ctx, int option) 
			write_i2c_redriver_setting(pipe_ctx, false);

		}

	}

	core_dc->hwss.disable_stream(pipe_ctx, option);

	core_dc->hwss.disable_stream(pipe_ctx);



	disable_link(pipe_ctx->stream->link, pipe_ctx->stream->signal);

#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT

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

+3 −1
Original line number Diff line number Diff line
@@ -289,7 +289,9 @@ void dp_retrain_link_dp_test(struct dc_link *link, 


			dp_receiver_power_ctrl(link, false);



			link->dc->hwss.disable_stream(&pipes[i], KEEP_ACQUIRED_RESOURCE);

			link->dc->hwss.disable_stream(&pipes[i]);

			if ((&pipes[i])->stream_res.audio && !link->dc->debug.az_endpoint_mute_only)

				(&pipes[i])->stream_res.audio->funcs->az_disable((&pipes[i])->stream_res.audio);



			link->link_enc->funcs->disable_output(

					link->link_enc,

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

+23 −17
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ void dce110_enable_audio_stream(struct pipe_ctx *pipe_ctx) 
	}

}



void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx, int option)

void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx)

{

	struct dc *dc;

	struct pp_smu_funcs *pp_smu = NULL;
@@ -1004,24 +1004,13 @@ void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx, int option) 
		if (dc->res_pool->pp_smu)

			pp_smu = dc->res_pool->pp_smu;



		if (option != KEEP_ACQUIRED_RESOURCE ||

				!dc->debug.az_endpoint_mute_only)

			/*only disalbe az_endpoint if power down or free*/

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



		if (dc_is_dp_signal(pipe_ctx->stream->signal))

			pipe_ctx->stream_res.stream_enc->funcs->dp_audio_disable(

					pipe_ctx->stream_res.stream_enc);

		else

			pipe_ctx->stream_res.stream_enc->funcs->hdmi_audio_disable(

					pipe_ctx->stream_res.stream_enc);

		/*don't free audio if it is from retrain or internal disable stream*/

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

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

			/*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);

			pipe_ctx->stream_res.audio = NULL;

		}



		if (clk_mgr->funcs->enable_pme_wa)

			/*this is the first audio. apply the PME w/a in order to wake AZ from D3*/

			clk_mgr->funcs->enable_pme_wa(clk_mgr);
@@ -1034,7 +1023,7 @@ void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx, int option) 
	}

}



void dce110_disable_stream(struct pipe_ctx *pipe_ctx, int option)

void dce110_disable_stream(struct pipe_ctx *pipe_ctx)

{

	struct dc_stream_state *stream = pipe_ctx->stream;

	struct dc_link *link = stream->link;
@@ -1051,7 +1040,7 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx, int option) 
		pipe_ctx->stream_res.stream_enc->funcs->stop_dp_info_packets(

			pipe_ctx->stream_res.stream_enc);



	dc->hwss.disable_audio_stream(pipe_ctx, option);

	dc->hwss.disable_audio_stream(pipe_ctx);



	link->link_enc->funcs->connect_dig_be_to_fe(

			link->link_enc,
@@ -1914,8 +1903,25 @@ static void dce110_reset_hw_ctx_wrap( 
			/* Disable if new stream is null. O/w, if stream is

			 * disabled already, no need to disable again.

			 */

			if (!pipe_ctx->stream || !pipe_ctx->stream->dpms_off)

				core_link_disable_stream(pipe_ctx_old, FREE_ACQUIRED_RESOURCE);

			if (!pipe_ctx->stream || !pipe_ctx->stream->dpms_off) {

				core_link_disable_stream(pipe_ctx_old);



				/* free acquired resources*/

				if (pipe_ctx_old->stream_res.audio) {

					/*disable az_endpoint*/

					pipe_ctx_old->stream_res.audio->funcs->

							az_disable(pipe_ctx_old->stream_res.audio);



					/*free audio*/

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

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

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

						update_audio_usage(&dc->current_state->res_ctx, dc->res_pool,

								pipe_ctx_old->stream_res.audio, false);

						pipe_ctx_old->stream_res.audio = NULL;

					}

				}

			}



			pipe_ctx_old->stream_res.tg->funcs->set_blank(pipe_ctx_old->stream_res.tg, true);

			if (!hwss_wait_for_blank_complete(pipe_ctx_old->stream_res.tg)) {

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

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ enum dc_status dce110_apply_ctx_to_hw( 


void dce110_enable_stream(struct pipe_ctx *pipe_ctx);



void dce110_disable_stream(struct pipe_ctx *pipe_ctx, int option);

void dce110_disable_stream(struct pipe_ctx *pipe_ctx);



void dce110_unblank_stream(struct pipe_ctx *pipe_ctx,

		struct dc_link_settings *link_settings);
@@ -50,7 +50,7 @@ void dce110_unblank_stream(struct pipe_ctx *pipe_ctx, 
void dce110_blank_stream(struct pipe_ctx *pipe_ctx);



void dce110_enable_audio_stream(struct pipe_ctx *pipe_ctx);

void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx, int option);

void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx);



void dce110_update_info_frame(struct pipe_ctx *pipe_ctx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE