From 480b9ff46ef3abf1c2c25ec962c294c0a38b1e0f Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Thu, 26 Jan 2023 12:46:25 +0100 Subject: [PATCH] etnaviv: free pm queries dynarray on screen destroy CC: mesa-stable Signed-off-by: Lucas Stach Reviewed-by: Christian Gmeiner Part-of: (cherry picked from commit c59369005bf42c2981561643d8b0eb15b1b52581) --- .pick_status.json | 2 +- src/gallium/drivers/etnaviv/etnaviv_screen.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 163d43c5dbd..f2101cc9239 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4495,7 +4495,7 @@ "description": "etnaviv: free pm queries dynarray on screen destroy", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c index 795f1258a4a..7c20ad2bdea 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_screen.c +++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c @@ -94,6 +94,8 @@ etna_screen_destroy(struct pipe_screen *pscreen) if (screen->perfmon) etna_perfmon_del(screen->perfmon); + util_dynarray_fini(&screen->supported_pm_queries); + etna_shader_screen_fini(pscreen); if (screen->pipe)