Mesa (master): winsys/radeon: Destroy fd_hash table when the last winsys is removed.
Jan Vesely
jvesely at kemper.freedesktop.org
Thu May 10 09:15:37 UTC 2018
Module: Mesa
Branch: master
Commit: 45dfa6f4e77fbb21f312eb6101db6c25acd4d483
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=45dfa6f4e77fbb21f312eb6101db6c25acd4d483
Author: Jan Vesely <jan.vesely at rutgers.edu>
Date: Tue May 8 01:39:04 2018 -0400
winsys/radeon: Destroy fd_hash table when the last winsys is removed.
Fixes memory leak on module unload.
v2: Use util_hash_table helper function
CC: <mesa-stable at lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
---
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 3ee243adbc..253dd4e2eb 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;
More information about the mesa-commit
mailing list