Module Name: src Committed By: riastradh Date: Sun Dec 19 12:41:44 UTC 2021
Modified Files: src/sys/external/bsd/drm2/dist/drm/scheduler: sched_main.c Log Message: drm: Omit bogus spin locking around kthread_stop, which blocks. Blocking is not allowed while holding a spin lock, and there's nothing here that needs a lock either. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ 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.6 src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c:1.7 --- src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c:1.6 Sun Dec 19 12:34:24 2021 +++ src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c Sun Dec 19 12:41:44 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sched_main.c,v 1.6 2021/12/19 12:34:24 riastradh Exp $ */ +/* $NetBSD: sched_main.c,v 1.7 2021/12/19 12:41:44 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.6 2021/12/19 12:34:24 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sched_main.c,v 1.7 2021/12/19 12:41:44 riastradh Exp $"); #include <linux/kthread.h> #include <linux/wait.h> @@ -880,9 +880,7 @@ EXPORT_SYMBOL(drm_sched_init); void drm_sched_fini(struct drm_gpu_scheduler *sched) { if (sched->thread) { - spin_lock(&sched->job_list_lock); kthread_stop(sched->thread); - spin_unlock(&sched->job_list_lock); } sched->ready = false;