diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-04 15:32:24 (GMT) |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-04 19:19:53 (GMT) |
| commit | 37508589903f8ab8b9329df0e7647a45d10a2a7c (patch) | |
| tree | a5af0f7691e1fd4bda61a72054e93e249486556a /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 91b2db6f65fbbb1a6688bcc2e52596b723ea2472 (diff) | |
| download | linux-37508589903f8ab8b9329df0e7647a45d10a2a7c.tar.xz | |
drm/i915: Reduce WARN(i915_gem_valid_gtt_space) to a debug-only check
i915_gem_valid_gtt_space() is used after inserting the VMA to double
check the list - the location should have been chosen to pass all the
restrictions.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470324762-2545-8-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b4af5d1..b836a33 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3090,10 +3090,7 @@ search_free: goto err_vma; } } - if (WARN_ON(!i915_gem_valid_gtt_space(vma, obj->cache_level))) { - ret = -EINVAL; - goto err_remove_node; - } + GEM_BUG_ON(!i915_gem_valid_gtt_space(vma, obj->cache_level)); trace_i915_vma_bind(vma, flags); ret = i915_vma_bind(vma, obj->cache_level, flags); |