Mesa (staging/20.2): etnaviv: free tgsi tokens when shader state is deleted

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: e8b625bc963e7c503ce1af83c081e041f4d18a64
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e8b625bc963e7c503ce1af83c081e041f4d18a64

Author: Michael Tretter <m.tretter at pengutronix.de>
Date:   Wed Sep 23 10:50:18 2020 +0200

etnaviv: free tgsi tokens when shader state is deleted

The tokens are allocated using tgsi_dup_tokens when the shader state is
created, so we need to free them explicitly when deleting the shader state.

Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Michael Tretter <m.tretter at pengutronix.de>
Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7367>
(cherry picked from commit 98db7c4841c652ab8bccd4dc6c6a4be084e5cddb)

---

 .pick_status.json                            | 2 +-
 src/gallium/drivers/etnaviv/etnaviv_shader.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 9b2e02ea4cb..3766a3ba3e8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -589,7 +589,7 @@
         "description": "etnaviv: free tgsi tokens when shader state is deleted",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/etnaviv/etnaviv_shader.c b/src/gallium/drivers/etnaviv/etnaviv_shader.c
index b44354483ae..1aff32baec9 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_shader.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_shader.c
@@ -445,6 +445,7 @@ etna_delete_shader_state(struct pipe_context *pctx, void *ss)
          etna_destroy_shader(t);
    }
 
+   tgsi_free_tokens(shader->tokens);
    ralloc_free(shader->nir);
    FREE(shader);
 }