drm/i915: Silence the WARN if the user tries to GTT mmap an incoherent object

ickle · danvet · commit ddeff6ee4231 · 2014-06-05T08:52:41.000+02:00
If the user tries to mmap through the GTT an object that is marked as
snooped, we report an error rather than allow the GPU to hang the
machine. The choice of EINVAL, however, was unfortunate as we turn that
into a WARN rather than a quiet SIGBUS.

Signed-off-by: Chris Wilson &lt;chris@chris-wilson.co.uk&gt;
Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
@@ -1427,7 +1427,7 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 
 	/* Access to snoopable pages through the GTT is incoherent. */
 	if (obj->cache_level != I915_CACHE_NONE && !HAS_LLC(dev)) {
-		ret = -EINVAL;
+		ret = -EFAULT;
 		goto unlock;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1427,7 +1427,7 @@ int i915_gem_fault(struct vm_area_struct vma, struct vm_fault vmf)`
`1427`	`1427`
`1428`	`1428`	`/* Access to snoopable pages through the GTT is incoherent. */`
`1429`	`1429`	`if (obj->cache_level != I915_CACHE_NONE && !HAS_LLC(dev)) {`
`1430`		`- ret = -EINVAL;`
	`1430`	`+ ret = -EFAULT;`
`1431`	`1431`	`goto unlock;`
`1432`	`1432`	`}`
`1433`	`1433`