Commit a44342ac authored by Chris Wilson's avatar Chris Wilson

drm/i915: Fix test on inputs for vma_compare()

When supplying a view to vma_compare() it is required that the supplied
i915_address_space is the global GTT. I tested the VMA instead (which is
the current position in the rbtree and maybe from any address space).
Reported-by: default avatarMatthew Auld <matthew.auld@intel.com>
Tested-by: default avatarMatthew Auld <matthew.auld@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98579
Fixes: db6c2b41 ("drm/i915: Store the vma in an rbtree...")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161103200852.23431-1-chris@chris-wilson.co.ukReviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
parent 72aa0d89
...@@ -3425,7 +3425,7 @@ static inline long vma_compare(struct i915_vma *vma, ...@@ -3425,7 +3425,7 @@ static inline long vma_compare(struct i915_vma *vma,
struct i915_address_space *vm, struct i915_address_space *vm,
const struct i915_ggtt_view *view) const struct i915_ggtt_view *view)
{ {
GEM_BUG_ON(view && !i915_vma_is_ggtt(vma)); GEM_BUG_ON(view && !i915_is_ggtt(vm));
if (vma->vm != vm) if (vma->vm != vm)
return vma->vm - vm; return vma->vm - vm;
......
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