Skip to content

Commit

Permalink
drm/amd/display: fix potential gpu reset deadlock
Browse files Browse the repository at this point in the history
[ Upstream commit cf8b92a ]

[Why]
In gpu reset dc_lock acquired in dm_suspend().
Asynchronously handle_hpd_rx_irq can also be called
through amdgpu_dm_irq_suspend->flush_work, which also
tries to acquire dc_lock. That causes a deadlock.

[How]
Check if amdgpu executing reset before acquiring dc_lock.

Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Signed-off-by: Roman Li <Roman.Li@amd.com>
Reviewed-by: Qingqing Zhuo <Qingqing.Zhuo@amd.com>
Acked-by: Wayne Lin <Wayne.Lin@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Roman Li authored and gregkh committed Jul 14, 2021
1 parent e6706ff commit a377553
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -2624,13 +2624,15 @@ static void handle_hpd_rx_irq(void *param)
}
}

mutex_lock(&adev->dm.dc_lock);
if (!amdgpu_in_reset(adev))
mutex_lock(&adev->dm.dc_lock);
#ifdef CONFIG_DRM_AMD_DC_HDCP
result = dc_link_handle_hpd_rx_irq(dc_link, &hpd_irq_data, NULL);
#else
result = dc_link_handle_hpd_rx_irq(dc_link, NULL, NULL);
#endif
mutex_unlock(&adev->dm.dc_lock);
if (!amdgpu_in_reset(adev))
mutex_unlock(&adev->dm.dc_lock);

out:
if (result && !is_mst_root_connector) {
Expand Down

0 comments on commit a377553

Please sign in to comment.