diff options
| author | Kenneth Graunke <[email protected]> | 2018-06-28 01:00:11 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2019-02-21 10:26:07 -0800 |
| commit | 8a16249285fcf85dc52b99353d2234cb98be6eae (patch) | |
| tree | 94fe2a55777c4f2c409ff4752ffd299110908853 /src/gallium/drivers/iris/iris_bufmgr.c | |
| parent | 1c19e3b21f6bd1692a0a6c47999e6b7cbe9b271a (diff) | |
iris: border color memory zone :(
They took away our pointer bits, so now we need a pile of special code
to handle this instead of just using u_upload_mgr. :(
Diffstat (limited to 'src/gallium/drivers/iris/iris_bufmgr.c')
| -rw-r--r-- | src/gallium/drivers/iris/iris_bufmgr.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c index 8b7067dc87c..da770ee7750 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.c +++ b/src/gallium/drivers/iris/iris_bufmgr.c @@ -240,16 +240,18 @@ memzone_for_address(uint64_t address) if (address >= IRIS_MEMZONE_OTHER_START) return IRIS_MEMZONE_OTHER; - if (address >= IRIS_MEMZONE_DYNAMIC_START) - return IRIS_MEMZONE_DYNAMIC; + if (address == IRIS_MEMZONE_DYNAMIC_START) + return IRIS_MEMZONE_BORDER_COLOR_POOL; - /* Use > to exclude the binder */ - if (address > IRIS_MEMZONE_SURFACE_START) - return IRIS_MEMZONE_SURFACE; + if (address > IRIS_MEMZONE_DYNAMIC_START) + return IRIS_MEMZONE_DYNAMIC; if (address == IRIS_BINDER_ADDRESS) return IRIS_MEMZONE_BINDER; + if (address > IRIS_MEMZONE_SURFACE_START) + return IRIS_MEMZONE_SURFACE; + return IRIS_MEMZONE_SHADER; } @@ -366,6 +368,8 @@ __vma_alloc(struct iris_bufmgr *bufmgr, { if (memzone == IRIS_MEMZONE_BINDER) return IRIS_BINDER_ADDRESS; + else if (memzone == IRIS_MEMZONE_BORDER_COLOR_POOL) + return IRIS_BORDER_COLOR_POOL_ADDRESS; struct bo_cache_bucket *bucket = get_bucket_allocator(bufmgr, size); uint64_t addr; @@ -1552,7 +1556,8 @@ iris_bufmgr_init(struct gen_device_info *devinfo, int fd) 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); + IRIS_MEMZONE_DYNAMIC_START + IRIS_BORDER_COLOR_POOL_SIZE, + _4GB - IRIS_BORDER_COLOR_POOL_SIZE); util_vma_heap_init(&bufmgr->vma_allocator[IRIS_MEMZONE_OTHER], IRIS_MEMZONE_OTHER_START, (1ull << 48) - IRIS_MEMZONE_OTHER_START); |