diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2021-02-09 15:29:50 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-02-10 12:25:38 +0000 |
| commit | ed7e6eb54bdc13b524b0595749b118e1f4d4d3ea (patch) | |
| tree | 3e258f5ddd2ab78d3f78603b6da73a40c82fb8d7 /src/amd/vulkan/radv_device.c | |
| parent | bf5713d73689fa1a7cfefb989d4d793863b726b7 (diff) | |
radv: fix memory leaks if a submission fails
If the device isn't lost, the application might want to re-submit.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8931>
Diffstat (limited to 'src/amd/vulkan/radv_device.c')
| -rw-r--r-- | src/amd/vulkan/radv_device.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 730cf60f66c..d7e9d9bc42c 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -4081,7 +4081,6 @@ radv_alloc_sem_info(struct radv_device *device, VkFence fence) { VkResult ret; - memset(sem_info, 0, sizeof(*sem_info)); ret = radv_alloc_sem_counts(device, &sem_info->wait, num_wait_sems, wait_sems, wait_values, VK_NULL_HANDLE, false); if (ret) @@ -4564,7 +4563,7 @@ radv_queue_submit_deferred(struct radv_deferred_queue_submission *submission, bool do_flush = submission->flush_caches || submission->wait_dst_stage_mask; bool can_patch = true; uint32_t advance; - struct radv_winsys_sem_info sem_info; + struct radv_winsys_sem_info sem_info = {0}; VkResult result; struct radeon_cmdbuf *initial_preamble_cs = NULL; struct radeon_cmdbuf *initial_flush_preamble_cs = NULL; @@ -4666,8 +4665,10 @@ radv_queue_submit_deferred(struct radv_deferred_queue_submission *submission, advance, initial_preamble, continue_preamble_cs, &sem_info, can_patch, base_fence); - if (result != VK_SUCCESS) + if (result != VK_SUCCESS) { + free(cs_array); goto fail; + } if (queue->device->trace_bo) { radv_check_gpu_hangs(queue, cs_array[j]); @@ -4681,9 +4682,6 @@ radv_queue_submit_deferred(struct radv_deferred_queue_submission *submission, free(cs_array); } - radv_free_temp_syncobjs(queue->device, - submission->temporary_semaphore_part_count, - submission->temporary_semaphore_parts); radv_finalize_timelines(queue->device, submission->wait_semaphore_count, submission->wait_semaphores, @@ -4696,9 +4694,6 @@ radv_queue_submit_deferred(struct radv_deferred_queue_submission *submission, * condition variable is only triggered when timelines and queue have * been updated. */ radv_queue_submission_update_queue(submission, processing_list); - radv_free_sem_info(&sem_info); - free(submission); - return VK_SUCCESS; fail: if (result != VK_SUCCESS && result != VK_ERROR_DEVICE_LOST) { @@ -4715,6 +4710,7 @@ fail: radv_free_temp_syncobjs(queue->device, submission->temporary_semaphore_part_count, submission->temporary_semaphore_parts); + radv_free_sem_info(&sem_info); free(submission); return result; } @@ -4884,7 +4880,7 @@ bool radv_queue_internal_submit(struct radv_queue *queue, struct radeon_cmdbuf *cs) { struct radeon_winsys_ctx *ctx = queue->hw_ctx; - struct radv_winsys_sem_info sem_info; + struct radv_winsys_sem_info sem_info = {0}; VkResult result; result = radv_alloc_sem_info(queue->device, &sem_info, 0, NULL, 0, 0, |