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

Commit b5b4c264 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm: use mutex_lock_interruptible for submit ioctl 



Be kinder to things that do lots of signal handling (ie. Xorg)

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent b137bb4b

drivers/gpu/drm/msm/msm_gem_submit.c

+9 −4
Original line number Diff line number Diff line
@@ -372,11 +372,15 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
	if (args->nr_cmds > MAX_CMDS)

		return -EINVAL;



	submit = submit_create(dev, gpu, args->nr_bos);

	if (!submit)

		return -ENOMEM;

	ret = mutex_lock_interruptible(&dev->struct_mutex);

	if (ret)

		return ret;



	mutex_lock(&dev->struct_mutex);

	submit = submit_create(dev, gpu, args->nr_bos);

	if (!submit) {

		ret = -ENOMEM;

		goto out_unlock;

	}



	ret = submit_lookup_objects(submit, args, file);

	if (ret)
@@ -462,6 +466,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
	submit_cleanup(submit);

	if (ret)

		msm_gem_submit_free(submit);

out_unlock:

	mutex_unlock(&dev->struct_mutex);

	return ret;

}