Commit 52d4e3fb authored by Tom Chung's avatar Tom Chung Committed by Alex Deucher
Browse files

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: default avatarWayne Lin <wayne.lin@amd.com>
Signed-off-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarFangzhi Zuo <jerry.zuo@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 453f86a2)
Cc: stable@vger.kernel.org
parent ef785ca7

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

+6 −0
Original line number Diff line number Diff line
@@ -770,6 +770,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;