Mesa (18.1): winsys/amdgpu: Destroy dev_hash table when the last winsys is removed.
Dylan Baker
dbaker at kemper.freedesktop.org
Fri May 11 15:41:35 UTC 2018
Module: Mesa
Branch: 18.1
Commit: 36c24a608e81307e7abbc60f2e397bd1fe514fb4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=36c24a608e81307e7abbc60f2e397bd1fe514fb4
Author: Jan Vesely <jan.vesely at rutgers.edu>
Date: Thu May 10 18:29:13 2018 -0400
winsys/amdgpu: Destroy dev_hash table when the last winsys is removed.
Fixes memory leak on module unload.
CC: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(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 f4bbd3e732..84d8ca6fcf 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;
More information about the mesa-commit
mailing list