diff options
| author | Jan Vesely <jan.vesely@rutgers.edu> | 2018-05-08 01:39:04 -0400 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2018-05-10 08:30:35 -0700 |
| commit | 5519bb3c659165c487603fa67bff90d62b606a5c (patch) | |
| tree | 9b7adab8b2ee17ab9358ef675f473972dbbae265 | |
| parent | 5fc5b1dab831b8846fb09db7cad6f83f00c01111 (diff) | |
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@lists.freedesktop.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
(cherry picked from commit 45dfa6f4e77fbb21f312eb6101db6c25acd4d483)
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 7 |
1 files changed, 6 insertions, 1 deletions
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; |