Module Name: src
Committed By: riastradh
Date: Sun Feb 27 14:18:42 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_active.c
Log Message:
i915: Use new rb_move to relocate the active tree.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_active.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/i915_active.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c:1.12 Tue Feb 15 18:14:18 2022
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_active.c Sun Feb 27 14:18:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_active.c,v 1.12 2022/02/15 18:14:18 riastradh Exp $ */
+/* $NetBSD: i915_active.c,v 1.13 2022/02/27 14:18:42 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_active.c,v 1.12 2022/02/15 18:14:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_active.c,v 1.13 2022/02/27 14:18:42 riastradh Exp $");
#include <linux/debugobjects.h>
@@ -187,10 +187,11 @@ __active_retire(struct i915_active *ref)
GEM_BUG_ON(rcu_access_pointer(ref->excl.fence));
debug_active_deactivate(ref);
- root = ref->tree;
#ifdef __NetBSD__
+ rb_move(&root, &ref->tree);
rb_tree_init(&ref->tree.rbr_tree, &active_rb_ops);
#else
+ root = ref->tree;
ref->tree = RB_ROOT;
#endif
ref->cache = NULL;
