Mesa (main): etnaviv: fix leak of the screen hash table

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: f7168feb9b9ccad38b0cf2463eccba45f35caff5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7168feb9b9ccad38b0cf2463eccba45f35caff5

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Thu Sep 16 18:50:42 2021 +0200

etnaviv: fix leak of the screen hash table

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Tested-by: Philipp Zabel p.zabel at pengutronix.de
Reviewed-by: Simon Ser <contact at emersion.fr>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12904>

---

 src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c b/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c
index 03d61623e7a..1eb5b3c6947 100644
--- a/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c
+++ b/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c
@@ -142,6 +142,11 @@ etna_drm_screen_destroy(struct pipe_screen *pscreen)
    if (destroy) {
       int fd = etna_device_fd(screen->dev);
       _mesa_hash_table_remove_key(fd_tab, intptr_to_pointer(fd));
+
+      if (!fd_tab->entries) {
+         _mesa_hash_table_destroy(fd_tab, NULL);
+         fd_tab = NULL;
+      }
    }
    mtx_unlock(&etna_screen_mutex);