Commit 8cf5ed4a authored by Jimmy Kizito's avatar Jimmy Kizito Committed by Alex Deucher
Browse files

drm/amd/display: Fix DIG_HPD_SELECT for USB4 display endpoints. 



[Why]
DIB_BE_CNTL<i>.DIG_HPD_SELECT selects the HPD block being used
by the display endpoint assigned to DIG<i>. In the case of USB4
display endpoints, no physical HPD block is assigned.

[How]
Setting DIB_BE_CNTL<i>.DIG_HPD_SELECT to 5 indicates that no HPD
is assigned to a display endpoint. Firmware decrements the
HPD_SELECT value by 1 before writing it to the register.

Reviewed-by: default avatarMeenakshikumar Somasundaram <meenakshikumar.somasundaram@amd.com>
Acked-by: default avatarWayne Lin <Wayne.Lin@amd.com>
Acked-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarJimmy Kizito <Jimmy.Kizito@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 88f52b1f

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

+9 −3
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static bool link_dpia_control(struct dc_context *dc_ctx, 
	dc_dmub_srv_cmd_execute(dmub);

	dc_dmub_srv_wait_idle(dmub);



	return false;

	return true;

}



static void link_encoder_disable(struct dcn10_link_encoder *enc10)
@@ -424,7 +424,10 @@ void dcn31_link_encoder_enable_dp_output( 
		dpia_control.lanenum = (uint8_t)link_settings->lane_count;

		dpia_control.symclk_10khz = link_settings->link_rate *

				LINK_RATE_REF_FREQ_IN_KHZ / 10;

		dpia_control.hpdsel = 5; /* Unused by DPIA */

		/* DIG_BE_CNTL.DIG_HPD_SELECT set to 5 (hpdsel - 1) to indicate HPD pin

		 * unused by DPIA.

		 */

		dpia_control.hpdsel = 6;



		if (link) {

			dpia_control.dpia_id = link->ddc_hw_inst;
@@ -466,7 +469,10 @@ void dcn31_link_encoder_enable_dp_mst_output( 
		dpia_control.lanenum = (uint8_t)link_settings->lane_count;

		dpia_control.symclk_10khz = link_settings->link_rate *

				LINK_RATE_REF_FREQ_IN_KHZ / 10;

		dpia_control.hpdsel = 5; /* Unused by DPIA */

		/* DIG_BE_CNTL.DIG_HPD_SELECT set to 5 (hpdsel - 1) to indicate HPD pin

		 * unused by DPIA.

		 */

		dpia_control.hpdsel = 6;



		if (link) {

			dpia_control.dpia_id = link->ddc_hw_inst;