diff options
| author | James Park <jpark37@lagfreegames.com> | 2020-11-26 19:12:26 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-12-03 10:51:54 -0800 |
| commit | b313702aebcbc986529868c6efa68cf87be858e2 (patch) | |
| tree | 406334c15e5b56b279346cb655da798bee8c1f22 | |
| parent | 3b2f3e626fb56b0c9c96f438739daf2d1c93677c (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)
Conflicts:
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 2 |
2 files changed, 3 insertions, 1 deletions
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); |