diff options
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/iris/iris_bufmgr.c | 17 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_bufmgr.h | 16 |
2 files changed, 25 insertions, 8 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); diff --git a/src/gallium/drivers/iris/iris_bufmgr.h b/src/gallium/drivers/iris/iris_bufmgr.h index 6551f9e7890..ffde3673731 100644 --- a/src/gallium/drivers/iris/iris_bufmgr.h +++ b/src/gallium/drivers/iris/iris_bufmgr.h @@ -57,6 +57,10 @@ struct pipe_debug_callback; * A special 64kB "binder" buffer lives at the start of the surface memory * zone, holding binding tables referring to objects in the rest of the zone. * + * A special buffer for border color lives at the start of the dynamic state + * memory zone. This unfortunately has to be handled specially because the + * hardware designers only gave us 24-bit pointers. + * * Each GL context uses a separate GEM context, which technically gives them * each a separate VMA. However, we assign address globally, so buffers will * have the same address in all GEM contexts. This lets us have a single BO @@ -73,19 +77,27 @@ enum iris_memory_zone { IRIS_MEMZONE_OTHER, IRIS_MEMZONE_BINDER, + IRIS_MEMZONE_BORDER_COLOR_POOL, }; -/* Intentionally exclude IRIS_MEMZONE_BINDER */ -#define IRIS_MEMZONE_COUNT (IRIS_MEMZONE_OTHER + 1) +/* Intentionally exclude single buffer "zones" */ +#define IRIS_MEMZONE_COUNT (IRIS_MEMZONE_OTHER + 2) #define IRIS_MEMZONE_SHADER_START (0ull * (1ull << 32)) #define IRIS_MEMZONE_SURFACE_START (1ull * (1ull << 32)) #define IRIS_MEMZONE_DYNAMIC_START (2ull * (1ull << 32)) #define IRIS_MEMZONE_OTHER_START (3ull * (1ull << 32)) +#define IRIS_BINDER_SIZE (64 * 1024) #define IRIS_BINDER_ADDRESS IRIS_MEMZONE_SURFACE_START #define IRIS_BINDER_SIZE (64 * 1024) +/* This is large enough for every surface in the binder to have a border + * color, which although unlikely, guarantees we'll never overflow. + */ +#define IRIS_BORDER_COLOR_POOL_SIZE ((IRIS_BINDER_SIZE / 4) * 64) +#define IRIS_BORDER_COLOR_POOL_ADDRESS IRIS_MEMZONE_DYNAMIC_START + struct iris_bo { /** * Size in bytes of the buffer object. |