Commit a44342ac authored Nov 03, 2016 by 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: Matthew Auld <matthew.auld@intel.com>
Tested-by: Matthew 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: Chris 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.uk


Reviewed-by: Matthew Auld <matthew.auld@intel.com>

parent 72aa0d89

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3425,7 +3425,7 @@ static inline long vma_compare(struct i915_vma *vma,
		struct i915_address_space *vm,
		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)
		return vma->vm - vm;