drm/amd/display: Fix system hang while resume with TBT monitor

commit 52d4e3fb3d340447dcdac0e14ff21a764f326907 upstream.

[Why]
Connected with a Thunderbolt monitor and do the suspend and the system
may hang while resume.

The TBT monitor HPD will be triggered during the resume procedure
and call the drm_client_modeset_probe() while
struct drm_connector connector->dev->master is NULL.

It will mess up the pipe topology after resume.

[How]
Skip the TBT monitor HPD during the resume procedure because we
currently will probe the connectors after resume by default.

Reviewed-by: Wayne Lin <wayne.lin@amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung@amd.com>
Signed-off-by: Fangzhi Zuo <jerry.zuo@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 453f86a26945207a16b8f66aaed5962dc2b95b85)
Cc: stable@vger.kernel.org
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 5b60dc0db0abaeb44729e4eaf3541676c2da44ad..d2554b4a14fe9dbae9b4da663c6a24c1c7a6336f 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -758,6 +758,12 @@ static void dmub_hpd_callback(struct amdgpu_device *adev,
                return;
        }
 
+       /* Skip DMUB HPD IRQ in suspend/resume. We will probe them later. */
+       if (notify->type == DMUB_NOTIFICATION_HPD && adev->in_suspend) {
+               DRM_INFO("Skip DMUB HPD IRQ callback in suspend/resume\n");
+               return;
+       }
+
        link_index = notify->link_index;
        link = adev->dm.dc->links[link_index];
        dev = adev->dm.ddev;