drm/etnaviv: avoid cleaning up sched_job when submit succeeded

While the labels may mislead the casual reader, the tail of the function
etnaviv_ioctl_gem_submit is always executed, as a lot of the structures
set up in this function need to be cleaned up regardless of whether the
submit succeeded or failed.

An exception is the newly added drm_sched_job_cleanup, which must only
be called when the submit failed before handing the job to the
scheduler.

Fixes: b827c84f5e84 ("drm/etnaviv: Use scheduler dependency handling")
Reported-by: Michael Walle <michael@walle.cc>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220504090229.2506560-1-l.stach@pengutronix.de

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index 98bb5c9239dea4bb072ff4df738e0a5906eb6026..1ac916b248917c2c88e3ac6ac874c79c40c92302 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@ -598,7 +598,12 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data,
                sync_file = sync_file_create(submit->out_fence);
                if (!sync_file) {
                        ret = -ENOMEM;
-                       goto err_submit_job;
+                       /*
+                        * When this late error is hit, the submit has already
+                        * been handed over to the scheduler. At this point
+                        * the sched_job must not be cleaned up.
+                        */
+                       goto err_submit_put;
                }
                fd_install(out_fence_fd, sync_file->file);
        }
@@ -607,7 +612,8 @@ int etnaviv_ioctl_gem_submit(struct drm_device *dev, void *data,
        args->fence = submit->out_fence_id;
 
 err_submit_job:
-       drm_sched_job_cleanup(&submit->sched_job);
+       if (ret)
+               drm_sched_job_cleanup(&submit->sched_job);
 err_submit_put:
        etnaviv_submit_put(submit);