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

Commit 3d5bae9e authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Pass signal directly to enable_tmds_output 



This makes the check for HDMI and dual-link DVI a bit more
straightforward.

Signed-off-by: default avatarHarry Wentland <harry.wentland@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 64245fa7

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

+1 −2
Original line number Diff line number Diff line
@@ -1749,8 +1749,7 @@ static void enable_link_hdmi(struct pipe_ctx *pipe_ctx) 
			link->link_enc,

			pipe_ctx->clock_source->id,

			display_color_depth,

			pipe_ctx->stream->signal == SIGNAL_TYPE_HDMI_TYPE_A,

			pipe_ctx->stream->signal == SIGNAL_TYPE_DVI_DUAL_LINK,

			pipe_ctx->stream->signal,

			stream->phy_pix_clk);



	if (pipe_ctx->stream->signal == SIGNAL_TYPE_HDMI_TYPE_A)

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

+5 −10
Original line number Diff line number Diff line
@@ -897,8 +897,7 @@ void dce110_link_encoder_enable_tmds_output( 
	struct link_encoder *enc,

	enum clock_source_id clock_source,

	enum dc_color_depth color_depth,

	bool hdmi,

	bool dual_link,

	enum signal_type signal,

	uint32_t pixel_clock)

{

	struct dce110_link_encoder *enc110 = TO_DCE110_LINK_ENC(enc);
@@ -912,16 +911,12 @@ void dce110_link_encoder_enable_tmds_output( 
	cntl.engine_id = enc->preferred_engine;

	cntl.transmitter = enc110->base.transmitter;

	cntl.pll_id = clock_source;

	if (hdmi) {

		cntl.signal = SIGNAL_TYPE_HDMI_TYPE_A;

		cntl.lanes_number = 4;

	} else if (dual_link) {

		cntl.signal = SIGNAL_TYPE_DVI_DUAL_LINK;

	cntl.signal = signal;

	if (cntl.signal == SIGNAL_TYPE_DVI_DUAL_LINK)

		cntl.lanes_number = 8;

	} else {

		cntl.signal = SIGNAL_TYPE_DVI_SINGLE_LINK;

	else

		cntl.lanes_number = 4;

	}



	cntl.hpd_sel = enc110->base.hpd_source;



	cntl.pixel_clock = pixel_clock;

drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h

+1 −2
Original line number Diff line number Diff line
@@ -210,8 +210,7 @@ void dce110_link_encoder_enable_tmds_output( 
	struct link_encoder *enc,

	enum clock_source_id clock_source,

	enum dc_color_depth color_depth,

	bool hdmi,

	bool dual_link,

	enum signal_type signal,

	uint32_t pixel_clock);



/* enables DP PHY output */

drivers/gpu/drm/amd/display/dc/inc/hw/link_encoder.h

+1 −2
Original line number Diff line number Diff line
@@ -123,8 +123,7 @@ struct link_encoder_funcs { 
	void (*enable_tmds_output)(struct link_encoder *enc,

		enum clock_source_id clock_source,

		enum dc_color_depth color_depth,

		bool hdmi,

		bool dual_link,

		enum signal_type signal,

		uint32_t pixel_clock);

	void (*enable_dp_output)(struct link_encoder *enc,

		const struct dc_link_settings *link_settings,

drivers/gpu/drm/amd/display/dc/virtual/virtual_link_encoder.c

+1 −2
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ static void virtual_link_encoder_enable_tmds_output( 
	struct link_encoder *enc,

	enum clock_source_id clock_source,

	enum dc_color_depth color_depth,

	bool hdmi,

	bool dual_link,

	enum signal_type signal,

	uint32_t pixel_clock) {}



static void virtual_link_encoder_enable_dp_output(