Skip to content

Commit

Permalink
drm/amd/display: Fix DIG_HPD_SELECT for USB4 display endpoints.
Browse files Browse the repository at this point in the history
[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 <meenakshikumar.somasundaram@amd.com>
Acked-by: Wayne Lin <Wayne.Lin@amd.com>
Acked-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Jimmy Kizito <Jimmy.Kizito@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Jimmy Kizito authored and Alex Deucher committed Oct 6, 2021
1 parent 88f52b1 commit 8cf5ed4
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8cf5ed4

Please sign in to comment.