diff options
| author | Jesse Natalie <jenatali@microsoft.com> | 2022-02-07 19:03:04 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-02-24 14:56:50 -0800 |
| commit | 3b1563dcfb4d2123338fc46a4c2bc1310395baee (patch) | |
| tree | 4dbedea0d95f7efc17429cb9a8d59d9e592f25e2 | |
| parent | e93350a8334aa10cefdd3f825d46f0bc869601a2 (diff) | |
tc: CPU storage needs to be freed with align_free
Cc: mesa-stable
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14933>
(cherry picked from commit 7ec0e2b89351e6e56cb112e00e6c68c6bbc6faea)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_threaded_context.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 0896523ab9c..f3cebbaf028 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -427,7 +427,7 @@ "description": "tc: CPU storage needs to be freed with align_free", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/auxiliary/util/u_threaded_context.h b/src/gallium/auxiliary/util/u_threaded_context.h index ed375558ce8..20bc533503f 100644 --- a/src/gallium/auxiliary/util/u_threaded_context.h +++ b/src/gallium/auxiliary/util/u_threaded_context.h @@ -199,6 +199,7 @@ #include "pipe/p_state.h" #include "util/bitset.h" #include "util/u_inlines.h" +#include "util/u_memory.h" #include "util/u_queue.h" #include "util/u_range.h" #include "util/u_thread.h" @@ -609,7 +610,7 @@ tc_buffer_disable_cpu_storage(struct pipe_resource *buf) struct threaded_resource *tres = threaded_resource(buf); if (tres->cpu_storage) { - free(tres->cpu_storage); + align_free(tres->cpu_storage); tres->cpu_storage = NULL; } } |