[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/gt i915: Fix engine uabi...

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

details:   https://anonhg.NetBSD.org/src/rev/3538a7f2e6ad
branches:  trunk
changeset: 1028770:3538a7f2e6ad
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:59:11 2021 +0000

description:
i915: Fix engine uabi class/instance lookup.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_user.c |  20 +++++++-------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (54 lines):

diff -r f1e5bd8f3889 -r 3538a7f2e6ad sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_user.c
--- a/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_user.c        Sun Dec 19 11:59:04 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gt/intel_engine_user.c        Sun Dec 19 11:59:11 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_engine_user.c,v 1.4 2021/12/19 11:51:59 riastradh Exp $  */
+/*     $NetBSD: intel_engine_user.c,v 1.5 2021/12/19 11:59:11 riastradh Exp $  */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_engine_user.c,v 1.4 2021/12/19 11:51:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_engine_user.c,v 1.5 2021/12/19 11:59:11 riastradh Exp $");
 
 #include <linux/list.h>
 #include <linux/list_sort.h>
@@ -28,13 +28,13 @@
        const struct intel_engine_cs *csa = va;
        const struct intel_engine_cs *csb = vb;
 
-       if (csa->class < csb->class)
+       if (csa->uabi_class < csb->uabi_class)
                return -1;
-       if (csa->class > csb->class)
+       if (csa->uabi_class > csb->uabi_class)
                return +1;
-       if (csa->instance < csb->instance)
+       if (csa->uabi_instance < csb->uabi_instance)
                return -1;
-       if (csa->instance > csb->instance)
+       if (csa->uabi_instance > csb->uabi_instance)
                return +1;
        return 0;
 }
@@ -45,13 +45,13 @@
        const struct intel_engine_cs *cs = vn;
        const u8 *k = vk;
 
-       if (cs->class < k[0])
+       if (cs->uabi_class < k[0])
                return -1;
-       if (cs->class > k[0])
+       if (cs->uabi_class > k[0])
                return +1;
-       if (cs->instance < k[1])
+       if (cs->uabi_instance < k[1])
                return -1;
-       if (cs->instance > k[1])
+       if (cs->uabi_instance > k[1])
                return +1;
        return 0;
 }