drm/i915: Correct discard i915_vma_compare assertion

As a last minute addition, I added an assertion to make sure that the
new i915_vma view would be equal to the discard. However, the positive
encouragement from CI only goes to show that we rarely take this path,
and it wasn't until the post-merge run did we hit the assert -- because
it compared the wrong view. Fixup the copy'n'paste error and compare
against both the old view and the expected new view.

Fixes: 9bdcaa5e3a2f ("drm/i915: Discard a misplaced GGTT vma")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200605184844.24644-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index f1acd1889d377aa48e5325dbbff189899fd46ccf..41553e9e57a9e5595d7ce81c5f1465a066b19c22 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -947,7 +947,8 @@ discard_ggtt_vma(struct i915_vma *vma, const struct i915_ggtt_view *view)
 
                rb_erase(&vma->obj_node, &obj->vma.tree);
                vma->ggtt_view = discard;
-               GEM_BUG_ON(i915_vma_compare(vma, vma->vm, view));
+               GEM_BUG_ON(i915_vma_compare(vma, vma->vm, &discard));
+               GEM_BUG_ON(i915_vma_compare(vma, vma->vm, view) == 0);
 
                rb = NULL;
                p = &obj->vma.tree.rb_node;