Mesa (main): anv: Align state pools to 2MiB on XeHP
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Feb 23 20:41:34 UTC 2022
Module: Mesa
Branch: main
Commit: 0fffaa9fca93f6e9e8934b43d4aeb4594aea2202
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0fffaa9fca93f6e9e8934b43d4aeb4594aea2202
Author: Jordan Justen <jordan.l.justen at intel.com>
Date: Tue Feb 15 10:45:37 2022 -0800
anv: Align state pools to 2MiB on XeHP
Suggested-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Fixes: c17e2216dd5 ("anv: Align buffer VMA to 2MiB for XeHP")
Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15054>
---
src/intel/vulkan/anv_allocator.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c
index a7060e347ce..821eadba3c9 100644
--- a/src/intel/vulkan/anv_allocator.c
+++ b/src/intel/vulkan/anv_allocator.c
@@ -374,6 +374,12 @@ 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));
+ }
+
pool->name = name;
pool->device = device;
pool->use_relocations = anv_use_relocations(device->physical);
@@ -838,9 +844,13 @@ 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);
+
VkResult result = anv_block_pool_init(&pool->block_pool, device, name,
base_address + start_offset,
- block_size * 16);
+ initial_size);
if (result != VK_SUCCESS)
return result;
More information about the mesa-commit
mailing list