NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

radv/amdgpu: do not copy the original chain link for IBs

Browse source 
Otherwise, if a secondary CS is grown and then executed without IB2,
the INDIRECT_BUFFER packet would have been copied but it shouldn't.

This fixes a regression that introduced GPU hangs with
gl_vk_meshlet_cadscene on RDNA2.

Fixes: df0c742543 ("radv/amdgpu: rework growing a CS with the chained IB path slightly")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24891>
This commit is contained in:
Samuel Pitoiset 2023-08-30 14:08:09 +02:00 • committed by Marge Bot
parent 9206aeb077
commit e80fddf81f
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -715,14 +715,19 @@ radv_amdgpu_cs_execute_secondary(struct radeon_cmdbuf *_parent, struct radeon_cm
/* Grow the current CS and copy the contents of the secondary CS. */
for (unsigned i = 0; i < child->num_ib_buffers; i++) {
struct radv_amdgpu_ib *ib = &child->ib_buffers[i];
uint32_t cdw = ib->cdw;
uint8_t *mapped;
/* Do not copy the original chain link for IBs. */
if (child->use_ib)
cdw -= 4;
assert(!ib->is_external);
if (parent->base.cdw + ib->cdw > parent->base.max_dw)
radv_amdgpu_cs_grow(&parent->base, ib->cdw);
if (parent->base.cdw + cdw > parent->base.max_dw)
radv_amdgpu_cs_grow(&parent->base, cdw);
parent->base.reserved_dw = MAX2(parent->base.reserved_dw, parent->base.cdw + ib->cdw);
parent->base.reserved_dw = MAX2(parent->base.reserved_dw, parent->base.cdw + cdw);
mapped = ws->base.buffer_map(ib->bo);
if (!mapped) {
@ -730,9 +735,8 @@ radv_amdgpu_cs_execute_secondary(struct radeon_cmdbuf *_parent, struct radeon_cm
return;
}
/* Copy the IB data without the original chain link. */
memcpy(parent->base.buf + parent->base.cdw, mapped, 4 * ib->cdw);
parent->base.cdw += ib->cdw;
memcpy(parent->base.buf + parent->base.cdw, mapped, 4 * cdw);
parent->base.cdw += cdw;
}
}
}