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

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 10:28:41 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915: intel_memory_region.c
        src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_userptr.c

Log Message:
Destroy some mutexes when done.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm2/dist/drm/i915/intel_memory_region.c
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_userptr.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/i915/intel_memory_region.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_memory_region.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_memory_region.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_memory_region.c:1.2	Sat Dec 18 23:45:28 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_memory_region.c	Sun Dec 19 10:28:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: intel_memory_region.c,v 1.2 2021/12/18 23:45:28 riastradh Exp $	*/
+/*	$NetBSD: intel_memory_region.c,v 1.3 2021/12/19 10:28:41 riastradh Exp $	*/
 
 // SPDX-License-Identifier: MIT
 /*
@@ -6,7 +6,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_memory_region.c,v 1.2 2021/12/18 23:45:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_memory_region.c,v 1.3 2021/12/19 10:28:41 riastradh Exp $");
 
 #include "intel_memory_region.h"
 #include "i915_drv.h"
@@ -203,6 +203,8 @@ intel_memory_region_create(struct drm_i9
 	return mem;
 
 err_free:
+	mutex_destroy(&mem->mm_lock);
+	mutex_destroy(&mem->objects.lock);
 	kfree(mem);
 	return ERR_PTR(err);
 }

Index: src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_userptr.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_userptr.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_userptr.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_userptr.c:1.2	Sat Dec 18 23:45:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_userptr.c	Sun Dec 19 10:28:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_gem_userptr.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $	*/
+/*	$NetBSD: i915_gem_userptr.c,v 1.3 2021/12/19 10:28:41 riastradh Exp $	*/
 
 /*
  * SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_userptr.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_userptr.c,v 1.3 2021/12/19 10:28:41 riastradh Exp $");
 
 #include <linux/mmu_context.h>
 #include <linux/mmu_notifier.h>
@@ -844,4 +844,5 @@ int i915_gem_init_userptr(struct drm_i91
 void i915_gem_cleanup_userptr(struct drm_i915_private *dev_priv)
 {
 	destroy_workqueue(dev_priv->mm.userptr_wq);
+	mutex_destroy(&dev_priv->mm_lock);
 }