drm/vc4: Add helpers for pm get/put.

[linux.git] / drivers / gpu / drm / vc4 / vc4_gem.c

diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
index 5ee5bf7fedf7bdd63477a26711fe8e9491a4d61d..5e9496d477bf75ee0d1eb0c5900b04139ebc74b5 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_gem.c
+++ b/drivers/gpu/drm/vc4/vc4_gem.c
@@ -964,12 +964,7 @@ vc4_complete_exec(struct drm_device *dev, struct vc4_exec_info *exec)
        /* Release the reference we had on the perf monitor. */
        vc4_perfmon_put(exec->perfmon);
 
-       mutex_lock(&vc4->power_lock);
-       if (--vc4->power_refcount == 0) {
-               pm_runtime_mark_last_busy(&vc4->v3d->pdev->dev);
-               pm_runtime_put_autosuspend(&vc4->v3d->pdev->dev);
-       }
-       mutex_unlock(&vc4->power_lock);
+       vc4_v3d_pm_put(vc4);
 
        kfree(exec);
 }
@@ -1143,17 +1138,11 @@ vc4_submit_cl_ioctl(struct drm_device *dev, void *data,
                return -ENOMEM;
        }
 
-       mutex_lock(&vc4->power_lock);
-       if (vc4->power_refcount++ == 0) {
-               ret = pm_runtime_get_sync(&vc4->v3d->pdev->dev);
-               if (ret < 0) {
-                       mutex_unlock(&vc4->power_lock);
-                       vc4->power_refcount--;
-                       kfree(exec);
-                       return ret;
-               }
+       ret = vc4_v3d_pm_get(vc4);
+       if (ret) {
+               kfree(exec);
+               return ret;
        }
-       mutex_unlock(&vc4->power_lock);
 
        exec->args = args;
        INIT_LIST_HEAD(&exec->unref_list);