fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: fix memleaks in radv_sqtt_reloc_graphics_shaders()

Browse source 
Co-authored-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31607>
This commit is contained in:
Semenov Herman (Семенов Герман) 2024-10-13 00:49:07 +03:00 • committed by Samuel Pitoiset
parent 6775524c69
commit 637a4b849a
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/amd/vulkan/layers/radv_sqtt_layer.c
View file

@ -139,6 +139,7 @@ radv_sqtt_reloc_graphics_shaders(struct radv_device *device, struct radv_graphic
struct radv_shader_dma_submission *submission = NULL;
struct radv_sqtt_shaders_reloc *reloc;
uint32_t code_size = 0;
VkResult result;
reloc = calloc(1, sizeof(*reloc));
if (!reloc)
@ -156,8 +157,8 @@ radv_sqtt_reloc_graphics_shaders(struct radv_device *device, struct radv_graphic
/* Allocate memory for all shader binaries. */
reloc->alloc = radv_alloc_shader_memory(device, code_size, false, pipeline);
if (!reloc->alloc) {
free(reloc);
return VK_ERROR_OUT_OF_DEVICE_MEMORY;
result = VK_ERROR_OUT_OF_DEVICE_MEMORY;
goto fail;
}
reloc->bo = reloc->alloc->arena->bo;
@ -169,8 +170,10 @@ radv_sqtt_reloc_graphics_shaders(struct radv_device *device, struct radv_graphic
if (device->shader_use_invisible_vram) {
submission = radv_shader_dma_get_submission(device, reloc->bo, slab_va, code_size);
if (!submission)
return VK_ERROR_UNKNOWN;
if (!submission) {
result = VK_ERROR_UNKNOWN;
goto fail;
}
}
for (int i = 0; i < MESA_VULKAN_SHADER_STAGES; ++i) {
@ -194,8 +197,10 @@ radv_sqtt_reloc_graphics_shaders(struct radv_device *device, struct radv_graphic
if (device->shader_use_invisible_vram) {
uint64_t upload_seq = 0;
if (!radv_shader_dma_submit(device, submission, &upload_seq))
return VK_ERROR_UNKNOWN;
if (!radv_shader_dma_submit(device, submission, &upload_seq)) {
result = VK_ERROR_UNKNOWN;
goto fail;
}
for (int i = 0; i < MESA_VULKAN_SHADER_STAGES; ++i) {
struct radv_shader *shader = pipeline->base.shaders[i];
@ -213,6 +218,12 @@ radv_sqtt_reloc_graphics_shaders(struct radv_device *device, struct radv_graphic
pipeline->sqtt_shaders_reloc = reloc;
return VK_SUCCESS;
fail:
if (reloc->alloc)
radv_free_shader_memory(device, reloc->alloc);
free(reloc);
return result;
}
static void