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

radv/amdgpu: fix alignment of command buffers

Browse source 
Fixes other recent regressions.

Fixes: 4f660f99 ("ac/gpu_info: pad IBs according to ib_size_alignment")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25502>
This commit is contained in:
Samuel Pitoiset 2023-10-02 13:53:33 +02:00 • committed by Marge Bot
parent 98bc20041c
commit 4bc58c9f11
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
View file

@ -288,9 +288,9 @@ radv_amdgpu_cs_get_new_ib(struct radeon_cmdbuf *_cs, uint32_t ib_size)
static unsigned
radv_amdgpu_cs_get_initial_size(struct radv_amdgpu_winsys *ws, enum amd_ip_type ip_type)
{
uint32_t ib_pad_dw_mask = MAX2(3, ws->info.ib_pad_dw_mask[ip_type]);
assert(util_is_power_of_two_nonzero(ib_pad_dw_mask + 1));
return align(20 * 1024 * 4, ib_pad_dw_mask + 1);
const uint32_t ib_size_alignment = ws->info.ip[ip_type].ib_size_alignment;
assert(util_is_power_of_two_nonzero(ib_size_alignment));
return align(20 * 1024 * 4, ib_size_alignment);
}
static struct radeon_cmdbuf *
@ -379,14 +379,14 @@ radv_amdgpu_cs_grow(struct radeon_cmdbuf *_cs, size_t min_size)
}
enum amd_ip_type ip_type = cs->hw_ip;
uint32_t ib_pad_dw_mask = MAX2(3, cs->ws->info.ib_pad_dw_mask[ip_type]);
const uint32_t ib_size_alignment = cs->ws->info.ip[ip_type].ib_size_alignment;
cs->ws->base.cs_finalize(_cs);
uint64_t ib_size = MAX2(min_size * 4 + 16, cs->base.max_dw * 4 * 2);
/* max that fits in the chain size field. */
ib_size = align(MIN2(ib_size, 0xfffff), ib_pad_dw_mask + 1);
ib_size = align(MIN2(ib_size, 0xfffff), ib_size_alignment);
VkResult result = radv_amdgpu_cs_bo_create(cs, ib_size);