Mesa (staging/20.2): radv: Fix leak in radv_amdgpu_winsys_destroy()

[GitLab Mirror]

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

Author: James Park <jpark37 at lagfreegames.com>
Date:   Thu Nov 26 19:12:26 2020 -0800

radv: Fix leak in radv_amdgpu_winsys_destroy()

Fixes: fa97061a823 ("radv/winsys: Add binary syncobj ABI changes for timeline semaphores.")

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7866>
(cherry picked from commit 6ec0953e22cfea4e4869e45b784a13f44b65c275)

 Conflicts:
	src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c

---

 .pick_status.json                                 | 2 +-
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index bb78b13251a..839697feed0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -670,7 +670,7 @@
         "description": "radv: Fix leak in radv_amdgpu_winsys_destroy()",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "fa97061a8235b64009d7897ecf20cc81258f3403"
     },
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
index c6deedcb32c..ae51d223bc7 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
@@ -166,6 +166,8 @@ static void radv_amdgpu_winsys_destroy(struct radeon_winsys *rws)
 		amdgpu_cs_destroy_syncobj(ws->dev, ws->syncobj[i]);
 	free(ws->syncobj);
 
+	pthread_mutex_destroy(&ws->syncobj_lock);
+	pthread_mutex_destroy(&ws->global_bo_list_lock);
 	ac_addrlib_destroy(ws->addrlib);
 	amdgpu_device_deinitialize(ws->dev);
 	FREE(rws);