Commit aac66bf5 authored by Matthew Auld's avatar Matthew Auld Committed by Jani Nikula

drm/i915: use correct node for handling cache domain eviction

It looks like we were incorrectly comparing vma->node against itself
instead of the target node, when evicting for a node on systems where we
need guard pages between regions with different cache domains. As a
consequence we can end up trying to needlessly evict neighbouring nodes,
even if they have the same cache domain, and if they were pinned we
would fail the eviction.

Fixes: 625d988a ("drm/i915: Extract reserving space in the GTT to a helper")
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170306235414.23407-3-matthew.auld@intel.comSigned-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit fe65cbdb)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 5a8cf90d
...@@ -293,12 +293,12 @@ int i915_gem_evict_for_node(struct i915_address_space *vm, ...@@ -293,12 +293,12 @@ int i915_gem_evict_for_node(struct i915_address_space *vm,
* those as well to make room for our guard pages. * those as well to make room for our guard pages.
*/ */
if (check_color) { if (check_color) {
if (vma->node.start + vma->node.size == node->start) { if (node->start + node->size == target->start) {
if (vma->node.color == node->color) if (node->color == target->color)
continue; continue;
} }
if (vma->node.start == node->start + node->size) { if (node->start == target->start + target->size) {
if (vma->node.color == node->color) if (node->color == target->color)
continue; continue;
} }
} }
......
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