mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-26 19:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

panvk: fix missing same-subqueue wait for CmdWaitEvents2

Browse Source 
CmdSetEvent2 does not call cs_wait_slots.  CmdWaitEvents2 should wait
for the syncobj even on the same subqueue.  To that goal, update
collect_cs_deps to not clear self from wait_subqueue_mask.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31997>
This commit is contained in:
Chia-I Wu 2024-11-06 15:31:26 -08:00 committed by Marge Bot
parent fe50011ddb
commit 7e737500bd
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/panfrost/vulkan/csf/panvk_vX_cmd_buffer.c
View File

@ -349,7 +349,7 @@ collect_cs_deps(struct panvk_cmd_buffer *cmdbuf,
if (!stages_cover_subqueue(i, dst_stages))
continue;
deps->dst[i].wait_subqueue_mask |= wait_subqueue_mask & ~BITFIELD_BIT(i);
deps->dst[i].wait_subqueue_mask |= wait_subqueue_mask;
}
}
@ -425,8 +425,14 @@ panvk_per_arch(CmdPipelineBarrier2)(VkCommandBuffer commandBuffer,
panvk_per_arch(cmd_flush_draws)(cmdbuf);
uint32_t wait_subqueue_mask = 0;
for (uint32_t i = 0; i < PANVK_SUBQUEUE_COUNT; i++)
for (uint32_t i = 0; i < PANVK_SUBQUEUE_COUNT; i++) {
/* no need to perform both types of waits on the same subqueue */
if (deps.src[i].wait_sb_mask)
deps.dst[i].wait_subqueue_mask &= ~BITFIELD_BIT(i);
assert(!(deps.dst[i].wait_subqueue_mask & BITFIELD_BIT(i)));
wait_subqueue_mask |= deps.dst[i].wait_subqueue_mask;
}
for (uint32_t i = 0; i < PANVK_SUBQUEUE_COUNT; i++) {
if (!deps.src[i].wait_sb_mask)