From 3aeb488b83cd14172bdbf74450f5f2bfd394e1f6 Mon Sep 17 00:00:00 2001 From: Tom Chung Date: Mon, 30 Sep 2024 10:55:17 +0800 Subject: [PATCH] UBUNTU: SAUCE: drm/amd/display: Fix system hang while resume with TBT monitor BugLink: https://bugs.launchpad.net/bugs/2083182 [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 Signed-off-by: Tom Chung Signed-off-by: Fangzhi Zuo (cherry picked from commit https://lore.kernel.org/all/20240927170103.102180-3-Jerry.Zuo@amd.com/T/#e868f6b967ec79ae85c5a8a446be9b5d5c97e5427) Signed-off-by: Chia-Lin Kao (AceLan) Acked-by: Guoqing Jiang Acked-by: Ivan Hu Signed-off-by: Roxana Nicolescu --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++++ 1 file changed, 6 insertions(+) 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 55d4bf7508c0..b7606183e766 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -756,6 +756,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;