From: Michel Dänzer <michel.daenzer@amd.com>
Date: Thu, 26 Apr 2012 09:44:11 +0000 (+0200)
Subject: gallium/radeon: Fix losing holes when allocating virtual address space.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f5fe81daea622f8f043edc19fb61ba367b6958aa;p=mesa.git

gallium/radeon: Fix losing holes when allocating virtual address space.

If a hole exactly matches the allocated size plus alignment, we would fail to
preserve the alignment as a hole. This would result in never being able to use
the alignment area for an allocation again.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index f09e7e819cb..a01cc15b1ca 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -221,7 +221,7 @@ static uint64_t radeon_bomgr_find_va(struct radeon_bomgr *mgr, uint64_t size, ui
             pipe_mutex_unlock(mgr->bo_va_mutex);
             return offset;
         }
-        if ((hole->size - waste) >= size) {
+        if ((hole->size - waste) > size) {
             if (waste) {
                 n = CALLOC_STRUCT(radeon_bo_va_hole);
                 n->size = waste;
@@ -233,6 +233,11 @@ static uint64_t radeon_bomgr_find_va(struct radeon_bomgr *mgr, uint64_t size, ui
             pipe_mutex_unlock(mgr->bo_va_mutex);
             return offset;
         }
+        if ((hole->size - waste) == size) {
+            hole->size = waste;
+            pipe_mutex_unlock(mgr->bo_va_mutex);
+            return offset;
+        }
     }
 
     offset = mgr->va_offset;