diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2010-04-25 22:10:15 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2010-04-25 22:10:15 +0000 |
| commit | 6f7d74c41cc3fd485ad725207555fb0530936d39 (patch) | |
| tree | 39a9483ed6b31d2f436865fed854df8dd5b671f1 /sys/dev | |
| parent | c597b661be0b9e925c9a75e86db89e5dfa62f33d (diff) | |
oops, kill unneeded write lock grabbing that got mixed in when resolving
conflicts.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915_drv.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915_drv.c index 2250e328d61..0ae2ef5246d 100644 --- a/sys/dev/pci/drm/i915_drv.c +++ b/sys/dev/pci/drm/i915_drv.c @@ -4711,7 +4711,6 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, if (obj_priv->pin_count == 0) { ret = EBUSY; - DRM_LOCK(); /* for unref */ goto out; } if (i915_tiling_ok(dev, args->stride, obj->size, |