Module Name: src Committed By: riastradh Date: Sun Dec 19 12:42:33 UTC 2021
Modified Files: src/sys/external/bsd/drm2/dist/drm/scheduler: sched_main.c src/sys/external/bsd/drm2/linux: linux_kthread.c Log Message: drm: Take advantage of kthread interlock to reduce diff. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/linux/linux_kthread.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.8 src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c:1.9 --- src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c:1.8 Sun Dec 19 12:42:25 2021 +++ src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c Sun Dec 19 12:42:32 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sched_main.c,v 1.8 2021/12/19 12:42:25 riastradh Exp $ */ +/* $NetBSD: sched_main.c,v 1.9 2021/12/19 12:42:32 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.8 2021/12/19 12:42:25 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sched_main.c,v 1.9 2021/12/19 12:42:32 riastradh Exp $"); #include <linux/kthread.h> #include <linux/wait.h> @@ -728,11 +728,8 @@ 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; } Index: src/sys/external/bsd/drm2/linux/linux_kthread.c diff -u src/sys/external/bsd/drm2/linux/linux_kthread.c:1.6 src/sys/external/bsd/drm2/linux/linux_kthread.c:1.7 --- src/sys/external/bsd/drm2/linux/linux_kthread.c:1.6 Sun Dec 19 12:42:25 2021 +++ src/sys/external/bsd/drm2/linux/linux_kthread.c Sun Dec 19 12:42:32 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_kthread.c,v 1.6 2021/12/19 12:42:25 riastradh Exp $ */ +/* $NetBSD: linux_kthread.c,v 1.7 2021/12/19 12:42:32 riastradh Exp $ */ /*- * Copyright (c) 2021 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_kthread.c,v 1.6 2021/12/19 12:42:25 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_kthread.c,v 1.7 2021/12/19 12:42:32 riastradh Exp $"); #include <sys/types.h> @@ -275,6 +275,9 @@ kthread_parkme(void) { struct task_struct *T = linux_kthread(); + assert_spin_locked(T->kt_interlock); + + spin_unlock(T->kt_interlock); mutex_enter(&T->kt_lock); while (T->kt_shouldpark) { T->kt_parked = true; @@ -283,4 +286,5 @@ kthread_parkme(void) T->kt_parked = false; } mutex_exit(&T->kt_lock); + spin_lock(T->kt_interlock); }