From c5f585f45afdde8c453c57dad744fd51caf6a699 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 2 Mar 2022 08:48:52 -0500 Subject: [PATCH] zink: wait on program cache fences before destroying programs if these still have outstanding cache jobs, deleting the object now will cause a crash maybe fixes some cts flakiness? cc: mesa-stable Acked-by: Emma Anholt Reviewed-by: Dave Airlie Part-of: --- src/gallium/drivers/zink/zink_program.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index d9e93f67d12..db6b1784974 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -657,6 +657,7 @@ zink_destroy_gfx_program(struct zink_context *ctx, struct zink_gfx_program *prog) { struct zink_screen *screen = zink_screen(ctx->base.screen); + util_queue_fence_wait(&prog->base.cache_fence); if (prog->base.layout) VKSCR(DestroyPipelineLayout)(screen->dev, prog->base.layout, NULL); @@ -702,6 +703,7 @@ zink_destroy_compute_program(struct zink_context *ctx, struct zink_compute_program *comp) { struct zink_screen *screen = zink_screen(ctx->base.screen); + util_queue_fence_wait(&comp->base.cache_fence); if (comp->base.layout) VKSCR(DestroyPipelineLayout)(screen->dev, comp->base.layout, NULL);