fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv/winsys: Deal with realloc failures in BO lists.

Browse source 
Otherwise if realloc fails we silently try to use it. Make recording fail instead.

CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5578>
This commit is contained in:
Bas Nieuwenhuizen 2020-06-20 20:34:59 +02:00 • committed by Marge Bot
parent 519ddfd312
commit 04765e6a9a
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
View file

@ -558,13 +558,20 @@ static void radv_amdgpu_cs_add_buffer_internal(struct radv_amdgpu_cs *cs,
unsigned hash; unsigned hash;
int index = radv_amdgpu_cs_find_buffer(cs, bo); int index = radv_amdgpu_cs_find_buffer(cs, bo);
if (index != -1) if (index != -1 || cs->failed)
return; return;
if (cs->num_buffers == cs->max_num_buffers) { if (cs->num_buffers == cs->max_num_buffers) {
unsigned new_count = MAX2(1, cs->max_num_buffers * 2); unsigned new_count = MAX2(1, cs->max_num_buffers * 2);
cs->handles = realloc(cs->handles, new_count * sizeof(struct drm_amdgpu_bo_list_entry)); struct drm_amdgpu_bo_list_entry *new_entries =
cs->max_num_buffers = new_count; realloc(cs->handles, new_count * sizeof(struct drm_amdgpu_bo_list_entry));
if (new_entries) {
cs->max_num_buffers = new_count;
cs->handles = new_entries;
} else {
cs->failed = true;
return;
}
} }
cs->handles[cs->num_buffers].bo_handle = bo; cs->handles[cs->num_buffers].bo_handle = bo;