Skip to contentSkip to conversation

drm/mm: fix hole size comparison

PATCH In review Nirmoy Das 3 participants 3 messages May 29, 2020 – May 30, 2020

Subsystems (2)
lore
Share & tools
lore

Nirmoy Das

author
#0 lore raw

PATCH 1/1 drm/mm: fix hole size comparison

Fixes 0cdea4455acd350a ("drm/mm: optimize rb_hole_addr rbtree search")
---
 drivers/gpu/drm/drm_mm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/drm_mm.c +2 -2
index f4ca1ff80af9..60e9a9c91e9d 100644
@@ -407,7 +407,7 @@ next_hole_high_addr(struct drm_mm_node *entry, u64 size)
 		left_node = rb_entry(left_rb_node,
 				     struct drm_mm_node, rb_hole_addr);
 		if ((left_node->subtree_max_hole < size ||
-		     entry->size == entry->subtree_max_hole) &&
+		     HOLE_SIZE(entry) == entry->subtree_max_hole) &&
 		    parent_rb_node && parent_rb_node->rb_left != rb_node)
 			return rb_hole_addr_to_node(parent_rb_node);
 	}
@@ -447,7 +447,7 @@ next_hole_low_addr(struct drm_mm_node *entry, u64 size)
 		right_node = rb_entry(right_rb_node,
 				      struct drm_mm_node, rb_hole_addr);
 		if ((right_node->subtree_max_hole < size ||
-		     entry->size == entry->subtree_max_hole) &&
+		     HOLE_SIZE(entry) == entry->subtree_max_hole) &&
 		    parent_rb_node && parent_rb_node->rb_right != rb_node)
 			return rb_hole_addr_to_node(parent_rb_node);
 	}
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw

Am 29.05.20 um 16:09 schrieb Chris Wilson:

Quoted 3 lines

Quoting Nirmoy Das (2020-05-29 15:04:01)

Quoted 1 line
Fixes 0cdea4455acd350a ("drm/mm: optimize rb_hole_addr rbtree search")

Hmm. Indeed. Now, do you have a test case on your end that hits this?

No, I just got time to double read through this and stumbled over it :)

Patch is Reviewed-by: Christian König <[email protected]>.

If nobody has any objections I'm going to commit this to drm-misc-next in a minute.

Christian.

Quoted 2 lines

One of us should add one for drm-mm.
-Chris

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel