Commit 53dd7028 authored by Matthew Auld's avatar Matthew Auld Committed by Chris Wilson

drm/i915/evict: watch out for unevictable nodes

In an address space there can be sprinkling of I915_COLOR_UNEVICTABLE
nodes, which lack a parent vma. For platforms with cache coloring we
might be very unlucky and abut with such a node thinking we can simply
unbind the vma.
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20200408170456.399604-1-matthew.auld@intel.com
parent fbaa1229
...@@ -228,7 +228,12 @@ i915_gem_evict_something(struct i915_address_space *vm, ...@@ -228,7 +228,12 @@ i915_gem_evict_something(struct i915_address_space *vm,
while (ret == 0 && (node = drm_mm_scan_color_evict(&scan))) { while (ret == 0 && (node = drm_mm_scan_color_evict(&scan))) {
vma = container_of(node, struct i915_vma, node); vma = container_of(node, struct i915_vma, node);
ret = __i915_vma_unbind(vma);
/* If we find any non-objects (!vma), we cannot evict them */
if (vma->node.color != I915_COLOR_UNEVICTABLE)
ret = __i915_vma_unbind(vma);
else
ret = -ENOSPC; /* XXX search failed, try again? */
} }
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment