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

radv: don't submit empty command buffers on encoder ring.

Browse source 
the vcn enc/unified rings don't do nop packets, and hang with 0 sized
cmd buffers. This just stops submitting 0 sized cmd buffers to the hw.

Fixes hangs with dEQP-VK.video.decode.h264_i on navi3x

Cc: mesa-stable
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25932>
(cherry picked from commit f33683e4dad9e1dfb7dcd4f86bb86ef3e3954315)
This commit is contained in:
Dave Airlie 2023-10-27 14:18:35 +10:00 • committed by Eric Engestrom
parent 74ee323c17
commit 085612fce5
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -24,7 +24,7 @@
"description": "radv: don't submit empty command buffers on encoder ring.",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

7
src/amd/vulkan/radv_queue.c
View file

@ -1641,8 +1641,11 @@ radv_queue_submit_normal(struct radv_queue *queue, struct vk_queue_submit *submi
}
queue->device->ws->cs_unchain(cmd_buffer->cs);
if (!chainable || !queue->device->ws->cs_chain(chainable, cmd_buffer->cs, queue->state.uses_shadow_regs))
cs_array[num_submitted_cs++] = cmd_buffer->cs;
if (!chainable || !queue->device->ws->cs_chain(chainable, cmd_buffer->cs, queue->state.uses_shadow_regs)) {
/* don't submit empty command buffers to the kernel. */
if (radv_queue_ring(queue) != AMD_IP_VCN_ENC || cmd_buffer->cs->cdw != 0)
cs_array[num_submitted_cs++] = cmd_buffer->cs;
}
chainable = can_chain_next ? cmd_buffer->cs : NULL;
}