drm/msm: grab struct_mutex after allocating submit

No real need to hold the lock over allocation, and simplifies things
slightly if we change the order.

Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index 06f6ea9ccba0b56377f5d42ae5471604d8645bb3..43d2181231c080fe5f2a246b796c1e3e77e9f570 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -339,13 +339,11 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
        if (args->nr_cmds > MAX_CMDS)
                return -EINVAL;
 
-       mutex_lock(&dev->struct_mutex);
-
        submit = submit_create(dev, gpu, args->nr_bos);
-       if (!submit) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!submit)
+               return -ENOMEM;
+
+       mutex_lock(&dev->struct_mutex);
 
        ret = submit_lookup_objects(submit, args, file);
        if (ret)
@@ -420,8 +418,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
        args->fence = submit->fence;
 
 out:
-       if (submit)
-               submit_cleanup(submit, !!ret);
+       submit_cleanup(submit, !!ret);
        mutex_unlock(&dev->struct_mutex);
        return ret;
 }