diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2020-06-05 21:48:44 +0300 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-06-05 22:22:31 +0300 |
| commit | 84d24cb5247a356a4310a25761f8aa56b8814538 (patch) | |
| tree | d92a10fd49e27c4b3c12c38b3fed5e67dd418d69 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 9bdcaa5e3a2fb0a18d8c7a49bd64a52bce105bd2 (diff) | |
| download | linux-84d24cb5247a356a4310a25761f8aa56b8814538.tar.xz | |
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
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index f1acd1889d37..41553e9e57a9 100644 --- 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; |