From a917c1f0bf005ce1c022b526bdfd661f8fce1826 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 10 Feb 2025 14:38:03 -0500 Subject: [PATCH] zink: never try to oom flush during unsync texture upload this is very broken cc: mesa-stable Part-of: (cherry picked from commit 52dfe1e955101163eab10de462f0b71fe5999804) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_context.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 23ee0914434..f65dc34a0ae 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -144,7 +144,7 @@ "description": "zink: never try to oom flush during unsync texture upload", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index d51e1891131..ee441813021 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -4839,7 +4839,7 @@ zink_copy_image_buffer(struct zink_context *ctx, struct zink_resource *dst, stru zink_kopper_present_readback(ctx, img); } - if (ctx->oom_flush && !ctx->in_rp && !ctx->unordered_blitting) + if (ctx->oom_flush && !ctx->in_rp && !ctx->unordered_blitting && !unsync) flush_batch(ctx, false); }