Commit b5b4c264 authored by Rob Clark's avatar Rob Clark

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
...@@ -372,11 +372,15 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, ...@@ -372,11 +372,15 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
if (args->nr_cmds > MAX_CMDS) if (args->nr_cmds > MAX_CMDS)
return -EINVAL; return -EINVAL;
submit = submit_create(dev, gpu, args->nr_bos); ret = mutex_lock_interruptible(&dev->struct_mutex);
if (!submit) if (ret)
return -ENOMEM; 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); ret = submit_lookup_objects(submit, args, file);
if (ret) if (ret)
...@@ -462,6 +466,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, ...@@ -462,6 +466,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
submit_cleanup(submit); submit_cleanup(submit);
if (ret) if (ret)
msm_gem_submit_free(submit); msm_gem_submit_free(submit);
out_unlock:
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
return ret; return ret;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment