Revert "drm/msm/gpu: Push gpu lock down past runpm"

Browse source

This reverts commit abe2023b4c.

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/

...

This commit is contained in:

Rob Clark 2024-01-09 10:22:17 -08:00

parent 6a0dbcd20e

commit 917e9b7c23

2 changed files with 10 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

drivers/gpu/drm/msm/msm_gpu.c

View file

7

drivers/gpu/drm/msm/msm_ringbuffer.c

View file