From 28efc785d3fe7771d7a4e22b5445e03ba09cda1e Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 23 May 2023 10:55:59 +0300 Subject: [PATCH] anv: further reduce pool alignments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lionel Landwerlin Reviewed-by: Kenneth Graunke Tested-by: José Roberto de Souza Part-of: --- src/intel/vulkan/anv_allocator.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c index 3876f048da3..7de44ff96ee 100644 --- a/src/intel/vulkan/anv_allocator.c +++ b/src/intel/vulkan/anv_allocator.c @@ -355,11 +355,9 @@ anv_block_pool_init(struct anv_block_pool *pool, { VkResult result; - if (device->info->verx10 >= 125) { - /* Make sure VMA addresses are 2MiB aligned for the block pool */ - assert(anv_is_aligned(start_address, 2 * 1024 * 1024)); - assert(anv_is_aligned(initial_size, 2 * 1024 * 1024)); - } + /* Make sure VMA addresses are aligned for the block pool */ + assert(anv_is_aligned(start_address, device->info->mem_alignment)); + assert(anv_is_aligned(initial_size, device->info->mem_alignment)); pool->name = name; pool->device = device; @@ -637,9 +635,7 @@ anv_state_pool_init(struct anv_state_pool *pool, /* We don't want to ever see signed overflow */ assert(start_offset < INT32_MAX - (int32_t)BLOCK_POOL_MEMFD_SIZE); - uint32_t initial_size = block_size * 16; - if (device->info->verx10 >= 125) - initial_size = MAX2(initial_size, 2 * 1024 * 1024); + uint32_t initial_size = MAX2(block_size * 16, device->info->mem_alignment); VkResult result = anv_block_pool_init(&pool->block_pool, device, name, base_address + start_offset,