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)
committerRob Clark <robdclark@chromium.org>
Thu, 1 Feb 2024 23:24:10 +0000 (15:24 -0800)
commit917e9b7c2350e3e53162fcf5035e5f2d68e2cbed
tree4a72440a25a2483e6d50cc75d60bc25bd131187d
parent6a0dbcd20ef252ebf98af94186a2e53da7167bed
Revert "drm/msm/gpu: Push gpu lock down past runpm"

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/
drivers/gpu/drm/msm/msm_gpu.c
drivers/gpu/drm/msm/msm_ringbuffer.c