Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/amd/display: add register offset != 0 check. 



Signed-off-by: default avatarCharlene Liu <charlene.liu@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 aed15309

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

+2 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static void dce110_update_generic_info_packet( 
	uint32_t max_retries = 50;



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

	if (REG(AFMT_CNTL))

		REG_UPDATE(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, 1);



	if (REG(AFMT_VBI_PACKET_CONTROL1)) {

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

+1 −1
Original line number Diff line number Diff line
@@ -1004,9 +1004,9 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx, int option) 
		/*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*/

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

			pipe_ctx->stream_res.audio = NULL;

		}



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