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

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

[Nirmoy Das]

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

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reported-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/drm_mm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index f4ca1ff80af9..60e9a9c91e9d 100644
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -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);
 	}
-- 
2.26.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/1] drm/mm: fix hole size comparison

[Chris Wilson]

Quoting Nirmoy Das (2020-05-29 15:04:01)
> 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?
One of us should add one for drm-mm.
-Chris
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/1] drm/mm: fix hole size comparison

[Christian König]

Am 29.05.20 um 16:09 schrieb Chris Wilson:
> Quoting Nirmoy Das (2020-05-29 15:04:01)
>> 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 <christian.koenig@amd.com>.

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

Christian.

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

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel