Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 687f084a authored by Rob Clark's avatar Rob Clark
Browse files

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: default avatarRob Clark <robdclark@gmail.com>
parent c01a958e

drivers/gpu/drm/msm/msm_gem_submit.c

+5 −8
Original line number Diff line number Diff line
@@ -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,7 +418,6 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
	args->fence = submit->fence;



out:

	if (submit)

	submit_cleanup(submit, !!ret);

	mutex_unlock(&dev->struct_mutex);

	return ret;