Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:59:04 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_active.c i915_active.h
Log Message:
i915: Destroy locks in i915_active objects on free.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_active.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/i915/i915_active.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.6 Sun Dec 19 11:58:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c Sun Dec 19 11:59:04 2021
@@ -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 @@ int i915_request_await_active(struct i91
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 @@ void i915_active_fini(struct i915_active
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)
{
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_active.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_active.h:1.2 src/sys/external/bsd/drm2/dist/drm/i915/i915_active.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_active.h:1.2 Sat Dec 18 23:45:28 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_active.h Sun Dec 19 11:59:04 2021
@@ -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 @@ i915_active_is_idle(const struct i915_ac
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);
