[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: No view in i915_vm...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e53a16d489d2
branches:  trunk
changeset: 1028832:e53a16d489d2
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:09:58 2021 +0000

description:
i915: No view in i915_vma_compare for normal views.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_vma.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 27d99bc524db -r e53a16d489d2 sys/external/bsd/drm2/dist/drm/i915/i915_vma.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_vma.c    Sun Dec 19 12:09:51 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_vma.c    Sun Dec 19 12:09:58 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_vma.c,v 1.9 2021/12/19 12:00:31 riastradh Exp $   */
+/*     $NetBSD: i915_vma.c,v 1.10 2021/12/19 12:09:58 riastradh Exp $  */
 
 /*
  * Copyright © 2016 Intel Corporation
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_vma.c,v 1.9 2021/12/19 12:00:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_vma.c,v 1.10 2021/12/19 12:09:58 riastradh Exp $");
 
 #include <linux/sched/mm.h>
 #include <drm/drm_gem.h>
@@ -118,7 +118,8 @@
 {
        const struct i915_vma *a = va;
        const struct i915_vma *b = vb;
-       long cmp = i915_vma_compare(__UNCONST(a), b->vm, &b->ggtt_view);
+       long cmp = i915_vma_compare(__UNCONST(a), b->vm,
+           b->ggtt_view.type == I915_GGTT_VIEW_NORMAL ? NULL : &b->ggtt_view);
 
        return (cmp < 0 ? -1 : cmp > 0 ? +1 : 0);
 }