Commit 96410002 authored by Leo (Hanghong) Ma's avatar Leo (Hanghong) Ma Committed by Greg Kroah-Hartman

drm/amd/display: Fix MST reboot/poweroff sequence

commit d2f0b53b upstream.

[Why]

drm_dp_mst_topology_mgr_suspend() is added into the new reboot
sequence, which disables the UP request at the beginning.
Therefore sideband messages are blocked.

[How]

Finish MST sideband message transaction before UP request is
suppressed.
Signed-off-by: 's avatarLeo (Hanghong) Ma <hanghong.ma@amd.com>
Reviewed-by: 's avatarRoman Li <Roman.Li@amd.com>
Acked-by: 's avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: 's avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: 's avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6d8b85f
......@@ -704,12 +704,13 @@ static int dm_suspend(void *handle)
struct amdgpu_display_manager *dm = &adev->dm;
int ret = 0;
WARN_ON(adev->dm.cached_state);
adev->dm.cached_state = drm_atomic_helper_suspend(adev->ddev);
s3_handle_mst(adev->ddev, true);
amdgpu_dm_irq_suspend(adev);
WARN_ON(adev->dm.cached_state);
adev->dm.cached_state = drm_atomic_helper_suspend(adev->ddev);
dc_set_power_state(dm->dc, DC_ACPI_CM_POWER_STATE_D3);
......
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