From 26e075a1520ad8e645a28ed4f0242d48c07078f1 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 27 May 2010 13:18:21 +0100 Subject: [PATCH] --- yaml --- r: 199609 b: refs/heads/master c: 654fc6073f68efa3b6c466825749e73e7fbb92cd h: refs/heads/master i: 199607: b6af910e7f56d733eb5892f96d50df9315af58ed v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5f3f94acca47..13c0351e276f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85cd4612fdab4e837d7eea048a697c75d0477d3b +refs/heads/master: 654fc6073f68efa3b6c466825749e73e7fbb92cd diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index b87945db1021..f84c8e982dcb 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/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);