diff options
| author | Colin Cross <ccross@android.com> | 2012-04-27 14:03:45 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-04-27 14:03:45 -0700 |
| commit | 957265bd4fe182af757886f117416d66f68854aa (patch) | |
| tree | 177cee182ea61611f0b80db704203bf72ee4f3cb /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 60c98d9abbd1ff3274b904027690f3c33d656250 (diff) | |
| parent | 66f75a5d028beaf67c931435fdc3e7823125730c (diff) | |
Merge commit 'v3.4-rc4' into android-3.4
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 0e3c6acde95..0d1e4b7b4b9 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1087,11 +1087,9 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, if (obj == NULL) return -ENOENT; - down_write(¤t->mm->mmap_sem); - addr = do_mmap(obj->filp, 0, args->size, + addr = vm_mmap(obj->filp, 0, args->size, PROT_READ | PROT_WRITE, MAP_SHARED, args->offset); - up_write(¤t->mm->mmap_sem); drm_gem_object_unreference_unlocked(obj); if (IS_ERR((void *)addr)) return addr; |