diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2021-04-21 15:58:27 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-04-25 16:56:03 +0200 |
| commit | cebc8191a81a77f6d2b20475a0e65a9860bf1d8c (patch) | |
| tree | 3545d3e25dad80cdea78f857fdc0301cd2f9d207 | |
| parent | db1b07411014f3dac29a3a826ae1f10cc41c255e (diff) | |
radv/winsys: fix allocating the number of CS in the sysmem path
Found with Valgrind and dEQP-VK.api.command_buffers.record_many_draws*.
Cc: 21.1 mesa-stable
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/10376>
(cherry picked from commit ec0d3701cda87c05c155412f0f948caaed72f864)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 4ab0e3b731e..e69400b963a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -247,7 +247,7 @@ "description": "radv/winsys: fix allocating the number of CS in the sysmem path", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index b64b636e0af..65e5d76d23f 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -925,7 +925,7 @@ radv_amdgpu_winsys_cs_submit_sysmem(struct radeon_winsys_ctx *_ctx, int queue_id struct radeon_cmdbuf **new_cs_array; unsigned idx = 0; - new_cs_array = malloc(cs->num_old_cs_buffers * sizeof(*new_cs_array)); + new_cs_array = malloc(number_of_ibs * sizeof(*new_cs_array)); assert(new_cs_array); for (unsigned j = 0; j < cs->num_old_cs_buffers; j++) |