summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-10-17 11:17:16 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-10-17 11:56:40 +0200
commita7c2e1aad6c846f316641bbaa54cf999aeaa7ebc (patch)
tree48c2b794e044c72aa2407ca64ada3aa6f1d60350 /drivers/gpu
parentb06fbda328490ec471e72659a9bf69f16a1c8dc9 (diff)
downloadlinux-3.10-a7c2e1aad6c846f316641bbaa54cf999aeaa7ebc.tar.gz
linux-3.10-a7c2e1aad6c846f316641bbaa54cf999aeaa7ebc.tar.bz2
linux-3.10-a7c2e1aad6c846f316641bbaa54cf999aeaa7ebc.zip
drm/i915: shut up spurious WARN in the gtt fault handler
-ENOSPC can happen if userspace is being simplistic and tries to map a too big object. To aid further spurious WARN debugging, also print out the error code. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56017 Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index bb941f8cd55..45888d2ed53 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1408,8 +1408,10 @@ out:
return VM_FAULT_NOPAGE;
case -ENOMEM:
return VM_FAULT_OOM;
+ case -ENOSPC:
+ return VM_FAULT_SIGBUS;
default:
- WARN_ON_ONCE(ret);
+ WARN_ONCE(ret, "unhandled error in i915_gem_fault: %i\n", ret);
return VM_FAULT_SIGBUS;
}
}