Prep work for using the scheduler dependency handling.

Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
Cc: Emma Anholt <e...@anholt.net>
---
 drivers/gpu/drm/v3d/v3d_gem.c | 64 +++++++++++------------------------
 1 file changed, 20 insertions(+), 44 deletions(-)

diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
index ac608eb9b594..40302c77e667 100644
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@ -433,9 +433,10 @@ v3d_wait_bo_ioctl(struct drm_device *dev, void *data,
 static int
 v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv,
             struct v3d_job *job, void (*free)(struct kref *ref),
-            u32 in_sync)
+            u32 in_sync, enum v3d_queue queue)
 {
        struct dma_fence *in_fence = NULL;
+       struct v3d_file_priv *v3d_priv = file_priv->driver_priv;
        int ret;
 
        job->v3d = v3d;
@@ -446,6 +447,10 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file 
*file_priv,
                return ret;
 
        xa_init_flags(&job->deps, XA_FLAGS_ALLOC);
+       ret = drm_sched_job_init(&job->base, &v3d_priv->sched_entity[queue],
+                                v3d_priv);
+       if (ret)
+               goto fail;
 
        ret = drm_syncobj_find_fence(file_priv, in_sync, 0, 0, &in_fence);
        if (ret == -EINVAL)
@@ -464,25 +469,15 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file 
*file_priv,
        return ret;
 }
 
-static int
-v3d_push_job(struct v3d_file_priv *v3d_priv,
-            struct v3d_job *job, enum v3d_queue queue)
+static void
+v3d_push_job(struct v3d_job *job)
 {
-       int ret;
-
-       ret = drm_sched_job_init(&job->base, &v3d_priv->sched_entity[queue],
-                                v3d_priv);
-       if (ret)
-               return ret;
-
        job->done_fence = dma_fence_get(&job->base.s_fence->finished);
 
        /* put by scheduler job completion */
        kref_get(&job->refcount);
 
        drm_sched_entity_push_job(&job->base);
-
-       return 0;
 }
 
 static void
@@ -528,7 +523,6 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
                    struct drm_file *file_priv)
 {
        struct v3d_dev *v3d = to_v3d_dev(dev);
-       struct v3d_file_priv *v3d_priv = file_priv->driver_priv;
        struct drm_v3d_submit_cl *args = data;
        struct v3d_bin_job *bin = NULL;
        struct v3d_render_job *render;
@@ -554,7 +548,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
        INIT_LIST_HEAD(&render->unref_list);
 
        ret = v3d_job_init(v3d, file_priv, &render->base,
-                          v3d_render_job_free, args->in_sync_rcl);
+                          v3d_render_job_free, args->in_sync_rcl, V3D_RENDER);
        if (ret) {
                kfree(render);
                return ret;
@@ -568,7 +562,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
                }
 
                ret = v3d_job_init(v3d, file_priv, &bin->base,
-                                  v3d_job_free, args->in_sync_bcl);
+                                  v3d_job_free, args->in_sync_bcl, V3D_BIN);
                if (ret) {
                        v3d_job_put(&render->base);
                        kfree(bin);
@@ -590,7 +584,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
                        goto fail;
                }
 
