Commit 684cd480 authored by Lyude Paul's avatar Lyude Paul Committed by Alex Deucher

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 v4:
* Fix typo in comments

Cc: Juston Li <juston.li@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Harry Wentland <hwentlan@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 88d80250
...@@ -1239,15 +1239,15 @@ static int dm_resume(void *handle) ...@@ -1239,15 +1239,15 @@ static int dm_resume(void *handle)
/* program HPD filter */ /* program HPD filter */
dc_resume(dm->dc); dc_resume(dm->dc);
/* On resume we need to rewrite the MSTM control bits to enamble MST*/
s3_handle_mst(ddev, false);
/* /*
* early enable HPD Rx IRQ, should be done before set mode as short * early enable HPD Rx IRQ, should be done before set mode as short
* pulse interrupts are used for MST * pulse interrupts are used for MST
*/ */
amdgpu_dm_irq_resume_early(adev); amdgpu_dm_irq_resume_early(adev);
/* On resume we need to rewrite the MSTM control bits to enable MST*/
s3_handle_mst(ddev, false);
/* Do detection*/ /* Do detection*/
list_for_each_entry(connector, &ddev->mode_config.connector_list, head) { list_for_each_entry(connector, &ddev->mode_config.connector_list, head) {
aconnector = to_amdgpu_dm_connector(connector); aconnector = to_amdgpu_dm_connector(connector);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment