From 09f096c8df9f6a08a3ddbd2aab3b5c308c2fa1de Mon Sep 17 00:00:00 2001 From: Luigi Santivetti Date: Tue, 27 Aug 2024 10:09:22 +0100 Subject: [PATCH] pvr: really free memory in subpass render init Fixes: 10b6a0d567e ("pvr: Add support for generating render pass hw setup data.") Signed-off-by: Luigi Santivetti Acked-by: Alyssa Rosenzweig Part-of: (cherry picked from commit 9651d73671817ca742398367b90fdb4dd9342020) --- .pick_status.json | 2 +- src/imagination/vulkan/pvr_hw_pass.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4fb0831bc84..c689d1e4473 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1744,7 +1744,7 @@ "description": "pvr: really free memory in subpass render init", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "10b6a0d567e9782ae5217f4303bdc6fd2f0610ec", "notes": null diff --git a/src/imagination/vulkan/pvr_hw_pass.c b/src/imagination/vulkan/pvr_hw_pass.c index 615bf3024e5..c456651c52e 100644 --- a/src/imagination/vulkan/pvr_hw_pass.c +++ b/src/imagination/vulkan/pvr_hw_pass.c @@ -590,9 +590,7 @@ pvr_subpass_setup_render_init(struct pvr_renderpass_context *ctx) hw_subpass->color_initops[j], &use_render_init); if (result != VK_SUCCESS) { - if (!first_use.tile_buffers) - free(first_use.tile_buffers); - + vk_free(ctx->allocator, first_use.tile_buffers); return result; } @@ -610,8 +608,7 @@ pvr_subpass_setup_render_init(struct pvr_renderpass_context *ctx) } } - if (!first_use.tile_buffers) - free(first_use.tile_buffers); + vk_free(ctx->allocator, first_use.tile_buffers); return VK_SUCCESS; }