Commit 02553f57 authored by Eric Bernstein's avatar Eric Bernstein Committed by Alex Deucher
Browse files

drm/amd/display: Rename is_hdmi to is_hdmi_tmds type 



HDMI has TMDS and FRL signal types. Be specific about what is used.

Signed-off-by: default avatarEric Bernstein <eric.bernstein@amd.com>
Reviewed-by: default avatarNevenko Stupar <Nevenko.Stupar@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e6bddf6c

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

+1 −1
Original line number Diff line number Diff line
@@ -2579,7 +2579,7 @@ void core_link_enable_stream( 
			&stream->timing,

			stream->output_color_space);



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

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

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

			pipe_ctx->stream_res.stream_enc,

			&stream->timing,

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

+8 −7
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ dce110_set_output_transfer_func(struct pipe_ctx *pipe_ctx, 


void dce110_update_info_frame(struct pipe_ctx *pipe_ctx)

{

	bool is_hdmi;

	bool is_hdmi_tmds;

	bool is_dp;



	ASSERT(pipe_ctx->stream);
@@ -624,13 +624,13 @@ void dce110_update_info_frame(struct pipe_ctx *pipe_ctx) 
	if (pipe_ctx->stream_res.stream_enc == NULL)

		return;  /* this is not root pipe */



	is_hdmi = dc_is_hdmi_signal(pipe_ctx->stream->signal);

	is_hdmi_tmds = dc_is_hdmi_tmds_signal(pipe_ctx->stream->signal);

	is_dp = dc_is_dp_signal(pipe_ctx->stream->signal);



	if (!is_hdmi && !is_dp)

	if (!is_hdmi_tmds && !is_dp)

		return;



	if (is_hdmi)

	if (is_hdmi_tmds)

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

			pipe_ctx->stream_res.stream_enc,

			&pipe_ctx->stream_res.encoder_info_frame);
@@ -974,6 +974,7 @@ void dce110_enable_audio_stream(struct pipe_ctx *pipe_ctx) 
			set_pme_wa_enable_by_version(core_dc);

		/* un-mute audio */

		/* TODO: audio should be per stream rather than per link */

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

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

				pipe_ctx->stream_res.stream_enc, false);

	}
@@ -1026,7 +1027,7 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx, int option) 
	struct dc_link *link = stream->link;

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



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

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

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

			pipe_ctx->stream_res.stream_enc);

drivers/gpu/drm/amd/display/include/signal_types.h

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ enum signal_type { 
};



/* help functions for signal types manipulation */

static inline bool dc_is_hdmi_tmds_signal(enum signal_type signal)

{

	return (signal == SIGNAL_TYPE_HDMI_TYPE_A);

}



static inline bool dc_is_hdmi_signal(enum signal_type signal)

{

	return (signal == SIGNAL_TYPE_HDMI_TYPE_A);

CRA Git | Maintained and supported by SUSTech CRA and CCSE