Merge branch 'drm-intel-fixes' into drm-intel-next
Chris Wilson [Mon, 22 Nov 2010 08:51:36 +0000 (08:51 +0000)]
Conflicts:
drivers/gpu/drm/i915/i915_gem.c

1  2 
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_gem.c

Simple merge
@@@ -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;
-               goto out;
-       }
 -      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);