drm/amd/display: Solve mst monitors blank out problem after resume

commit e33697141bac18906345ea46533a240f1ad3cd21 upstream.

[Why]
In dm resume, we firstly restore dc state and do the mst resume for topology
probing thereafter. If we change dpcd DP_MSTM_CTRL value after LT in mst reume,
it will cause light up problem on the hub.

[How]
Revert commit 202dc359adda ("drm/amd/display: Defer handling mst up request in resume").
And adjust the reason to trigger dc_link_detect by DETECT_REASON_RESUMEFROMS3S4.

Cc: stable@vger.kernel.org
Fixes: 202dc359adda ("drm/amd/display: Defer handling mst up request in resume")
Signed-off-by: Wayne Lin <Wayne.Lin@amd.com>
Reviewed-by: Fangzhi Zuo <jerry.zuo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index a27c4385702b2ce456253f94a38698a3daa358f8..836bf9ba620d199c12304db5ac6740bb50506be5 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2418,6 +2418,7 @@ static void resume_mst_branch_status(struct drm_dp_mst_topology_mgr *mgr)
 
        ret = drm_dp_dpcd_writeb(mgr->aux, DP_MSTM_CTRL,
                                 DP_MST_EN |
+                                DP_UP_REQ_EN |
                                 DP_UPSTREAM_IS_SRC);
        if (ret < 0) {
                drm_dbg_kms(mgr->dev, "mst write failed - undocked during suspend?\n");
@@ -3017,7 +3018,7 @@ static int dm_resume(void *handle)
                } else {
                        mutex_lock(&dm->dc_lock);
                        dc_exit_ips_for_hw_access(dm->dc);
-                       dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD);
+                       dc_link_detect(aconnector->dc_link, DETECT_REASON_RESUMEFROMS3S4);
                        mutex_unlock(&dm->dc_lock);
                }