Skip to content

Commit d20ebea

Browse files
committed
drm/amdgpu/dm: Resume short HPD IRQs before resuming MST topology
Since we're going to be reprobing the entire topology state on resume now using sideband transactions, we need to ensure that we actually have short HPD irqs enabled before calling drm_dp_mst_topology_mgr_resume(). So, do that. Changes since v3: * Fix typo in comments Cc: Juston Li <[email protected]> Cc: Imre Deak <[email protected]> Cc: Ville Syrjälä <[email protected]> Cc: Harry Wentland <[email protected]> Cc: Daniel Vetter <[email protected]> Acked-by: Alex Deucher <[email protected]> Signed-off-by: Lyude Paul <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 6857f87 commit d20ebea

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,15 +1186,15 @@ static int dm_resume(void *handle)
11861186
/* program HPD filter */
11871187
dc_resume(dm->dc);
11881188

1189-
/* On resume we need to rewrite the MSTM control bits to enamble MST*/
1190-
s3_handle_mst(ddev, false);
1191-
11921189
/*
11931190
* early enable HPD Rx IRQ, should be done before set mode as short
11941191
* pulse interrupts are used for MST
11951192
*/
11961193
amdgpu_dm_irq_resume_early(adev);
11971194

1195+
/* On resume we need to rewrite the MSTM control bits to enable MST*/
1196+
s3_handle_mst(ddev, false);
1197+
11981198
/* Do detection*/
11991199
drm_connector_list_iter_begin(ddev, &iter);
12001200
drm_for_each_connector_iter(connector, &iter) {

0 commit comments

Comments
 (0)