]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Revert "drm/msm/gpu: Push gpu lock down past runpm"
authorRob Clark <robdclark@chromium.org>
Tue, 9 Jan 2024 18:22:17 +0000 (10:22 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Feb 2024 08:51:36 +0000 (09:51 +0100)
commit33414f56e19b5e281673cefa8555208c236d9dc5
treea6f82710f3c7070690f9d821bf8e2fcb187e8367
parentd855ceb6a5fde668c5431156bc60fae0cc52b764
Revert "drm/msm/gpu: Push gpu lock down past runpm"

commit 917e9b7c2350e3e53162fcf5035e5f2d68e2cbed upstream.

This reverts commit abe2023b4cea192ab266b351fd38dc9dbd846df0.

Changing the locking order means that scheduler/msm_job_run() can race
with the recovery kthread worker, with the result that the GPU gets an
extra runpm get when we are trying to power it off.  Leaving the GPU in
an unrecovered state.

I'll need to come up with a different scheme for appeasing lockdep.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Patchwork: https://patchwork.freedesktop.org/patch/573835/
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/msm/msm_gpu.c
drivers/gpu/drm/msm/msm_ringbuffer.c