From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 28 Jun 2018 08:00:11 +0000 (-0700)
Subject: iris: don't include binder in surface VMA range
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1c19e3b21f6bd1692a0a6c47999e6b7cbe9b271a;p=mesa.git

iris: don't include binder in surface VMA range
---

diff --git a/src/gallium/drivers/iris/iris_binder.h b/src/gallium/drivers/iris/iris_binder.h
index bae548b9d73..dbb010693f5 100644
--- a/src/gallium/drivers/iris/iris_binder.h
+++ b/src/gallium/drivers/iris/iris_binder.h
@@ -33,8 +33,6 @@ struct iris_batch;
 struct iris_bufmgr;
 struct iris_compiled_shader;
 
-#define IRIS_BINDER_SIZE (64 * 1024)
-
 struct iris_binder
 {
    struct iris_bo *bo;
diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index 8919559ea9e..8b7067dc87c 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -1549,7 +1549,8 @@ iris_bufmgr_init(struct gen_device_info *devinfo, int fd)
    util_vma_heap_init(&bufmgr->vma_allocator[IRIS_MEMZONE_SHADER],
                       PAGE_SIZE, _4GB);
    util_vma_heap_init(&bufmgr->vma_allocator[IRIS_MEMZONE_SURFACE],
-                      IRIS_MEMZONE_SURFACE_START, _4GB);
+                      IRIS_MEMZONE_SURFACE_START + IRIS_BINDER_SIZE,
+                      _4GB - IRIS_BINDER_SIZE);
    util_vma_heap_init(&bufmgr->vma_allocator[IRIS_MEMZONE_DYNAMIC],
                       IRIS_MEMZONE_DYNAMIC_START, _4GB);
    util_vma_heap_init(&bufmgr->vma_allocator[IRIS_MEMZONE_OTHER],
diff --git a/src/gallium/drivers/iris/iris_bufmgr.h b/src/gallium/drivers/iris/iris_bufmgr.h
index d587314aa5f..6551f9e7890 100644
--- a/src/gallium/drivers/iris/iris_bufmgr.h
+++ b/src/gallium/drivers/iris/iris_bufmgr.h
@@ -84,6 +84,7 @@ enum iris_memory_zone {
 #define IRIS_MEMZONE_OTHER_START      (3ull * (1ull << 32))
 
 #define IRIS_BINDER_ADDRESS IRIS_MEMZONE_SURFACE_START
+#define IRIS_BINDER_SIZE (64 * 1024)
 
 struct iris_bo {
    /**