diff options
| author | Jimmy Kizito <[email protected]> | 2021-08-23 17:23:24 -0400 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2021-10-06 15:52:37 -0400 |
| commit | 8cf5ed4a158e08f2b20c3a91bf4b72f8a9938ace (patch) | |
| tree | d7a1811603cf13735b633f7d6be29b6c93bf718f | |
| parent | 88f52b1fff891e79e7b14743996fdd39692784d7 (diff) | |
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: Meenakshikumar Somasundaram <[email protected]>
Acked-by: Wayne Lin <[email protected]>
Acked-by: Nicholas Kazlauskas <[email protected]>
Acked-by: Harry Wentland <[email protected]>
Signed-off-by: Jimmy Kizito <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c index a5266d5999d7..8f8eee475144 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c @@ -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; |