From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 4 Oct 2010 09:07:38 +0000 (+0100)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=df6d075a4d8b151f2c011de01c09bdc92a7bb935;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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

df6d075a4d8b151f2c011de01c09bdc92a7bb935
diff --cc drivers/gpu/drm/i915/i915_gem.c
index 19acf123c1f1,aa959c4a1836..dba82022bd3e
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@@ -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);