summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2022-02-14 07:40:51 +0200
committerDylan Baker <dylan.c.baker@intel.com>2022-02-24 14:56:51 -0800
commit7885a3d1b11961f48242f51879fe8b990e2f6cfb (patch)
treeef2ef5877ecc95de8a9a84afa80b677a45228f5b
parent081ea7fc89af636cca483014e49fb0f145835cfa (diff)
iris: fix a leak on surface states
Cc: mesa-stable Closes:https://gitlab.freedesktop.org/mesa/mesa/-/issues/6013 Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Nanley Chery <nanley.g.chery@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15010> (cherry picked from commit ecc00410302cae4e22ad7718a531f03658190389)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/iris/iris_state.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 94fd5ab5f04..d2df687ed2b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -301,7 +301,7 @@
"description": "iris: fix a leak on surface states",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 5cec1a75ed2..622752b0e97 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -3022,6 +3022,7 @@ iris_surface_destroy(struct pipe_context *ctx, struct pipe_surface *p_surf)
pipe_resource_reference(&surf->surface_state.ref.res, NULL);
pipe_resource_reference(&surf->surface_state_read.ref.res, NULL);
free(surf->surface_state.cpu);
+ free(surf->surface_state_read.cpu);
free(surf);
}