From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 21 Mar 2019 21:56:12 +0000 (-0700)
Subject: iris: Fix util_vma_heap_init size for IRIS_MEMZONE_SHADER
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a342f2deb132cd92d4e48c88132e400cefbcbec7;p=mesa.git

iris: Fix util_vma_heap_init size for IRIS_MEMZONE_SHADER

Fixes assertions when disabling bucket allocators.
---

diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index ae335163d45..e0d167913d2 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -1637,7 +1637,7 @@ iris_bufmgr_init(struct gen_device_info *devinfo, int fd)
    const uint64_t _4GB = 1ull << 32;
 
    util_vma_heap_init(&bufmgr->vma_allocator[IRIS_MEMZONE_SHADER],
-                      PAGE_SIZE, _4GB);
+                      PAGE_SIZE, _4GB - PAGE_SIZE);
    util_vma_heap_init(&bufmgr->vma_allocator[IRIS_MEMZONE_SURFACE],
                       IRIS_MEMZONE_SURFACE_START,
                       _4GB - IRIS_MAX_BINDERS * IRIS_BINDER_SIZE);