summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Park <jpark37@lagfreegames.com>2020-11-26 19:12:26 -0800
committerDylan Baker <dylan.c.baker@intel.com>2020-12-02 15:08:41 -0800
commit12c40b0477094846cd0e28d02f8d9d1a570c523e (patch)
treee6eb6bf2a4435f26ff43f125dbbe8f44a763d03e
parent1578dde278d4db8727ce6125eb80ec291bda3c74 (diff)
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@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7866> (cherry picked from commit 6ec0953e22cfea4e4869e45b784a13f44b65c275)
-rw-r--r--.pick_status.json2
-rw-r--r--src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 6c39d2c1285..f6941aa843a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -445,7 +445,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 c1a738a2b7f..130a8171d22 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
@@ -166,6 +166,7 @@ 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);
u_rwlock_destroy(&ws->global_bo_list_lock);
ac_addrlib_destroy(ws->addrlib);
amdgpu_device_deinitialize(ws->dev);