OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panvk: Clean Midgard leftovers in the cmd_close_batch() path

Browse Source 
pan_preload_fb() will use pre-frames on Bifrost. Pass NULL preload_jobs
and assert that num_preload_jobs is zero.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29382>
This commit is contained in:
Boris Brezillon
2024-04-28 18:02:27 +02:00
committed by Marge Bot
parent dd8fb7139d
commit f21c163baa
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/panfrost/vulkan/panvk_vX_cmd_buffer.c
View File

@@ -181,13 +181,12 @@ panvk_per_arch(cmd_close_batch)(struct panvk_cmd_buffer *cmdbuf)
list_addtail(&batch->node, &cmdbuf->batches);
if (batch->jc.first_tiler) {
struct panfrost_ptr preload_jobs[2];
unsigned num_preload_jobs = GENX(pan_preload_fb)(
&dev->meta.blitter.cache, &cmdbuf->desc_pool.base, &batch->jc,
&cmdbuf->state.gfx.fb.info, batch->tls.gpu, batch->tiler.ctx_desc.gpu,
preload_jobs);
for (unsigned i = 0; i < num_preload_jobs; i++)
util_dynarray_append(&batch->jobs, void *, preload_jobs[i].cpu);
ASSERTED unsigned num_preload_jobs =
GENX(pan_preload_fb)(&dev->meta.blitter.cache, &cmdbuf->desc_pool.base,
&batch->jc, &cmdbuf->state.gfx.fb.info,
batch->tls.gpu, batch->tiler.ctx_desc.gpu, NULL);
assert(num_preload_jobs == 0);
}
if (batch->tlsinfo.tls.size) {