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

drm/amd/display: replace all dc_link function call in link with link functions 



[why]
Link components should not reply on dc_link_exports to access link function in
other link components.

Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@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 202a3816

drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c

+3 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "link_enc_cfg.h"

#include "dc_dmub_srv.h"

#include "dal_asic_id.h"

#include "link.h"



#define CTX \

	enc10->base.ctx
@@ -485,7 +486,7 @@ void dcn31_link_encoder_enable_dp_output( 


		if (link) {

			dpia_control.dpia_id = link->ddc_hw_inst;

			dpia_control.fec_rdy = dc_link_should_enable_fec(link);

			dpia_control.fec_rdy = link->dc->link_srv->dp_should_enable_fec(link);

		} else {

			DC_LOG_ERROR("%s: Failed to execute DPIA enable DMUB command.\n", __func__);

			BREAK_TO_DEBUGGER();
@@ -532,7 +533,7 @@ void dcn31_link_encoder_enable_dp_mst_output( 


		if (link) {

			dpia_control.dpia_id = link->ddc_hw_inst;

			dpia_control.fec_rdy = dc_link_should_enable_fec(link);

			dpia_control.fec_rdy = link->dc->link_srv->dp_should_enable_fec(link);

		} else {

			DC_LOG_ERROR("%s: Failed to execute DPIA enable DMUB command.\n", __func__);

			BREAK_TO_DEBUGGER();

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

+3 −3
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void dp_test_send_phy_test_pattern(struct dc_link *link) 
	/* prepare link training settings */

	link_training_settings.link_settings = link->cur_link_settings;



	link_training_settings.lttpr_mode = dc_link_decide_lttpr_mode(link, &link->cur_link_settings);

	link_training_settings.lttpr_mode = dp_decide_lttpr_mode(link, &link->cur_link_settings);



	if ((link->chip_caps & EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN) &&

			link_training_settings.lttpr_mode == LTTPR_MODE_TRANSPARENT)
@@ -408,7 +408,7 @@ static void dp_test_send_phy_test_pattern(struct dc_link *link) 
	 * all the time. Do not touch it.

	 * forward request to DS

	 */

	dc_link_dp_set_test_pattern(

	dp_set_test_pattern(

		link,

		test_pattern,

		DP_TEST_PATTERN_COLOR_SPACE_UNDEFINED,
@@ -1006,5 +1006,5 @@ void dp_set_preferred_training_settings(struct dc *dc, 


	/* 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);

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

}

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

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ void link_blank_dp_stream(struct dc_link *link, bool hw_init) 
		}



		if ((!link->wa_flags.dp_keep_receiver_powered) || hw_init)

			dc_link_dp_receiver_power_ctrl(link, false);

			dpcd_write_rx_power_ctrl(link, false);

	}

}

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

+3 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
 * provides helper functions exposing bandwidth formulas used in validation.

 */

#include "link_validation.h"

#include "protocols/link_dp_capability.h"

#include "resource.h"



#define DC_LOGGER_INIT(logger)
@@ -233,7 +234,7 @@ uint32_t dp_link_bandwidth_kbps( 
		 */

		link_rate_per_lane_kbps = link_settings->link_rate * LINK_RATE_REF_FREQ_IN_KHZ * BITS_PER_DP_BYTE;

		total_data_bw_efficiency_x10000 = DATA_EFFICIENCY_8b_10b_x10000;

		if (dc_link_should_enable_fec(link)) {

		if (dp_should_enable_fec(link)) {

			total_data_bw_efficiency_x10000 /= 100;

			total_data_bw_efficiency_x10000 *= DATA_EFFICIENCY_8b_10b_FEC_EFFICIENCY_x100;

		}
@@ -329,7 +330,7 @@ static bool dp_validate_mode_timing( 
		timing->v_addressable == (uint32_t) 480)

		return true;



	link_setting = dc_link_get_link_cap(link);

	link_setting = dp_get_verified_link_cap(link);



	/* TODO: DYNAMIC_VALIDATION needs to be implemented */

	/*if (flags.DYNAMIC_VALIDATION == 1 &&

drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c

+15 −13
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
#include "link_edp_panel_control.h"

#include "link_dp_irq_handler.h"

#include "link/accessories/link_dp_trace.h"

#include "link/link_detection.h"

#include "link/link_validation.h"

#include "link_dp_training.h"

#include "atomfirmware.h"

#include "resource.h"
@@ -278,7 +280,7 @@ static void dp_wa_power_up_0010FA(struct dc_link *link, uint8_t *dpcd_data, 


	if (!link->dpcd_caps.dpcd_rev.raw) {

		do {

			dc_link_dp_receiver_power_ctrl(link, true);

			dpcd_write_rx_power_ctrl(link, true);

			core_link_read_dpcd(link, DP_DPCD_REV,

							dpcd_data, length);

			link->dpcd_caps.dpcd_rev.raw = dpcd_data[
@@ -342,7 +344,7 @@ bool dp_should_enable_fec(const struct dc_link *link) 
				|| !link->dc->caps.edp_dsc_support))

		force_disable = true;



	return !force_disable && dc_link_is_fec_supported(link);

	return !force_disable && dp_is_fec_supported(link);

}



bool link_is_dp_128b_132b_signal(struct pipe_ctx *pipe_ctx)
@@ -645,7 +647,7 @@ static bool decide_dp_link_settings(struct dc_link *link, struct dc_link_setting 
			initial_link_setting;

	uint32_t link_bw;



	if (req_bw > dc_link_bandwidth_kbps(link, &link->verified_link_cap))

	if (req_bw > dp_link_bandwidth_kbps(link, &link->verified_link_cap))

		return false;



	/* search for the minimum link setting that:
@@ -765,7 +767,7 @@ bool decide_edp_link_settings_with_dsc(struct dc_link *link, 
		initial_link_setting.use_link_rate_set = false;

		initial_link_setting.link_rate_set = 0;

		current_link_setting = initial_link_setting;

		if (req_bw > dc_link_bandwidth_kbps(link, &link->verified_link_cap))

		if (req_bw > dp_link_bandwidth_kbps(link, &link->verified_link_cap))

			return false;



		/* search for the minimum link setting that:
@@ -774,7 +776,7 @@ bool decide_edp_link_settings_with_dsc(struct dc_link *link, 
		 */

		while (current_link_setting.link_rate <=

				max_link_rate) {

			link_bw = dc_link_bandwidth_kbps(

			link_bw = dp_link_bandwidth_kbps(

					link,

					&current_link_setting);

			if (req_bw <= link_bw) {
@@ -831,7 +833,7 @@ bool decide_edp_link_settings_with_dsc(struct dc_link *link, 
	 */

	while (current_link_setting.link_rate <=

			max_link_rate) {

		link_bw = dc_link_bandwidth_kbps(

		link_bw = dp_link_bandwidth_kbps(

				link,

				&current_link_setting);

		if (req_bw <= link_bw) {
@@ -889,7 +891,7 @@ bool link_decide_link_settings(struct dc_stream_state *stream, 
	struct dc_link_settings *link_setting)

{

	struct dc_link *link = stream->link;

	uint32_t req_bw = dc_bandwidth_in_kbps_from_timing(&stream->timing);

	uint32_t req_bw = link_timing_bandwidth_kbps(&stream->timing);



	memset(link_setting, 0, sizeof(*link_setting));
@@ -922,13 +924,13 @@ bool link_decide_link_settings(struct dc_stream_state *stream, 


				tmp_link_setting.link_rate = LINK_RATE_UNKNOWN;

				tmp_timing.flags.DSC = 0;

				orig_req_bw = dc_bandwidth_in_kbps_from_timing(&tmp_timing);

				dc_link_decide_edp_link_settings(link, &tmp_link_setting, orig_req_bw);

				orig_req_bw = link_timing_bandwidth_kbps(&tmp_timing);

				edp_decide_link_settings(link, &tmp_link_setting, orig_req_bw);

				max_link_rate = tmp_link_setting.link_rate;

			}

			decide_edp_link_settings_with_dsc(link, link_setting, req_bw, max_link_rate);

		} else {

			dc_link_decide_edp_link_settings(link, link_setting, req_bw);

			edp_decide_link_settings(link, link_setting, req_bw);

		}

	} else {

		decide_dp_link_settings(link, link_setting, req_bw);
@@ -2117,8 +2119,8 @@ static bool dp_verify_link_cap( 
		if (status == LINK_TRAINING_SUCCESS) {

			success = true;

			fsleep(1000);

			if (dc_link_dp_read_hpd_rx_irq_data(link, &irq_data) == DC_OK &&

					dc_link_check_link_loss_status(

			if (dp_read_hpd_rx_irq_data(link, &irq_data) == DC_OK &&

					dp_parse_link_loss_status(

							link,

							&irq_data))

				(*fail_count)++;
@@ -2158,7 +2160,7 @@ bool dp_verify_link_cap_with_retries( 


		memset(&link->verified_link_cap, 0,

				sizeof(struct dc_link_settings));

		if (!dc_link_detect_connection_type(link, &type) || type == dc_connection_none) {

		if (!link_detect_connection_type(link, &type) || type == dc_connection_none) {

			link->verified_link_cap = fail_safe_link_settings;

			break;

		} else if (dp_verify_link_cap(link, known_limit_link_setting,