GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 15:27:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/mm: fix hole size comparison

Browse source 
Fixes: 0cdea4455a ("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>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/367726/
This commit is contained in:
Nirmoy Das 2020-05-29 16:04:01 +02:00 • committed by Christian König
parent ba931cfd07
commit 18ece75d7d
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/drm_mm.c
View file

@ -407,7 +407,7 @@ next_hole_high_addr(struct drm_mm_node *entry, u64 size)
left_node = rb_entry(left_rb_node, left_node = rb_entry(left_rb_node,
struct drm_mm_node, rb_hole_addr); struct drm_mm_node, rb_hole_addr);
if ((left_node->subtree_max_hole < size || 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) parent_rb_node && parent_rb_node->rb_left != rb_node)
return rb_hole_addr_to_node(parent_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, right_node = rb_entry(right_rb_node,
struct drm_mm_node, rb_hole_addr); struct drm_mm_node, rb_hole_addr);
if ((right_node->subtree_max_hole < size || 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) parent_rb_node && parent_rb_node->rb_right != rb_node)
return rb_hole_addr_to_node(parent_rb_node); return rb_hole_addr_to_node(parent_rb_node);
} }