From f21c163baa2fd861fcf9504dbdc0338cdaca83d4 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Sun, 28 Apr 2024 18:02:27 +0200 Subject: [PATCH] panvk: Clean Midgard leftovers in the cmd_close_batch() path 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 Reviewed-by: Mary Guillemard Part-of: --- src/panfrost/vulkan/panvk_vX_cmd_buffer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c index 81315b77905..36d566e00a0 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c @@ -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) {