Commit 6ef86fa8 authored by Meenakshikumar Somasundaram's avatar Meenakshikumar Somasundaram Committed by Alex Deucher
Browse files

drm/amd/display: Add hpd pending flag to indicate detection of new hpd 



[Why]
For dpia link, link->hpd_status indicates current state, but driver
fails to capture hpd transitions in certain scenarios such as during
link training.

[How]
Added link->hpd_pending flag that captures arrival of new hpd.

Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarAnson Jacob <Anson.Jacob@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarMeenakshikumar Somasundaram <meenakshikumar.somasundaram@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 095041db

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

+3 −3
Original line number Diff line number Diff line
@@ -270,10 +270,10 @@ bool dc_link_detect_sink(struct dc_link *link, enum dc_connection_type *type) 


	/* Link may not have physical HPD pin. */

	if (link->ep_type != DISPLAY_ENDPOINT_PHY) {

		if (link->hpd_status)

			*type = dc_connection_single;

		else

		if (link->is_hpd_pending || !link->hpd_status)

			*type = dc_connection_none;

		else

			*type = dc_connection_single;



		return true;

	}

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

+10 −10
Original line number Diff line number Diff line
@@ -94,17 +94,17 @@ static enum link_training_result dpia_configure_link(struct dc_link *link, 
		lt_settings);



	status = dpcd_configure_channel_coding(link, lt_settings);

	if (status != DC_OK && !link->hpd_status)

	if (status != DC_OK && link->is_hpd_pending)

		return LINK_TRAINING_ABORT;



	/* Configure lttpr mode */

	status = dpcd_configure_lttpr_mode(link, lt_settings);

	if (status != DC_OK && !link->hpd_status)

	if (status != DC_OK && link->is_hpd_pending)

		return LINK_TRAINING_ABORT;



	/* Set link rate, lane count and spread. */

	status = dpcd_set_link_settings(link, lt_settings);

	if (status != DC_OK && !link->hpd_status)

	if (status != DC_OK && link->is_hpd_pending)

		return LINK_TRAINING_ABORT;



	if (link->preferred_training_settings.fec_enable)
@@ -112,7 +112,7 @@ static enum link_training_result dpia_configure_link(struct dc_link *link, 
	else

		fec_enable = true;

	status = dp_set_fec_ready(link, fec_enable);

	if (status != DC_OK && !link->hpd_status)

	if (status != DC_OK && link->is_hpd_pending)

		return LINK_TRAINING_ABORT;



	return LINK_TRAINING_SUCCESS;
@@ -388,7 +388,7 @@ static enum link_training_result dpia_training_cr_non_transparent(struct dc_link 
	}



	/* Abort link training if clock recovery failed due to HPD unplug. */

	if (!link->hpd_status)

	if (link->is_hpd_pending)

		result = LINK_TRAINING_ABORT;



	DC_LOG_HW_LINK_TRAINING("%s\n DPIA(%d) clock recovery\n"
@@ -490,7 +490,7 @@ static enum link_training_result dpia_training_cr_transparent(struct dc_link *li 
	}



	/* Abort link training if clock recovery failed due to HPD unplug. */

	if (!link->hpd_status)

	if (link->is_hpd_pending)

		result = LINK_TRAINING_ABORT;



	DC_LOG_HW_LINK_TRAINING("%s\n DPIA(%d) clock recovery\n"
@@ -675,7 +675,7 @@ static enum link_training_result dpia_training_eq_non_transparent(struct dc_link 
	}



	/* Abort link training if equalization failed due to HPD unplug. */

	if (!link->hpd_status)

	if (link->is_hpd_pending)

		result = LINK_TRAINING_ABORT;



	DC_LOG_HW_LINK_TRAINING("%s\n DPIA(%d) equalization\n"
@@ -758,7 +758,7 @@ static enum link_training_result dpia_training_eq_transparent(struct dc_link *li 
	}



	/* Abort link training if equalization failed due to HPD unplug. */

	if (!link->hpd_status)

	if (link->is_hpd_pending)

		result = LINK_TRAINING_ABORT;



	DC_LOG_HW_LINK_TRAINING("%s\n DPIA(%d) equalization\n"
@@ -892,10 +892,10 @@ static void dpia_training_abort(struct dc_link *link, uint32_t hop) 
				__func__,

				link->link_id.enum_id - ENUM_ID_1,

				link->lttpr_mode,

				link->hpd_status);

				link->is_hpd_pending);



	/* Abandon clean-up if sink unplugged. */

	if (!link->hpd_status)

	if (link->is_hpd_pending)

		return;



	if (hop != DPRX)

drivers/gpu/drm/amd/display/dc/dc_link.h

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ struct dc_link { 
	 * DIG encoder. */

	bool is_dig_mapping_flexible;

	bool hpd_status; /* HPD status of link without physical HPD pin. */

	bool is_hpd_pending; /* Indicates a new received hpd */



	bool edp_sink_present;