From 5519bb3c659165c487603fa67bff90d62b606a5c Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Tue, 8 May 2018 01:39:04 -0400 Subject: winsys/radeon: Destroy fd_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. v2: Use util_hash_table helper function CC: Reviewed-by: Marek Olšák Signed-off-by: Jan Vesely (cherry picked from commit 45dfa6f4e77fbb21f312eb6101db6c25acd4d483) --- src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index 3ee243adbcc..253dd4e2eb6 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -719,8 +719,13 @@ static bool radeon_winsys_unref(struct radeon_winsys *ws) mtx_lock(&fd_tab_mutex); destroy = pipe_reference(&rws->reference, NULL); - if (destroy && fd_tab) + if (destroy && fd_tab) { util_hash_table_remove(fd_tab, intptr_to_pointer(rws->fd)); + if (util_hash_table_count(fd_tab) == 0) { + util_hash_table_destroy(fd_tab); + fd_tab = NULL; + } + } mtx_unlock(&fd_tab_mutex); return destroy; -- cgit v1.2.3