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

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_vm.c
        src/sys/external/bsd/drm2/include/linux: kfifo.h

Log Message:
amdgpu: more destroy fixes.

Author: phone <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
    src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vm.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/include/linux/kfifo.h

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/amd/amdgpu/amdgpu_vm.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vm.c:1.10 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vm.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vm.c:1.10	Sun Dec 19 12:31:45 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vm.c	Sun Dec 19 12:33:02 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: amdgpu_vm.c,v 1.10 2021/12/19 12:31:45 riastradh Exp $	*/
+/*	$NetBSD: amdgpu_vm.c,v 1.11 2021/12/19 12:33:02 riastradh Exp $	*/
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
  *          Jerome Glisse
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_vm.c,v 1.10 2021/12/19 12:31:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_vm.c,v 1.11 2021/12/19 12:33:02 riastradh Exp $");
 
 #include <linux/dma-fence-array.h>
 #include <linux/interval_tree_generic.h>
@@ -3120,6 +3120,8 @@ void amdgpu_vm_fini(struct amdgpu_device
 	struct amdgpu_bo *root;
 	int i;
 
+	FINI_KFIFO(vm->faults);
+
 	amdgpu_amdkfd_gpuvm_destroy_cb(adev, vm);
 
 	root = amdgpu_bo_ref(vm->root.base.bo);
@@ -3172,6 +3174,7 @@ void amdgpu_vm_fini(struct amdgpu_device
 	for (i = 0; i < AMDGPU_MAX_VMHUBS; i++)
 		amdgpu_vmid_free_reserved(adev, vm, i);
 
+	mutex_destroy(&vm->eviction_lock);
 	spin_lock_destroy(&vm->invalidated_lock);
 }
 

Index: src/sys/external/bsd/drm2/include/linux/kfifo.h
diff -u src/sys/external/bsd/drm2/include/linux/kfifo.h:1.5 src/sys/external/bsd/drm2/include/linux/kfifo.h:1.6
--- src/sys/external/bsd/drm2/include/linux/kfifo.h:1.5	Sun Dec 19 12:21:56 2021
+++ src/sys/external/bsd/drm2/include/linux/kfifo.h	Sun Dec 19 12:33:02 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: kfifo.h,v 1.5 2021/12/19 12:21:56 riastradh Exp $	*/
+/*	$NetBSD: kfifo.h,v 1.6 2021/12/19 12:33:02 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -66,6 +66,11 @@ struct kfifo_meta {
 	_init_kfifo(&(FIFO).kf_meta, sizeof((FIFO).kf_buf));		      \
 } while (0)
 
+#define	FINI_KFIFO(FIFO) do						      \
+{									      \
+	_fini_kfifo(&(FIFO).kf_meta);					      \
+} while (0)
+
 static inline void
 _init_kfifo(struct kfifo_meta *meta, size_t nbytes)
 {
@@ -76,6 +81,13 @@ _init_kfifo(struct kfifo_meta *meta, siz
 	meta->kfm_nbytes = nbytes;
 }
 
+static inline void
+_fini_kfifo(struct kfifo_meta *meta)
+{
+
+	mutex_destroy(&meta->kfm_lock);
+}
+
 _KFIFO_PTR_TYPE(kfifo, void);
 
 #define	kfifo_alloc(FIFO, SIZE, GFP)					      \

Reply via email to