[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: Use new rb_move to...

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

details:   https://anonhg.NetBSD.org/src/rev/73f892bf80c5
branches:  trunk
changeset: 362432:73f892bf80c5
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Feb 27 14:18:42 2022 +0000

description:
i915: Use new rb_move to relocate the active tree.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_active.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r a8ad94514b70 -r 73f892bf80c5 sys/external/bsd/drm2/dist/drm/i915/i915_active.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_active.c Sun Feb 27 14:18:34 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_active.c Sun Feb 27 14:18:42 2022 +0000
@@ -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 @@
        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;