CVS commit: src/sys/external/bsd/drm2/dist/drm/scheduler

[Taylor R Campbell]

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

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

Log Message:
drm/scheduler: spin_lock_init/destroy audit


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
    src/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c \
    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_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c:1.4 src/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c:1.4	Sun Dec 19 12:24:12 2021
+++ src/sys/external/bsd/drm2/dist/drm/scheduler/sched_fence.c	Sun Dec 19 12:32:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: sched_fence.c,v 1.4 2021/12/19 12:24:12 riastradh Exp $	*/
+/*	$NetBSD: sched_fence.c,v 1.5 2021/12/19 12:32:45 riastradh Exp $	*/
 
 /*
  * Copyright 2015 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sched_fence.c,v 1.4 2021/12/19 12:24:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sched_fence.c,v 1.5 2021/12/19 12:32:45 riastradh Exp $");
 
 #include <linux/kthread.h>
 #include <linux/module.h>
@@ -105,6 +105,8 @@ static void drm_sched_fence_free(struct 
 	struct dma_fence *f = container_of(rcu, struct dma_fence, rcu);
 	struct drm_sched_fence *fence = to_drm_sched_fence(f);
 
+	spin_lock_destroy(&fence->lock);
+
 	kmem_cache_free(sched_fence_slab, fence);
 }
 
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.4 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.4	Sun Dec 19 12:29:55 2021
+++ src/sys/external/bsd/drm2/dist/drm/scheduler/sched_main.c	Sun Dec 19 12:32:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: sched_main.c,v 1.4 2021/12/19 12:29:55 riastradh Exp $	*/
+/*	$NetBSD: sched_main.c,v 1.5 2021/12/19 12:32:45 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.4 2021/12/19 12:29:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sched_main.c,v 1.5 2021/12/19 12:32:45 riastradh Exp $");
 
 #include <linux/kthread.h>
 #include <linux/wait.h>
@@ -883,5 +883,14 @@ void drm_sched_fini(struct drm_gpu_sched
 	}
 
 	sched->ready = false;
+
+	spin_lock_destroy(&sched->job_list_lock);
+	DRM_DESTROY_WAITQUEUE(&sched->job_scheduled);
+	DRM_DESTROY_WAITQUEUE(&sched->wake_up_worker);
+
+	for (int i = DRM_SCHED_PRIORITY_MIN; i < DRM_SCHED_PRIORITY_MAX; i++) {
+		struct drm_sched_rq *rq = &sched->sched_rq[i];
+		spin_lock_destroy(&rq->lock);
+	}
 }
 EXPORT_SYMBOL(drm_sched_fini);