Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 11:58:57 UTC 2021

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

Log Message:
i915: Destroy locks when done.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
    src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.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/gem/i915_gem_object.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.c:1.7	Sun Dec 19 11:58:50 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_object.c	Sun Dec 19 11:58:57 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: i915_gem_object.c,v 1.7 2021/12/19 11:58:50 riastradh Exp $	*/
+/*	$NetBSD: i915_gem_object.c,v 1.8 2021/12/19 11:58:57 riastradh Exp $	*/
 
 /*
  * Copyright © 2017 Intel Corporation
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_object.c,v 1.7 2021/12/19 11:58:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_object.c,v 1.8 2021/12/19 11:58:57 riastradh Exp $");
 
 #include <linux/bitmap.h>
 #include <linux/sched/mm.h>
@@ -177,6 +177,11 @@ static void __i915_gem_free_object_rcu(s
 		container_of(head, typeof(*obj), rcu);
 	struct drm_i915_private *i915 = to_i915(obj->base.dev);
 
+	/* i915_gem_object_init */
+	spin_lock_destroy(&obj->mmo.lock);
+	spin_lock_destroy(&obj->vma.lock);
+	mutex_destroy(&obj->mm.lock);
+
 	dma_resv_fini(&obj->base._resv);
 	drm_vma_node_destroy(&obj->base.vma_node);
 	i915_gem_object_free(obj);

Reply via email to