Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:17:19 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.h
src/sys/external/bsd/drm2/include/linux: rbtree.h
Log Message:
Provide and use an rb_next2 which takes a pointer to the tree as well
Easier for us to implement.
Author: Maya Rashish <[email protected]>
Committer: Taylor R Campbell <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/include/linux/rbtree.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_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.39 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.40
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.39 Sun Dec 19 11:12:22 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Sun Dec 19 11:17:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.h,v 1.39 2021/12/19 11:12:22 riastradh Exp $ */
+/* $NetBSD: i915_drv.h,v 1.40 2021/12/19 11:17:19 riastradh Exp $ */
/* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
*/
@@ -1381,7 +1381,7 @@ static inline struct drm_i915_private *p
#define for_each_uabi_engine(engine__, i915__) \
for ((engine__) = rb_to_uabi_engine(rb_first(&(i915__)->uabi_engines));\
(engine__); \
- (engine__) = rb_to_uabi_engine(rb_next(&(engine__)->uabi_node)))
+ (engine__) = rb_to_uabi_engine(rb_next2(&(i915__)->uabi_engines, &(engine__)->uabi_node)))
#define I915_GTT_OFFSET_NONE ((u32)-1)
Index: src/sys/external/bsd/drm2/include/linux/rbtree.h
diff -u src/sys/external/bsd/drm2/include/linux/rbtree.h:1.10 src/sys/external/bsd/drm2/include/linux/rbtree.h:1.11
--- src/sys/external/bsd/drm2/include/linux/rbtree.h:1.10 Sun Dec 19 11:16:32 2021
+++ src/sys/external/bsd/drm2/include/linux/rbtree.h Sun Dec 19 11:17:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rbtree.h,v 1.10 2021/12/19 11:16:32 riastradh Exp $ */
+/* $NetBSD: rbtree.h,v 1.11 2021/12/19 11:17:19 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -69,6 +69,11 @@ rb_first(struct rb_root *root)
}
static inline struct rb_node *
+rb_next2(struct rb_root *root, struct rb_node *rb) {
+ return RB_TREE_NEXT(&root->rbr_tree, rb);
+}
+
+static inline struct rb_node *
rb_last(struct rb_root *root)
{
char *vnode = RB_TREE_MAX(&root->rbr_tree);
