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

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/scheduler: sched_main.c

Log Message:
drm/scheduler: Release job list lock arond kthread_parkme.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
    src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.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/scheduler/sched_main.c
diff -u src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c:1.5 src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c:1.5	Sun Dec 19 12:32:45 2021
+++ src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c	Sun Dec 19 12:34:24 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: sched_main.c,v 1.5 2021/12/19 12:32:45 riastradh Exp $	*/
+/*	$NetBSD: sched_main.c,v 1.6 2021/12/19 12:34:24 riastradh Exp $	*/
 
 /*
  * Copyright 2015 Advanced Micro Devices, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sched_main.c,v 1.5 2021/12/19 12:32:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sched_main.c,v 1.6 2021/12/19 12:34:24 riastradh Exp $");
 
 #include <linux/kthread.h>
 #include <linux/wait.h>
@@ -728,8 +728,11 @@ drm_sched_get_cleanup_job(struct drm_gpu
  */
 static bool drm_sched_blocked(struct drm_gpu_scheduler *sched)
 {
+	assert_spin_locked(&sched->job_list_lock);
 	if (kthread_should_park()) {
+		spin_unlock(&sched->job_list_lock);
 		kthread_parkme();
+		spin_lock(&sched->job_list_lock);
 		return true;
 	}
 

Reply via email to