Mesa (staging/20.0): etnaviv: Destroy rsc->pending_ctx set in etna_resource_destroy()

[GitLab Mirror]

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

Author: Marek Vasut <marex at denx.de>
Date:   Thu Jan 30 01:40:31 2020 +0100

etnaviv: Destroy rsc->pending_ctx set in etna_resource_destroy()

Destroy rsc->pending_ctx set in etna_resource_destroy(), otherwise
the memory is allocated, never free'd, and becomes unreachable. This
fixes a memory leak.

Fixes: 9e672e4d20fb ("etnaviv: keep references to pending resources")
Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Marek Vasut <marex at denx.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3633>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3633>
(cherry picked from commit c32bd325e7688c781b7e5de58a2d0534c82f00a0)

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 03fa059cefe..3d71e730991 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -76,7 +76,7 @@
         "description": "etnaviv: Destroy rsc->pending_ctx set in etna_resource_destroy()",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "9e672e4d20fb77e1b39aee29f9e8e76a5c2af68e"
     },
diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c
index 03b3ef8719e..4a992b5f668 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_resource.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_resource.c
@@ -464,6 +464,7 @@ etna_resource_destroy(struct pipe_screen *pscreen, struct pipe_resource *prsc)
    struct etna_resource *rsc = etna_resource(prsc);
 
    assert(!_mesa_set_next_entry(rsc->pending_ctx, NULL));
+   _mesa_set_destroy(rsc->pending_ctx, NULL);
 
    if (rsc->bo)
       etna_bo_del(rsc->bo);