]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
drm/amd/display: Fix deadlock with display during hanged ring recovery.
authorAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Wed, 13 Feb 2019 18:53:45 +0000 (13:53 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 13 Feb 2019 22:51:17 +0000 (17:51 -0500)
commitf7c8930d9e8b188caa53705883373c49f95fd284
tree8414f227240ce71320372ae92cdc423c1307a6ed
parentc0d9271ecbd891cdeb0fad1edcdd99ee717a655f
drm/amd/display: Fix deadlock with display during hanged ring recovery.

When ring hang happens amdgpu_dm_commit_planes during flip is holding
the BO reserved and then stack waiting for fences to signal in
reservation_object_wait_timeout_rcu (which won't signal because there
was a hnag). Then when we try to shutdown display block during reset
recovery from drm_atomic_helper_suspend we also try to reserve the BO
from dm_plane_helper_cleanup_fb ending in deadlock.
Also remove useless WARN_ON

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c