diff options
| author | riastradh <riastradh@NetBSD.org> | 2022-03-16 23:32:52 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2022-03-16 23:32:52 +0000 |
| commit | f53c12e15ccc572468dd01222f35d5148ceb01ac (patch) | |
| tree | b2a349f64cdaa09bc45c9a9f74a63c44e62cc960 /sys | |
| parent | 4ae107eced45837ff58cf01bbeb5624a13c04b3c (diff) | |
i915: Avoid freeing anything under a spin lock.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/external/bsd/drm2/dist/drm/i915/i915_active.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_active.c b/sys/external/bsd/drm2/dist/drm/i915/i915_active.c index be085083bbc..50ee3b7324e 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/i915_active.c +++ b/sys/external/bsd/drm2/dist/drm/i915/i915_active.c @@ -1,4 +1,4 @@ -/* $NetBSD: i915_active.c,v 1.13 2022/02/27 14:18:42 riastradh Exp $ */ +/* $NetBSD: i915_active.c,v 1.14 2022/03/16 23:32:52 riastradh Exp $ */ /* * SPDX-License-Identifier: MIT @@ -7,7 +7,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i915_active.c,v 1.13 2022/02/27 14:18:42 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_active.c,v 1.14 2022/03/16 23:32:52 riastradh Exp $"); #include <linux/debugobjects.h> @@ -301,7 +301,6 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl) node = rb_tree_find_node(&ref->tree.rbr_tree, &idx); if (node) { KASSERT(node->timeline == idx); - kmem_cache_free(global.slab_cache, prealloc); goto out; } #else @@ -324,6 +323,7 @@ active_instance(struct i915_active *ref, struct intel_timeline *tl) #endif node = prealloc; + prealloc = NULL; __i915_active_fence_init(&node->base, NULL, node_retire); node->ref = ref; node->timeline = idx; @@ -341,6 +341,11 @@ out: ref->cache = node; spin_unlock_irq(&ref->tree_lock); +#ifdef __NetBSD__ + if (prealloc) + kmem_cache_free(global.slab_cache, prealloc); +#endif + BUILD_BUG_ON(offsetof(typeof(*node), base)); return &node->base; } |
