diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2021-03-28 06:49:55 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-04-06 22:31:15 +0000 |
| commit | c105c8ad2ccaaff0eb0f477993f4b212ec33077f (patch) | |
| tree | 8acc98416bc2ae92374f31c8f4d99269fe02d431 /src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | |
| parent | 815d98c22d407b9a3a3377d829152ed8649260fc (diff) | |
winsys/amdgpu: remove another 8 bytes from amdgpu_winsys_bo by packing better
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9809>
Diffstat (limited to 'src/gallium/winsys/amdgpu/drm/amdgpu_cs.c')
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_cs.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c index bde2508847f..008894043a3 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.c @@ -1334,13 +1334,16 @@ void amdgpu_add_fences(struct amdgpu_winsys_bo *bo, REALLOC(bo->fences, bo->num_fences * sizeof(*new_fences), new_max_fences * sizeof(*new_fences)); - if (likely(new_fences)) { + if (likely(new_fences && new_max_fences < UINT16_MAX)) { bo->fences = new_fences; bo->max_fences = new_max_fences; } else { unsigned drop; - fprintf(stderr, "amdgpu_add_fences: allocation failure, dropping fence(s)\n"); + fprintf(stderr, new_fences ? "amdgpu_add_fences: too many fences, dropping some\n" + : "amdgpu_add_fences: allocation failure, dropping fence(s)\n"); + free(new_fences); + if (!bo->num_fences) return; |