---

yaml --- r: 306999 b: refs/heads/master c: 117babc h: refs/heads/master i: 306997: 6bf29d0 306995: 5fe84fc 306991: d34d12e v: v3
git-mirror · Mar 27, 2012 · 730cd99 · 730cd99
1 parent ec9a0b1
commit 730cd99
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffc62976d215870e3082d9778660167c5fa3946d
+refs/heads/master: 117babcdd51ed8a9bb8d4921b292918acb6e0d70
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -642,9 +642,9 @@ i915_gem_shmem_pwrite(struct drm_device *dev,
 			if (partial_cacheline_write)
 				drm_clflush_virt_range(vaddr + shmem_page_offset,
 						       page_length);
-			ret = __copy_from_user_inatomic(vaddr + shmem_page_offset,
-							user_data,
-							page_length);
+			ret = __copy_from_user_inatomic_nocache(vaddr + shmem_page_offset,
+								user_data,
+								page_length);
 			if (needs_clflush_after)
 				drm_clflush_virt_range(vaddr + shmem_page_offset,
 						       page_length);