drm/msm: Correct pm_runtime votes in recover worker

In the scenario where there is one a single submit which is hung, gpu is
power collapsed when it is retired. Because of this, by the time we call
reover(), gpu state would be already clear. Fix this by correctly
managing the pm runtime votes.

Signed-off-by: Akhil P Oommen <quic_akhilpo@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/498391/
Link: https://lore.kernel.org/r/20220819015030.v5.3.Ib07ecec3d5c17cb0e1efa6fcddaaa019ec2fb556@changeid
Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 0a9406182ea7fc2d90a46f74a2bd0c25bde93131..da6242cbf87d0d3bef2028194379df5c37d95223 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -394,7 +394,6 @@ static void recover_worker(struct kthread_work *work)
        /* Record the crash state */
        pm_runtime_get_sync(&gpu->pdev->dev);
        msm_gpu_crashstate_capture(gpu, submit, comm, cmd);
-       pm_runtime_put_sync(&gpu->pdev->dev);
 
        kfree(cmd);
        kfree(comm);
@@ -442,6 +441,8 @@ static void recover_worker(struct kthread_work *work)
                }
        }
 
+       pm_runtime_put_sync(&gpu->pdev->dev);
+
        mutex_unlock(&gpu->lock);
 
        msm_gpu_retire(gpu);