Blocks are not guarnteed to be in ascending order.

Signed-off-by: xinhui pan <xinhui....@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 21 ++++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index 27159f1d112e..17175d284869 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -59,22 +59,17 @@ amdgpu_vram_mgr_first_block(struct list_head *list)
 static inline bool amdgpu_is_vram_mgr_blocks_contiguous(struct list_head *head)
 {
        struct drm_buddy_block *block;
-       u64 start, size;
+       u64 start = LONG_MAX, end = 0, size = 0;
 
-       block = amdgpu_vram_mgr_first_block(head);
-       if (!block)
-               return false;
+       list_for_each_entry(block, head, link) {
+               u64 bstart = amdgpu_vram_mgr_block_start(block);
+               u64 bsize = amdgpu_vram_mgr_block_size(block);
 
-       while (head != block->link.next) {
-               start = amdgpu_vram_mgr_block_start(block);
-               size = amdgpu_vram_mgr_block_size(block);
-
-               block = list_entry(block->link.next, struct drm_buddy_block, 
link);
-               if (start + size != amdgpu_vram_mgr_block_start(block))
-                       return false;
+               start = min(bstart, start);
+               end = max(bstart + bsize, end);
+               size += bsize;
        }
-
-       return true;
+       return end == start + size;
 }
 
 
-- 
2.34.1

Reply via email to