[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: Destroy locks in i...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f1e5bd8f3889
branches:  trunk
changeset: 1028769:f1e5bd8f3889
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:59:04 2021 +0000

description:
i915: Destroy locks in i915_active objects on free.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_active.c |  7 +++----
 sys/external/bsd/drm2/dist/drm/i915/i915_active.h |  6 +-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (57 lines):

diff -r c3dbe16088ff -r f1e5bd8f3889 sys/external/bsd/drm2/dist/drm/i915/i915_active.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_active.c Sun Dec 19 11:58:57 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_active.c Sun Dec 19 11:59:04 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_active.c,v 1.6 2021/12/19 11:58:25 riastradh Exp $        */
+/*     $NetBSD: i915_active.c,v 1.7 2021/12/19 11:59:04 riastradh Exp $        */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_active.c,v 1.6 2021/12/19 11:58:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_active.c,v 1.7 2021/12/19 11:59:04 riastradh Exp $");
 
 #include <linux/debugobjects.h>
 
@@ -575,7 +575,6 @@
        return err;
 }
 
-#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)
 void i915_active_fini(struct i915_active *ref)
 {
        debug_active_fini(ref);
@@ -583,8 +582,8 @@
        GEM_BUG_ON(work_pending(&ref->work));
        GEM_BUG_ON(!RB_EMPTY_ROOT(&ref->tree));
        mutex_destroy(&ref->mutex);
+       spin_lock_destroy(&ref->tree_lock);
 }
-#endif
 
 static inline bool is_idle_barrier(struct active_node *node, u64 idx)
 {
diff -r c3dbe16088ff -r f1e5bd8f3889 sys/external/bsd/drm2/dist/drm/i915/i915_active.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_active.h Sun Dec 19 11:58:57 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_active.h Sun Dec 19 11:59:04 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_active.h,v 1.2 2021/12/18 23:45:28 riastradh Exp $        */
+/*     $NetBSD: i915_active.h,v 1.3 2021/12/19 11:59:04 riastradh Exp $        */
 
 /*
  * SPDX-License-Identifier: MIT
@@ -202,11 +202,7 @@
        return !atomic_read(&ref->count);
 }
 
-#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)
 void i915_active_fini(struct i915_active *ref);
-#else
-static inline void i915_active_fini(struct i915_active *ref) { }
-#endif
 
 int i915_active_acquire_preallocate_barrier(struct i915_active *ref,
                                            struct intel_engine_cs *engine);