Mesa (staging/21.1): radv/winsys: fix allocating the number of CS in the sysmem path

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: cebc8191a81a77f6d2b20475a0e65a9860bf1d8c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cebc8191a81a77f6d2b20475a0e65a9860bf1d8c

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Wed Apr 21 15:58:27 2021 +0200

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 at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10376>
(cherry picked from commit ec0d3701cda87c05c155412f0f948caaed72f864)

---

 .pick_status.json                             | 2 +-
 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++)