From 36c24a608e81307e7abbc60f2e397bd1fe514fb4 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Thu, 10 May 2018 18:29:13 -0400 Subject: winsys/amdgpu: Destroy dev_hash table when the last winsys is removed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes memory leak on module unload. CC: Signed-off-by: Jan Vesely Reviewed-by: Marek Olšák (cherry picked from commit 58272c1ad771802a6f15a482ae552649e9085042) --- src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index f4bbd3e7324..84d8ca6fcf3 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -220,8 +220,13 @@ static bool amdgpu_winsys_unref(struct radeon_winsys *rws) simple_mtx_lock(&dev_tab_mutex); destroy = pipe_reference(&ws->reference, NULL); - if (destroy && dev_tab) + if (destroy && dev_tab) { util_hash_table_remove(dev_tab, ws->dev); + if (util_hash_table_count(dev_tab) == 0) { + util_hash_table_destroy(dev_tab); + dev_tab = NULL; + } + } simple_mtx_unlock(&dev_tab_mutex); return destroy; -- cgit v1.2.3