Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 12:12:47 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915: i915_scheduler.c

Log Message:
i915: Fix priolist ordering.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
    src/sys/external/bsd/drm2/dist/drm/i915/i915_scheduler.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_scheduler.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_scheduler.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_scheduler.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_scheduler.c:1.6	Sun Dec 19 11:39:24 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_scheduler.c	Sun Dec 19 12:12:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_scheduler.c,v 1.6 2021/12/19 11:39:24 riastradh Exp $	*/
+/*	$NetBSD: i915_scheduler.c,v 1.7 2021/12/19 12:12:47 riastradh Exp $	*/
 
 /*
  * SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_scheduler.c,v 1.6 2021/12/19 11:39:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_scheduler.c,v 1.7 2021/12/19 12:12:47 riastradh Exp $");
 
 #include <linux/mutex.h>
 
@@ -90,9 +90,9 @@ compare_priolists(void *cookie, const vo
 	const struct i915_priolist *a = va;
 	const struct i915_priolist *b = vb;
 
-	if (a->priority < b->priority)
-		return -1;
 	if (a->priority > b->priority)
+		return -1;
+	if (a->priority < b->priority)
 		return +1;
 	return 0;
 }
@@ -103,10 +103,10 @@ compare_priolist_key(void *cookie, const
 	const struct i915_priolist *p = vp;
 	const int *priorityp = vk, priority = *priorityp;
 
-	if (p->priority < priority)
-		return -1;
 	if (p->priority > priority)
 		return -1;
+	if (p->priority < priority)
+		return +1;
 	return 0;
 }
 

Reply via email to