Module: Mesa Branch: staging/22.2 Commit: 80c165d155dea0ac96dee02364bffedc38983b77 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=80c165d155dea0ac96dee02364bffedc38983b77
Author: Mike Blumenkrantz <[email protected]> Date: Fri Aug 12 10:33:01 2022 -0400 zink: don't call util_queue_fence_init in zink_screen_get_pipeline_cache() this might accidentally clobber existing jobs cc: mesa-stable Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18197> (cherry picked from commit 40878e212f733cfe95ba5631402f21d65bc95934) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_screen.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index bdd27b70e45..5b5b737e9c0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -9157,7 +9157,7 @@ "description": "zink: don't call util_queue_fence_init in zink_screen_get_pipeline_cache()", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index c9b98d6a9df..6fab6da0e47 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -276,7 +276,6 @@ cache_get_job(void *data, void *gdata, int thread_index) void zink_screen_get_pipeline_cache(struct zink_screen *screen, struct zink_program *pg) { - util_queue_fence_init(&pg->cache_fence); if (!screen->disk_cache) return;
