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

drm/amd/display: move dp cts functions from dc_link_dp to link_dp_cts 



Create new files link_dp_cts.c and link_dp_cts.h, and move DP cts
functions into them.

Reviewed-by: default avatarGeorge Shen <George.Shen@amd.com>
Acked-by: default avatarAlan Liu <HaoPing.Liu@amd.com>
Signed-off-by: default avatarWenjing Liu <wenjing.liu@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c5a31f17

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

+0 −104
Original line number Diff line number Diff line
@@ -4095,110 +4095,6 @@ void core_link_set_avmute(struct pipe_ctx *pipe_ctx, bool enable) 
	dc->hwss.set_avmute(pipe_ctx, enable);

}



void dc_link_set_drive_settings(struct dc *dc,

				struct link_training_settings *lt_settings,

				const struct dc_link *link)

{



	int i;

	struct link_resource link_res;



	for (i = 0; i < dc->link_count; i++)

		if (dc->links[i] == link)

			break;



	if (i >= dc->link_count)

		ASSERT_CRITICAL(false);



	dc_link_get_cur_link_res(link, &link_res);

	dp_set_drive_settings(dc->links[i], &link_res, lt_settings);

}



void dc_link_set_preferred_link_settings(struct dc *dc,

					 struct dc_link_settings *link_setting,

					 struct dc_link *link)

{

	int i;

	struct pipe_ctx *pipe;

	struct dc_stream_state *link_stream;

	struct dc_link_settings store_settings = *link_setting;



	link->preferred_link_setting = store_settings;



	/* Retrain with preferred link settings only relevant for

	 * DP signal type

	 * Check for non-DP signal or if passive dongle present

	 */

	if (!dc_is_dp_signal(link->connector_signal) ||

		link->dongle_max_pix_clk > 0)

		return;



	for (i = 0; i < MAX_PIPES; i++) {

		pipe = &dc->current_state->res_ctx.pipe_ctx[i];

		if (pipe->stream && pipe->stream->link) {

			if (pipe->stream->link == link) {

				link_stream = pipe->stream;

				break;

			}

		}

	}



	/* Stream not found */

	if (i == MAX_PIPES)

		return;



	/* Cannot retrain link if backend is off */

	if (link_stream->dpms_off)

		return;



	if (link_decide_link_settings(link_stream, &store_settings))

		dp_retrain_link_dp_test(link, &store_settings, false);

}



void dc_link_set_preferred_training_settings(struct dc *dc,

						 struct dc_link_settings *link_setting,

						 struct dc_link_training_overrides *lt_overrides,

						 struct dc_link *link,

						 bool skip_immediate_retrain)

{

	if (lt_overrides != NULL)

		link->preferred_training_settings = *lt_overrides;

	else

		memset(&link->preferred_training_settings, 0, sizeof(link->preferred_training_settings));



	if (link_setting != NULL) {

		link->preferred_link_setting = *link_setting;

	} else {

		link->preferred_link_setting.lane_count = LANE_COUNT_UNKNOWN;

		link->preferred_link_setting.link_rate = LINK_RATE_UNKNOWN;

	}



	if (link->connector_signal == SIGNAL_TYPE_DISPLAY_PORT &&

			link->type == dc_connection_mst_branch)

		dm_helpers_dp_mst_update_branch_bandwidth(dc->ctx, link);



	/* Retrain now, or wait until next stream update to apply */

	if (skip_immediate_retrain == false)

		dc_link_set_preferred_link_settings(dc, &link->preferred_link_setting, link);

}



void dc_link_set_test_pattern(struct dc_link *link,

			      enum dp_test_pattern test_pattern,

			      enum dp_test_pattern_color_space test_pattern_color_space,

			      const struct link_training_settings *p_link_settings,

			      const unsigned char *p_custom_pattern,

			      unsigned int cust_pattern_size)

{

	if (link != NULL)

		dc_link_dp_set_test_pattern(

			link,

			test_pattern,

			test_pattern_color_space,

			p_link_settings,

			p_custom_pattern,

			cust_pattern_size);

}



uint32_t dc_link_bandwidth_kbps(

	const struct dc_link *link,

	const struct dc_link_settings *link_setting)

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

+0 −915

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −3
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ struct fixed31_32 calculate_sst_avg_time_slots_per_mtp( 
		const struct dc_link *link);

void setup_dp_hpo_stream(struct pipe_ctx *pipe_ctx, bool enable);

void dp_source_sequence_trace(struct dc_link *link, uint8_t dp_test_mode);

void dp_retrain_link_dp_test(struct dc_link *link,

		struct dc_link_settings *link_setting,

		bool skip_video_pattern);





#endif /* __DC_LINK_DP_H__ */

drivers/gpu/drm/amd/display/dc/link/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
###############################################################################

# accessories

###############################################################################

LINK_ACCESSORIES = link_dp_trace.o

LINK_ACCESSORIES = link_dp_trace.o link_dp_cts.o



AMD_DAL_LINK_ACCESSORIES = $(addprefix $(AMDDALPATH)/dc/link/accessories/, \

$(LINK_ACCESSORIES))

drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c

0 → 100644
+1055 −0

File added.

Preview size limit exceeded, changes collapsed.