Commit c859181c authored by Wenjing Liu's avatar Wenjing Liu Committed by Alex Deucher
Browse files

drm/amd/display: move stream encoder audio setup to link_hwss 



Unify stream encoder audio setup interface.

Tested-by: default avatarMark Broadworth <mark.broadworth@amd.com>
Reviewed-by: default avatarCharlene Liu <Charlene.Liu@amd.com>
Acked-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarWenjing Liu <wenjing.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 14e2739c

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

+5 −17
Original line number Diff line number Diff line
@@ -1455,6 +1455,9 @@ static enum dc_status apply_single_controller_ctx_to_hw( 
	unsigned int event_triggers = 0;

	struct pipe_ctx *odm_pipe = pipe_ctx->next_odm_pipe;

	struct dce_hwseq *hws = dc->hwseq;

	const struct link_hwss *link_hwss = get_link_hwss(

			link, &pipe_ctx->link_res);





	if (hws->funcs.disable_stream_gating) {

		hws->funcs.disable_stream_gating(dc, pipe_ctx);
@@ -1465,23 +1468,8 @@ static enum dc_status apply_single_controller_ctx_to_hw( 


		build_audio_output(context, pipe_ctx, &audio_output);



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

			if (is_dp_128b_132b_signal(pipe_ctx))

				pipe_ctx->stream_res.hpo_dp_stream_enc->funcs->dp_audio_setup(

						pipe_ctx->stream_res.hpo_dp_stream_enc,

						pipe_ctx->stream_res.audio->inst,

						&pipe_ctx->stream->audio_info);

			else

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

						pipe_ctx->stream_res.stream_enc,

						pipe_ctx->stream_res.audio->inst,

						&pipe_ctx->stream->audio_info);

		else

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

					pipe_ctx->stream_res.stream_enc,

					pipe_ctx->stream_res.audio->inst,

					&pipe_ctx->stream->audio_info,

					&audio_output.crtc_info);

		link_hwss->setup_audio_output(pipe_ctx, &audio_output,

				pipe_ctx->stream_res.audio->inst);



		pipe_ctx->stream_res.audio->funcs->az_configure(

				pipe_ctx->stream_res.audio,

drivers/gpu/drm/amd/display/dc/inc/link_hwss.h

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct link_resource; 
struct pipe_ctx;

struct encoder_set_dp_phy_pattern_param;

struct link_mst_stream_allocation_table;

struct audio_output;



struct link_hwss_ext {

	/* function pointers below may require to check for NULL if caller
@@ -79,6 +80,8 @@ struct link_hwss { 
	void (*disable_link_output)(struct dc_link *link,

			const struct link_resource *link_res,

			enum signal_type signal);

	void (*setup_audio_output)(struct pipe_ctx *pipe_ctx,

			struct audio_output *audio_output, uint32_t audio_inst);

	void (*enable_audio_packet)(struct pipe_ctx *pipe_ctx);

	void (*disable_audio_packet)(struct pipe_ctx *pipe_ctx);

};

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

+17 −0
Original line number Diff line number Diff line
@@ -170,6 +170,22 @@ static void update_dio_stream_allocation_table(struct dc_link *link, 
	link_enc->funcs->update_mst_stream_allocation_table(link_enc, table);

}



void setup_dio_audio_output(struct pipe_ctx *pipe_ctx,

		struct audio_output *audio_output, uint32_t audio_inst)

{

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

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

				pipe_ctx->stream_res.stream_enc,

				audio_inst,

				&pipe_ctx->stream->audio_info);

	else

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

				pipe_ctx->stream_res.stream_enc,

				audio_inst,

				&pipe_ctx->stream->audio_info,

				&audio_output->crtc_info);

}



void enable_dio_audio_packet(struct pipe_ctx *pipe_ctx)

{

	if (dc_is_dp_signal(pipe_ctx->stream->signal))
@@ -208,6 +224,7 @@ static const struct link_hwss dio_link_hwss = { 
	.reset_stream_encoder = reset_dio_stream_encoder,

	.setup_stream_attribute = setup_dio_stream_attribute,

	.disable_link_output = disable_dio_link_output,

	.setup_audio_output = setup_dio_audio_output,

	.enable_audio_packet = enable_dio_audio_packet,

	.disable_audio_packet = disable_dio_audio_packet,

	.ext = {

drivers/gpu/drm/amd/display/dc/link/link_hwss_dio.h

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ void set_dio_dp_lane_settings(struct dc_link *link, 
		const struct link_resource *link_res,

		const struct dc_link_settings *link_settings,

		const struct dc_lane_settings lane_settings[LANE_COUNT_DP_MAX]);

void setup_dio_audio_output(struct pipe_ctx *pipe_ctx,

		struct audio_output *audio_output, uint32_t audio_inst);

void enable_dio_audio_packet(struct pipe_ctx *pipe_ctx);

void disable_dio_audio_packet(struct pipe_ctx *pipe_ctx);

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

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ static const struct link_hwss dpia_link_hwss = { 
	.reset_stream_encoder = reset_dio_stream_encoder,

	.setup_stream_attribute = setup_dio_stream_attribute,

	.disable_link_output = disable_dio_link_output,

	.setup_audio_output = setup_dio_audio_output,

	.enable_audio_packet = enable_dio_audio_packet,

	.disable_audio_packet = disable_dio_audio_packet,

	.ext = {