Commit 00d53a0d authored by Michael Strauss's avatar Michael Strauss Committed by Alex Deucher
Browse files

drm/amd/display: Update chip_cap defines and usage 



[WHY]
The defines have also been updated with prefix AMD_ and atomfirmware.h
has been temporarily updated with both sets of defines to allow the
transition.
This update is being made to standardize workaround chip_cap flags,
in order to support more workaround flags in the future.

[HOW]
Updated EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN define, the flag is now
an enum masked by EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK. All checks for
DP_FIXED_VS_EN are now performed by masking with EXT_CHIP_MASK and
checking for an exact match rather than the previous bitwise AND check.

Reviewed-by: default avatarWenjing Liu <wenjing.liu@amd.com>
Signed-off-by: default avatarMichael Strauss <michael.strauss@amd.com>
Signed-off-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3606115b

drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c

+5 −4
Original line number Diff line number Diff line
@@ -3088,11 +3088,12 @@ static enum bp_result construct_integrated_info( 
						info->ext_disp_conn_info.path[i].ext_encoder_obj_id.id,

						info->ext_disp_conn_info.path[i].caps

						);

			if (info->ext_disp_conn_info.path[i].caps & EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN)

				DC_LOG_BIOS("BIOS EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN on path %d\n", i);

			if ((info->ext_disp_conn_info.path[i].caps & AMD_EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK) == AMD_EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN)

				DC_LOG_BIOS("BIOS AMD_EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN on path %d\n", i);

			else if (bp->base.ctx->dc->config.force_bios_fixed_vs) {

				info->ext_disp_conn_info.path[i].caps |= EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN;

				DC_LOG_BIOS("driver forced EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN on path %d\n", i);

				info->ext_disp_conn_info.path[i].caps &= ~AMD_EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK;

				info->ext_disp_conn_info.path[i].caps |= AMD_EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN;

				DC_LOG_BIOS("driver forced AMD_EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN on path %d\n", i);

			}

		}

		// Log the Checksum and Voltage Swing

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

+2 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static void dp_test_send_phy_test_pattern(struct dc_link *link) 


	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) &&

	if (((link->chip_caps & AMD_EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK) == AMD_EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN) &&

			link_training_settings.lttpr_mode == LTTPR_MODE_TRANSPARENT)

		dp_fixed_vs_pe_read_lane_adjust(

				link,
@@ -646,7 +646,7 @@ bool dp_set_test_pattern( 
	if (IS_DP_PHY_PATTERN(test_pattern)) {

		/* Set DPCD Lane Settings before running test pattern */

		if (p_link_settings != NULL) {

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

			if (((link->chip_caps & AMD_EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK) == AMD_EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN) &&

					p_link_settings->lttpr_mode == LTTPR_MODE_TRANSPARENT) {

				dp_fixed_vs_pe_set_retimer_lane_settings(

						link,

drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_dio_fixed_vs_pe_retimer.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static const struct link_hwss dio_fixed_vs_pe_retimer_link_hwss = { 


bool requires_fixed_vs_pe_retimer_dio_link_hwss(const struct dc_link *link)

{

	return (link->chip_caps & EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN);

	return ((link->chip_caps & AMD_EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK) == AMD_EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN);

}



const struct link_hwss *get_dio_fixed_vs_pe_retimer_link_hwss(void)

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

+7 −7
Original line number Diff line number Diff line
@@ -1974,8 +1974,8 @@ static void enable_link_hdmi(struct pipe_ctx *pipe_ctx) 


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

		unsigned short masked_chip_caps = pipe_ctx->stream->link->chip_caps &

				EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK;

		if (masked_chip_caps == EXT_DISPLAY_PATH_CAPS__HDMI20_TISN65DP159RSBT) {

				AMD_EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK;

		if (masked_chip_caps == AMD_EXT_DISPLAY_PATH_CAPS__HDMI20_TISN65DP159RSBT) {

			/* DP159, Retimer settings */

			eng_id = pipe_ctx->stream_res.stream_enc->id;
@@ -1986,7 +1986,7 @@ static void enable_link_hdmi(struct pipe_ctx *pipe_ctx) 
				write_i2c_default_retimer_setting(pipe_ctx,

						is_vga_mode, is_over_340mhz);

			}

		} else if (masked_chip_caps == EXT_DISPLAY_PATH_CAPS__HDMI20_PI3EQX1204) {

		} else if (masked_chip_caps == AMD_EXT_DISPLAY_PATH_CAPS__HDMI20_PI3EQX1204) {

			/* PI3EQX1204, Redriver settings */

			write_i2c_redriver_setting(pipe_ctx, is_over_340mhz);

		}
@@ -2042,7 +2042,7 @@ static enum dc_status enable_link_dp(struct dc_state *state, 
	int lt_attempts = LINK_TRAINING_ATTEMPTS;



	// Increase retry count if attempting DP1.x on FIXED_VS link

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

	if (((link->chip_caps & AMD_EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK) == AMD_EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN) &&

			link_dp_get_encoding_format(link_settings) == DP_8b_10b_ENCODING)

		lt_attempts = 10;
@@ -2394,13 +2394,13 @@ void link_set_dpms_off(struct pipe_ctx *pipe_ctx) 
		enum engine_id eng_id = pipe_ctx->stream_res.stream_enc->id;



		unsigned short masked_chip_caps = link->chip_caps &

				EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK;

				AMD_EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK;

		//Need to inform that sink is going to use legacy HDMI mode.

		write_scdc_data(

			link->ddc,

			165000,//vbios only handles 165Mhz.

			false);

		if (masked_chip_caps == EXT_DISPLAY_PATH_CAPS__HDMI20_TISN65DP159RSBT) {

		if (masked_chip_caps == AMD_EXT_DISPLAY_PATH_CAPS__HDMI20_TISN65DP159RSBT) {

			/* DP159, Retimer settings */

			if (get_ext_hdmi_settings(pipe_ctx, eng_id, &settings))

				write_i2c_retimer_setting(pipe_ctx,
@@ -2408,7 +2408,7 @@ void link_set_dpms_off(struct pipe_ctx *pipe_ctx) 
			else

				write_i2c_default_retimer_setting(pipe_ctx,

						false, false);

		} else if (masked_chip_caps == EXT_DISPLAY_PATH_CAPS__HDMI20_PI3EQX1204) {

		} else if (masked_chip_caps == AMD_EXT_DISPLAY_PATH_CAPS__HDMI20_PI3EQX1204) {

			/* PI3EQX1204, Redriver settings */

			write_i2c_redriver_setting(pipe_ctx, false);

		}

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

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static bool construct_phy(struct dc_link *link, 
						  link->chip_caps);

				}



				if (link->chip_caps & EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN) {

				if ((link->chip_caps & AMD_EXT_DISPLAY_PATH_CAPS__EXT_CHIP_MASK) == AMD_EXT_DISPLAY_PATH_CAPS__DP_FIXED_VS_EN) {

					link->bios_forced_drive_settings.VOLTAGE_SWING =

						(bios->integrated_info->ext_disp_conn_info.fixdpvoltageswing & 0x3);

					link->bios_forced_drive_settings.PRE_EMPHASIS =