[Mesa-stable] [PATCH] nv50: free memory allocated by the prog which reads MP perf counters

Samuel Pitoiset samuel.pitoiset at gmail.com
Wed Dec 16 13:54:30 PST 2015


This fixes a memory leak introduced in 6a9c151
("nv50: add compute-related MP perf counters on G84+")

Untested patch, but it's exactly the same code as nvc0.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Cc: "11.1" <mesa-stable at lists.freedesktop.org>
---
 src/gallium/drivers/nouveau/nv50/nv50_screen.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
index 1e4b75f..ee43d8f 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
@@ -405,6 +405,11 @@ nv50_screen_destroy(struct pipe_screen *pscreen)
 
    if (screen->blitter)
       nv50_blitter_destroy(screen);
+   if (screen->pm.prog) {
+      screen->pm.prog->code = NULL; /* hardcoded, don't FREE */
+      nv50_program_destroy(NULL, screen->pm.prog);
+      FREE(screen->pm.prog);
+   }
 
    nouveau_bo_ref(NULL, &screen->code);
    nouveau_bo_ref(NULL, &screen->tls_bo);
-- 
2.6.4



More information about the mesa-stable mailing list