diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2013-03-11 13:16:22 +1100 |
|---|---|---|
| committer | Jonathan Gray <jsg@jsg.id.au> | 2013-03-11 13:16:22 +1100 |
| commit | 4b81d3820ad1a618460a92093a773c5478a33770 (patch) | |
| tree | ae09f958427658361e492767012f52af20abf093 | |
| parent | 3a4143d6f2489c761e3a0e00941567f7703c53e2 (diff) | |
convert another lock to i915_mutex_lock_interruptible
| -rw-r--r-- | sys/dev/pci/drm/i915_gem_execbuffer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915_gem_execbuffer.c b/sys/dev/pci/drm/i915_gem_execbuffer.c index 793fb78b6d5..03d27b01a38 100644 --- a/sys/dev/pci/drm/i915_gem_execbuffer.c +++ b/sys/dev/pci/drm/i915_gem_execbuffer.c @@ -342,7 +342,9 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data, if (ret != 0) goto pre_mutex_err; - DRM_LOCK(); + ret = i915_mutex_lock_interruptible(dev); + if (ret) + goto pre_mutex_err; inteldrm_verify_inactive(dev_priv, __FILE__, __LINE__); /* XXX check these before we copyin... but we do need the lock */ |