From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 22 Nov 2010 08:51:36 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e624ae8e0d4243e71daedce7570e91290438eaca;p=linux-beck.git

Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
	drivers/gpu/drm/i915/i915_gem.c
---

e624ae8e0d4243e71daedce7570e91290438eaca
diff --cc drivers/gpu/drm/i915/i915_gem.c
index 54fc1e7eb872,bc4164590054..4010cd34283d
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@@ -598,23 -577,10 +611,6 @@@ i915_gem_pread_ioctl(struct drm_device 
  		goto out;
  	}
  
- 	if (args->size == 0)
- 		goto out;
- 
- 	if (!access_ok(VERIFY_WRITE,
- 		       (char __user *)(uintptr_t)args->data_ptr,
- 		       args->size)) {
- 		ret = -EFAULT;
- 		goto out;
- 	}
- 
- 	ret = fault_in_pages_writeable((char __user *)(uintptr_t)args->data_ptr,
- 				       args->size);
- 	if (ret) {
- 		ret = -EFAULT;
 -	ret = i915_gem_object_get_pages_or_evict(obj);
 -	if (ret)
--		goto out;
- 	}
--
  	ret = i915_gem_object_set_cpu_read_domain_range(obj,
  							args->offset,
  							args->size);