]> git.baikalelectronics.ru Git - kernel.git/commit
drm/amdgpu: Fix deadlock on runtime suspend
authorLukas Wunner <lukas@wunner.de>
Sun, 11 Feb 2018 09:38:28 +0000 (10:38 +0100)
committerLukas Wunner <lukas@wunner.de>
Fri, 16 Feb 2018 21:40:23 +0000 (22:40 +0100)
commitb2b4a5fbb369b4b3536b26546f3fa74a7a084894
tree45a20e39488e683cddf0aa23939717dacf3851f4
parent55efdc4337fc806c5f120419673492f631175f41
drm/amdgpu: Fix deadlock on runtime suspend

amdgpu's ->runtime_suspend hook calls drm_kms_helper_poll_disable(),
which waits for the output poll worker to finish if it's running.

The output poll worker meanwhile calls pm_runtime_get_sync() in
amdgpu's ->detect hooks, which waits for the ongoing suspend to finish,
causing a deadlock.

Fix by not acquiring a runtime PM ref if the ->detect hooks are called
in the output poll worker's context.  This is safe because the poll
worker is only enabled while runtime active and we know that
->runtime_suspend waits for it to finish.

Fixes: 04fa22d8efd0 ("drm/amdgpu: add core driver (v4)")
Cc: stable@vger.kernel.org # v4.2+: 52386a0f6a3a: workqueue: Allow retrieval of current task's work struct
Cc: stable@vger.kernel.org # v4.2+: a198d9f323ef: drm: Allow determining if current task is output poll worker
Cc: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Mike Lothian <mike@fireburn.co.uk>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Link: https://patchwork.freedesktop.org/patch/msgid/4c9bf72aacae1eef062bd134cd112e0770a7f121.1518338789.git.lukas@wunner.de
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c