Module: Mesa Branch: staging/22.3 Commit: 85cfafa532b4f75edc984e399a3a1b3056686773 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85cfafa532b4f75edc984e399a3a1b3056686773
Author: Lucas Stach <[email protected]> Date: Thu Jan 26 12:46:25 2023 +0100 etnaviv: free pm queries dynarray on screen destroy CC: mesa-stable Signed-off-by: Lucas Stach <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20940> (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 eaae4e26633..3e931a59c4f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -22,7 +22,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)
