Skip to content

Commit 52d4e3f

Browse files
Tom Chungalexdeucher
authored andcommitted
drm/amd/display: Fix system hang while resume with TBT monitor
[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 453f86a) Cc: stable@vger.kernel.org
1 parent ef785ca commit 52d4e3f

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,12 @@ static void dmub_hpd_callback(struct amdgpu_device *adev,
770770
return;
771771
}
772772

773+
/* Skip DMUB HPD IRQ in suspend/resume. We will probe them later. */
774+
if (notify->type == DMUB_NOTIFICATION_HPD && adev->in_suspend) {
775+
DRM_INFO("Skip DMUB HPD IRQ callback in suspend/resume\n");
776+
return;
777+
}
778+
773779
link_index = notify->link_index;
774780
link = adev->dm.dc->links[link_index];
775781
dev = adev->dm.ddev;

0 commit comments

Comments
 (0)