-               ret = v3d_job_init(v3d, file_priv, clean_job, v3d_job_free, 0);
+               ret = v3d_job_init(v3d, file_priv, clean_job, v3d_job_free, 0, 
V3D_CACHE_CLEAN);
                if (ret) {
                        kfree(clean_job);
                        clean_job = NULL;
@@ -613,9 +607,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
 
        mutex_lock(&v3d->sched_lock);
        if (bin) {
-               ret = v3d_push_job(v3d_priv, &bin->base, V3D_BIN);
-               if (ret)
-                       goto fail_unreserve;
+               v3d_push_job(&bin->base);
 
                ret = drm_gem_fence_array_add(&render->base.deps,
                                              
dma_fence_get(bin->base.done_fence));
@@ -623,9 +615,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
                        goto fail_unreserve;
        }
 
-       ret = v3d_push_job(v3d_priv, &render->base, V3D_RENDER);
-       if (ret)
-               goto fail_unreserve;
+       v3d_push_job(&render->base);
 
        if (clean_job) {
                struct dma_fence *render_fence =
@@ -633,9 +623,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
                ret = drm_gem_fence_array_add(&clean_job->deps, render_fence);
                if (ret)
                        goto fail_unreserve;
-               ret = v3d_push_job(v3d_priv, clean_job, V3D_CACHE_CLEAN);
-               if (ret)
-                       goto fail_unreserve;
+               v3d_push_job(clean_job);
        }
 
        mutex_unlock(&v3d->sched_lock);
@@ -682,7 +670,6 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data,
                     struct drm_file *file_priv)
 {
        struct v3d_dev *v3d = to_v3d_dev(dev);
-       struct v3d_file_priv *v3d_priv = file_priv->driver_priv;
        struct drm_v3d_submit_tfu *args = data;
        struct v3d_tfu_job *job;
        struct ww_acquire_ctx acquire_ctx;
@@ -695,7 +682,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data,
                return -ENOMEM;
 
        ret = v3d_job_init(v3d, file_priv, &job->base,
-                          v3d_job_free, args->in_sync);
+                          v3d_job_free, args->in_sync, V3D_TFU);
        if (ret) {
                kfree(job);
                return ret;
@@ -739,9 +726,7 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data,
                goto fail;
 
        mutex_lock(&v3d->sched_lock);
-       ret = v3d_push_job(v3d_priv, &job->base, V3D_TFU);
-       if (ret)
-               goto fail_unreserve;
+       v3d_push_job(&job->base);
        mutex_unlock(&v3d->sched_lock);
 
        v3d_attach_fences_and_unlock_reservation(file_priv,
@@ -753,10 +738,6 @@ v3d_submit_tfu_ioctl(struct drm_device *dev, void *data,
 
        return 0;
 
-fail_unreserve:
-       mutex_unlock(&v3d->sched_lock);
-       drm_gem_unlock_reservations(job->base.bo, job->base.bo_count,
-                                   &acquire_ctx);
 fail:
        v3d_job_put(&job->base);
 
@@ -777,7 +758,6 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data,
                     struct drm_file *file_priv)
 {
        struct v3d_dev *v3d = to_v3d_dev(dev);
-       struct v3d_file_priv *v3d_priv = file_priv->driver_priv;
        struct drm_v3d_submit_csd *args = data;
        struct v3d_csd_job *job;
        struct v3d_job *clean_job;
@@ -796,7 +776,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data,
                return -ENOMEM;
 
        ret = v3d_job_init(v3d, file_priv, &job->base,
-                          v3d_job_free, args->in_sync);
+                          v3d_job_free, args->in_sync, V3D_CSD);
        if (ret) {
                kfree(job);
                return ret;
@@ -809,7 +789,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data,
                return -ENOMEM;
        }
 
-       ret = v3d_job_init(v3d, file_priv, clean_job, v3d_job_free, 0);
+       ret = v3d_job_init(v3d, file_priv, clean_job, v3d_job_free, 0, 
V3D_CACHE_CLEAN);
        if (ret) {
                v3d_job_put(&job->base);
                kfree(clean_job);
@@ -828,18 +808,14 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data,
                goto fail;
 
        mutex_lock(&v3d->sched_lock);
-       ret = v3d_push_job(v3d_priv, &job->base, V3D_CSD);
-       if (ret)
-               goto fail_unreserve;
+       v3d_push_job(&job->base);
 
        ret = drm_gem_fence_array_add(&clean_job->deps,
                                      dma_fence_get(job->base.done_fence));
        if (ret)
                goto fail_unreserve;
 
-       ret = v3d_push_job(v3d_priv, clean_job, V3D_CACHE_CLEAN);
-       if (ret)
-               goto fail_unreserve;
+       v3d_push_job(clean_job);
        mutex_unlock(&v3d->sched_lock);
 
        v3d_attach_fences_and_unlock_reservation(file_priv,
-- 
2.32.0.rc2

Reply via email to