panfrost: Don't cleanup the job if it was successfully queued

The labels are misleading. Even though they are all prefixed with 'fail_'
the success case also takes that path, and we should definitely not
cleanup the job if it's been queued. While at it, let's rename those
labels so we don't do the same mistake again.

Fixes: 53516280cc38 ("drm/panfrost: use scheduler dependency tracking")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Steven Price <steven.price@arm.com>
Tested-by: Steven Price <steven.price@arm.com>
Signed-off-by: Steven Price <steven.price@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210831133556.236984-1-boris.brezillon@collabora.com
Link: https://patchwork.freedesktop.org/patch/msgid/20210831133556.236984-1-boris.brezillon@collabora.com

diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
index 16212b6b202ec8ec616549b88fa25b40c0c4fc19..077cbbfa506b48e4f60c5570f3f8bd368dd593e0 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_drv.c
+++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -253,7 +253,7 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data,
        job = kzalloc(sizeof(*job), GFP_KERNEL);
        if (!job) {
                ret = -ENOMEM;
-               goto fail_out_sync;
+               goto out_put_syncout;
        }
 
        kref_init(&job->refcount);
@@ -270,29 +270,30 @@ static int panfrost_ioctl_submit(struct drm_device *dev, void *data,
                                 &job->file_priv->sched_entity[slot],
                                 NULL);
        if (ret)
-               goto fail_job_put;
+               goto out_put_job;
 
        ret = panfrost_copy_in_sync(dev, file, args, job);
        if (ret)
-               goto fail_job;
+               goto out_cleanup_job;
 
        ret = panfrost_lookup_bos(dev, file, args, job);
        if (ret)
-               goto fail_job;
+               goto out_cleanup_job;
 
        ret = panfrost_job_push(job);
        if (ret)
-               goto fail_job;
+               goto out_cleanup_job;
 
        /* Update the return sync object for the job */
        if (sync_out)
                drm_syncobj_replace_fence(sync_out, job->render_done_fence);
 
-fail_job:
-       drm_sched_job_cleanup(&job->base);
-fail_job_put:
+out_cleanup_job:
+       if (ret)
+               drm_sched_job_cleanup(&job->base);
+out_put_job:
        panfrost_job_put(job);
-fail_out_sync:
+out_put_syncout:
        if (sync_out)
                drm_syncobj_put(sync_out);