fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 14:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

anv: Align state pools to 2MiB on XeHP

Browse source 
Suggested-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Fixes: c17e2216dd ("anv: Align buffer VMA to 2MiB for XeHP")
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15054>
(cherry picked from commit 0fffaa9fca)
This commit is contained in:
Jordan Justen 2022-02-15 10:45:37 -08:00 • committed by Dylan Baker
parent de55b090e4
commit 94f5c307cb
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -634,7 +634,7 @@
"description": "anv: Align state pools to 2MiB on XeHP",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "c17e2216dd5f2ace77e44a8008b2b177d633b05e"
},

12
src/intel/vulkan/anv_allocator.c
View file

@ -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;