From: Rob Clark <robdcl...@chromium.org>
Move runpm enable to just before we enqueue the job to the scheduler,
rather than job_run(). This has the disadvantage of potentially
powering up the GPU before waiting for fences, but it is the only
feasible way to move things like clk_prepare() out of the fence
signalling path. Ideally runpm would have separate prepare and enable
steps so we could just move the prepare step. But attempting to
separate these without support in runpm doesn't play nicely with
autosuspend.
Signed-off-by: Rob Clark <robdcl...@chromium.org>
---
drivers/gpu/drm/msm/msm_gem_submit.c | 2 ++
drivers/gpu/drm/msm/msm_gpu.c | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c
b/drivers/gpu/drm/msm/msm_gem_submit.c
index 99744de6c05a..a908373cf34b 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -981,6 +981,8 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
msm_rd_dump_submit(priv->rd, submit, NULL);
+ pm_runtime_get_sync(&gpu->pdev->dev);
+
drm_sched_entity_push_job(&submit->base);
args->fence = submit->fence_id;
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 243f988c65b7..819140d85205 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -751,8 +751,6 @@ void msm_gpu_submit(struct msm_gpu *gpu, struct
msm_gem_submit *submit)
WARN_ON(!mutex_is_locked(&gpu->lock));
- pm_runtime_get_sync(&gpu->pdev->dev);
-
msm_gpu_hw_init(gpu);
submit->seqno = submit->hw_fence->seqno;
--
2.41.0
