Merge branch 'drm-intel-fixes' into drm-intel-next
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 4 Oct 2010 09:07:38 +0000 (10:07 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 4 Oct 2010 09:07:38 +0000 (10:07 +0100)
1  2 
drivers/gpu/drm/i915/i915_gem.c

index 19acf123c1f117b0c196688195baa493b6183801,aa959c4a1836238354d7674cdaa52b3a195013d5..dba82022bd3ede396e1d990b8a1e13336386904e
@@@ -692,13 -583,9 +695,11 @@@ i915_gem_gtt_pwrite_fast(struct drm_dev
  
        user_data = (char __user *) (uintptr_t) args->data_ptr;
        remain = args->size;
-       if (!access_ok(VERIFY_READ, user_data, remain))
-               return -EFAULT;
  
 +      ret = i915_mutex_lock_interruptible(dev);
 +      if (ret)
 +              return ret;
  
 -      mutex_lock(&dev->struct_mutex);
        ret = i915_gem_object_pin(obj, 0);
        if (ret) {
                mutex_unlock(&dev->struct_mutex);