diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-05-27 13:18:21 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-05-28 10:52:15 -0700 |
| commit | 654fc6073f68efa3b6c466825749e73e7fbb92cd (patch) | |
| tree | b6b0c3905dd1777a3412c855cec3b0db0785dbc7 | |
| parent | 85cd4612fdab4e837d7eea048a697c75d0477d3b (diff) | |
| download | linux-654fc6073f68efa3b6c466825749e73e7fbb92cd.tar.gz linux-654fc6073f68efa3b6c466825749e73e7fbb92cd.tar.bz2 linux-654fc6073f68efa3b6c466825749e73e7fbb92cd.zip | |
drm/i915: Reject bind_to_gtt() early if object > aperture
If the object is bigger than the entire aperture, reject it early
before evicting everything in a vain attempt to find space.
v2: Use E2BIG as suggested by Owain G. Ainsworth.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
Signed-off-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b87945db1021..f84c8e982dcb 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2648,6 +2648,14 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment) return -EINVAL; } + /* If the object is bigger than the entire aperture, reject it early + * before evicting everything in a vain attempt to find space. + */ + if (obj->size > dev->gtt_total) { + DRM_ERROR("Attempting to bind an object larger than the aperture\n"); + return -E2BIG; + } + search_free: free_space = drm_mm_search_free(&dev_priv->mm.gtt_space, obj->size, alignment, 0); |