Module: Mesa Branch: staging/21.3 Commit: 0da127e399782d76097a4ce030f14c377e7535f4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0da127e399782d76097a4ce030f14c377e7535f4
Author: Mike Blumenkrantz <[email protected]> Date: Tue Nov 16 16:27:59 2021 -0500 zink: block suballocator caching for swapchain/dmabuf images these have pNext pointers which makes their memory uncacheable cc: mesa-stable Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13824> (cherry picked from commit eb6f1d53482b83feb51dac0f0fffd4291b651848) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_bo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8a2efb2b728..5fef7c12160 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -589,7 +589,7 @@ "description": "zink: block suballocator caching for swapchain/dmabuf images", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_bo.c b/src/gallium/drivers/zink/zink_bo.c index 8594e3be0bb..b5c815de033 100644 --- a/src/gallium/drivers/zink/zink_bo.c +++ b/src/gallium/drivers/zink/zink_bo.c @@ -259,7 +259,7 @@ bo_create_internal(struct zink_screen *screen, } /* all non-suballocated bo can cache */ - init_pb_cache = true; + init_pb_cache = !pNext; bo = CALLOC(1, sizeof(struct zink_bo) + init_pb_cache * sizeof(struct pb_cache_entry)); if (!bo) {
