drm/i915: Correct discard i915_vma_compare assertion
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 5 Jun 2020 18:48:44 +0000 (19:48 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 5 Jun 2020 19:22:31 +0000 (20:22 +0100)
commit84d24cb5247a356a4310a25761f8aa56b8814538
treed92a10fd49e27c4b3c12c38b3fed5e67dd418d69
parent9bdcaa5e3a2fb0a18d8c7a49bd64a52bce105bd2
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
drivers/gpu/drm/i915/i915_gem.c