From 8fb22d28d8a113a78d7dccd92225f7bbf407f448 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 16 Sep 2021 12:23:32 +0200 Subject: [PATCH] panvk: Make panvk_cmd_open_batch() return the new batch So we can get replace the panvk_cmd_open_batch(); batch = cmdbuf->state.batch; sequence by batch = panvk_cmd_open_batch(); Signed-off-by: Boris Brezillon Reviewed-by: Tomeu Vizoso Part-of: --- src/panfrost/vulkan/panvk_cmd_buffer.c | 3 ++- src/panfrost/vulkan/panvk_private.h | 2 +- src/panfrost/vulkan/panvk_vX_cmd_buffer.c | 3 +-- src/panfrost/vulkan/panvk_vX_meta_blit.c | 4 +--- src/panfrost/vulkan/panvk_vX_meta_copy.c | 20 ++++++-------------- 5 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/panfrost/vulkan/panvk_cmd_buffer.c b/src/panfrost/vulkan/panvk_cmd_buffer.c index a6cf56c9586..71d34dd7c5a 100644 --- a/src/panfrost/vulkan/panvk_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_cmd_buffer.c @@ -478,7 +478,7 @@ panvk_cmd_preload_fb_after_batch_split(struct panvk_cmd_buffer *cmdbuf) } } -void +struct panvk_batch * panvk_cmd_open_batch(struct panvk_cmd_buffer *cmdbuf) { assert(!cmdbuf->state.batch); @@ -486,6 +486,7 @@ panvk_cmd_open_batch(struct panvk_cmd_buffer *cmdbuf) sizeof(*cmdbuf->state.batch), 8, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); assert(cmdbuf->state.batch); + return cmdbuf->state.batch; } void diff --git a/src/panfrost/vulkan/panvk_private.h b/src/panfrost/vulkan/panvk_private.h index c613d0981dc..659f70581f0 100644 --- a/src/panfrost/vulkan/panvk_private.h +++ b/src/panfrost/vulkan/panvk_private.h @@ -685,7 +685,7 @@ struct panvk_cmd_buffer { VkResult record_result; }; -void +struct panvk_batch * panvk_cmd_open_batch(struct panvk_cmd_buffer *cmdbuf); void diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c index 5dd2f84da7b..0f443483a34 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c @@ -703,8 +703,7 @@ panvk_per_arch(CmdDraw)(VkCommandBuffer commandBuffer, if (batch->scoreboard.job_index >= (UINT16_MAX - 3)) { panvk_per_arch(cmd_close_batch)(cmdbuf); panvk_cmd_preload_fb_after_batch_split(cmdbuf); - panvk_cmd_open_batch(cmdbuf); - batch = cmdbuf->state.batch; + batch = panvk_cmd_open_batch(cmdbuf); } if (cmdbuf->state.pipeline->fs.required) diff --git a/src/panfrost/vulkan/panvk_vX_meta_blit.c b/src/panfrost/vulkan/panvk_vX_meta_blit.c index 178fa0cd3c2..a7885a213df 100644 --- a/src/panfrost/vulkan/panvk_vX_meta_blit.c +++ b/src/panfrost/vulkan/panvk_vX_meta_blit.c @@ -107,9 +107,7 @@ panvk_meta_blit(struct panvk_cmd_buffer *cmdbuf, if (ctx.dst.cur_layer < 0) continue; - panvk_cmd_open_batch(cmdbuf); - - struct panvk_batch *batch = cmdbuf->state.batch; + struct panvk_batch *batch = panvk_cmd_open_batch(cmdbuf); mali_ptr tsd, tiler; views[0].first_layer = views[0].last_layer = ctx.dst.cur_layer; diff --git a/src/panfrost/vulkan/panvk_vX_meta_copy.c b/src/panfrost/vulkan/panvk_vX_meta_copy.c index 86a4d5cd186..16fccb9f9e2 100644 --- a/src/panfrost/vulkan/panvk_vX_meta_copy.c +++ b/src/panfrost/vulkan/panvk_vX_meta_copy.c @@ -769,9 +769,7 @@ panvk_meta_copy_img2img(struct panvk_cmd_buffer *cmdbuf, pan_pool_upload_aligned(&cmdbuf->desc_pool.base, src_rect, sizeof(src_rect), 64); - panvk_cmd_open_batch(cmdbuf); - - struct panvk_batch *batch = cmdbuf->state.batch; + struct panvk_batch *batch = panvk_cmd_open_batch(cmdbuf); dstview.first_layer = dstview.last_layer = l + first_dst_layer; batch->blit.src = src->pimage.data.bo; @@ -1218,9 +1216,7 @@ panvk_meta_copy_buf2img(struct panvk_cmd_buffer *cmdbuf, pan_pool_upload_aligned(&cmdbuf->desc_pool.base, src_rect, sizeof(src_rect), 64); - panvk_cmd_open_batch(cmdbuf); - - struct panvk_batch *batch = cmdbuf->state.batch; + struct panvk_batch *batch = panvk_cmd_open_batch(cmdbuf); view.first_layer = view.last_layer = l + first_layer; batch->blit.src = buf->bo; @@ -1650,9 +1646,8 @@ panvk_meta_copy_img2buf(struct panvk_cmd_buffer *cmdbuf, panvk_meta_copy_img_emit_sampler(pdev, &cmdbuf->desc_pool.base); panvk_per_arch(cmd_close_batch)(cmdbuf); - panvk_cmd_open_batch(cmdbuf); - struct panvk_batch *batch = cmdbuf->state.batch; + struct panvk_batch *batch = panvk_cmd_open_batch(cmdbuf); struct pan_tls_info tlsinfo = { 0 }; @@ -1864,9 +1859,8 @@ panvk_meta_copy_buf2buf(struct panvk_cmd_buffer *cmdbuf, panvk_meta_copy_emit_ubo(pdev, &cmdbuf->desc_pool.base, &info, sizeof(info)); panvk_per_arch(cmd_close_batch)(cmdbuf); - panvk_cmd_open_batch(cmdbuf); - struct panvk_batch *batch = cmdbuf->state.batch; + struct panvk_batch *batch = panvk_cmd_open_batch(cmdbuf); panvk_per_arch(cmd_alloc_tls_desc)(cmdbuf, false); @@ -2034,9 +2028,8 @@ panvk_meta_fill_buf(struct panvk_cmd_buffer *cmdbuf, panvk_meta_copy_emit_ubo(pdev, &cmdbuf->desc_pool.base, &info, sizeof(info)); panvk_per_arch(cmd_close_batch)(cmdbuf); - panvk_cmd_open_batch(cmdbuf); - struct panvk_batch *batch = cmdbuf->state.batch; + struct panvk_batch *batch = panvk_cmd_open_batch(cmdbuf); panvk_per_arch(cmd_alloc_tls_desc)(cmdbuf, false); @@ -2095,9 +2088,8 @@ panvk_meta_update_buf(struct panvk_cmd_buffer *cmdbuf, panvk_meta_copy_emit_ubo(pdev, &cmdbuf->desc_pool.base, &info, sizeof(info)); panvk_per_arch(cmd_close_batch)(cmdbuf); - panvk_cmd_open_batch(cmdbuf); - struct panvk_batch *batch = cmdbuf->state.batch; + struct panvk_batch *batch = panvk_cmd_open_batch(cmdbuf); panvk_per_arch(cmd_alloc_tls_desc)(cmdbuf, false);