Commit 2b7c97d6 authored by Charlene Liu's avatar Charlene Liu Committed by Alex Deucher
Browse files

drm/amd/display: fix seq issue: turn on clock before programming afmt. 



Signed-off-by: default avatarCharlene Liu <charlene.liu@amd.com>
Reviewed-by: default avatarKrunoslav Kovac <Krunoslav.Kovac@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2f2c3b36

drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c

+5 −0
Original line number Diff line number Diff line
@@ -87,6 +87,11 @@ static void dce110_update_generic_info_packet( 
	 */

	uint32_t max_retries = 50;



	REG_GET(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, &regval);

	/*we need turn on clock before programming AFMT block*/

	if (regval != 1)

		REG_UPDATE(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, 1);



	if (REG(AFMT_VBI_PACKET_CONTROL1)) {

		if (packet_index >= 8)

			ASSERT(0);

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

+10 −12
Original line number Diff line number Diff line
@@ -991,6 +991,16 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx, int option) 
	struct dc_link *link = stream->sink->link;

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



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

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

			pipe_ctx->stream_res.stream_enc);



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

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

			pipe_ctx->stream_res.stream_enc);



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

			pipe_ctx->stream_res.stream_enc, true);

	if (pipe_ctx->stream_res.audio) {

		pipe_ctx->stream_res.audio->funcs->az_disable(pipe_ctx->stream_res.audio);
@@ -1015,18 +1025,6 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx, int option) 
		 */

	}



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

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

			pipe_ctx->stream_res.stream_enc);



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

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

			pipe_ctx->stream_res.stream_enc);



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

			pipe_ctx->stream_res.stream_enc, true);





	/* blank at encoder level */

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

		if (pipe_ctx->stream->sink->link->connector_signal == SIGNAL_TYPE_EDP)

CRA Git | Maintained and supported by SUSTech CRA and CCSE