Commit 42408773 authored by Timur Kristóf's avatar Timur Kristóf Committed by Alex Deucher
Browse files

drm/amd/display: Move analog check to dce110_hwseq 



Instead of checking that the signal is analog before calling the
HWSS disable_audio_stream() function to disable audio, move
the check inside the HWSS function.

Suggested-by: default avatarRay Wu <Ray.Wu@amd.com>
Signed-off-by: default avatarTimur Kristóf <timur.kristof@gmail.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Link: https://lore.kernel.org/r/20251113163348.137315-5-timur.kristof@gmail.com


Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent dc82e1bb

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c

+4 −2
Original line number Diff line number Diff line
@@ -1139,6 +1139,9 @@ void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx) 
	if (!pipe_ctx || !pipe_ctx->stream)

		return;



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

		return;



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

	clk_mgr = dc->clk_mgr;

	link_hwss = get_link_hwss(pipe_ctx->stream->link, &pipe_ctx->link_res);
@@ -1193,7 +1196,6 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx) 
		pipe_ctx->stream_res.stream_enc->funcs->stop_dp_info_packets(

			pipe_ctx->stream_res.stream_enc);



	if (!dc_is_rgb_signal(pipe_ctx->stream->signal))

	dc->hwss.disable_audio_stream(pipe_ctx);



	link_hwss->reset_stream_encoder(pipe_ctx);

drivers/gpu/drm/amd/display/dc/link/link_dpms.c

+1 −2
Original line number Diff line number Diff line
@@ -2378,7 +2378,6 @@ void link_set_dpms_off(struct pipe_ctx *pipe_ctx) 
			set_avmute(pipe_ctx, true);

	}



	if (!dc_is_rgb_signal(pipe_ctx->stream->signal))

	dc->hwss.disable_audio_stream(pipe_ctx);



	update_psp_stream_config(pipe_ctx, true);