---

yaml --- r: 357923 b: refs/heads/master c: eb119bd h: refs/heads/master i: 357921: c42cb40 357919: 1d779c8 v: v3
git-mirror · Dec 17, 2012 · b8b99ed · b8b99ed
1 parent 555d3a4
commit b8b99ed
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f8c65d60467c6ccf4d690f5266567d6c423ae7d
+refs/heads/master: eb119bd612906519cacef2536a9a524c2da5f7fb
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1341,6 +1341,12 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
 	trace_i915_gem_object_fault(obj, page_offset, true, write);
 
+	/* Access to snoopable pages through the GTT is incoherent. */
+	if (obj->cache_level != I915_CACHE_NONE && !HAS_LLC(dev)) {
+		ret = -EINVAL;
+		goto unlock;
+	}
+
 	/* Now bind it into the GTT if needed */
 	ret = i915_gem_object_pin(obj, 0, true, false);
 	if (ret)