projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
91b2db6
)
drm/i915: Reduce WARN(i915_gem_valid_gtt_space) to a debug-only check
author
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 4 Aug 2016 15:32:24 +0000
(16:32 +0100)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 4 Aug 2016 19:19:53 +0000
(20:19 +0100)
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
drivers/gpu/drm/i915/i915_gem.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_gem.c
b/drivers/gpu/drm/i915/i915_gem.c
index b4af5d1c0ff5bdad79c954092c8786ae732d957f..b836a33b03fb7a195a5e10f00cc34ce5bcf7d259 100644
(file)
--- 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);