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

v3dv: avoid duplicate bo_handles between cpu_job and CSD lists

Browse source 
v3d_submit_cpu_ioctl() takes a separate ww_acquire_ctx for the cpu_job's
bo_handles[] and any embedded CSD's bo_handles[]; a BO appearing in both
lists makes the second lock wait on a reservation held by the first
context, deadlocking the ioctl.

We avoid adding a duplicate BO handle when it's already in the cpu_job's
list. This collided when an app suballocates an indirect VkBuffer and a
CSD bind-group VkBuffer out of one VkDeviceMemory.

Fixes: e404ccba5b ("v3dv: use the indirect CSD user extension")
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41616>
This commit is contained in:
Jose Maria Casanova Crespo 2026-05-16 18:24:55 +02:00 • committed by Marge Bot
parent 00016a115c
commit 87a0eac718
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/broadcom/vulkan/v3dv_queue.c
View file

@ -866,13 +866,16 @@ handle_csd_indirect_cpu_job(struct v3dv_queue *queue,
submit.bo_handle_count = 1;
submit.bo_handles = (uintptr_t)(void *)&bo->handle;
csd_job->csd.submit.bo_handle_count = csd_job->bo_count;
uint32_t *bo_handles = (uint32_t *) malloc(sizeof(uint32_t) * csd_job->bo_count);
uint32_t bo_idx = 0;
set_foreach (csd_job->bos, entry) {
struct v3dv_bo *bo = (struct v3dv_bo *)entry->key;
bo_handles[bo_idx++] = bo->handle;
struct v3dv_bo *csd_bo = (struct v3dv_bo *)entry->key;
/* dedup against cpu_job bo */
if (csd_bo->handle == bo->handle)
continue;
bo_handles[bo_idx++] = csd_bo->handle;
}
csd_job->csd.submit.bo_handle_count = bo_idx;
csd_job->csd.submit.bo_handles = (uintptr_t)(void *)bo_handles;
struct drm_v3d_indirect_csd indirect = {0};