diff options
| author | Chris Wilson | 2014-01-31 12:34:58 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-02-04 17:03:32 +0100 |
| commit | 8c99e57d3926959dd940e834da6fa707601ba7e5 (patch) | |
| tree | c1c7ceaa97dd8d9368cce5cb73e776e31d6d6069 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | drm/i915: Convert EFAULT into a silent SIGBUS (diff) | |
| download | kernel-qcow2-linux-8c99e57d3926959dd940e834da6fa707601ba7e5.tar.gz kernel-qcow2-linux-8c99e57d3926959dd940e834da6fa707601ba7e5.tar.xz kernel-qcow2-linux-8c99e57d3926959dd940e834da6fa707601ba7e5.zip | |
drm/i915: Treat using a purged buffer as a source of EFAULT
Since a purged buffer is one without any associated pages, attempting to
use it should generate EFAULT rather than EINVAL, as it is not strictly
an invalid parameter.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index a6c9f2e4543c..a8a069f97c56 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1619,7 +1619,7 @@ i915_gem_mmap_gtt(struct drm_file *file, if (obj->madv != I915_MADV_WILLNEED) { DRM_ERROR("Attempting to mmap a purgeable buffer\n"); - ret = -EINVAL; + ret = -EFAULT; goto out; } @@ -1973,7 +1973,7 @@ i915_gem_object_get_pages(struct drm_i915_gem_object *obj) if (obj->madv != I915_MADV_WILLNEED) { DRM_ERROR("Attempting to obtain a purgeable object\n"); - return -EINVAL; + return -EFAULT; } BUG_ON(obj->pages_pin_count); @@ -3917,7 +3917,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, if (obj->madv != I915_MADV_WILLNEED) { DRM_ERROR("Attempting to pin a purgeable buffer\n"); - ret = -EINVAL; + ret = -EFAULT; goto out; } |