Mesa (main): Revert "zink: call tc_driver_internal_flush_notify() on flush"

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 9ff54d408ba872da44158869f363f73cddbb0f63
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ff54d408ba872da44158869f363f73cddbb0f63

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May 28 23:01:12 2021 -0400

Revert "zink: call tc_driver_internal_flush_notify() on flush"

This reverts commit 4d62fca0877104080d4dee8656d09c67e93c8d0e.

this is broken beyond space and time but only reveals its true nature
when used outside of a unit test

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11080>

---

 src/gallium/drivers/zink/zink_batch.c   | 2 --
 src/gallium/drivers/zink/zink_context.c | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c
index 63afd8ddd62..846a91f5424 100644
--- a/src/gallium/drivers/zink/zink_batch.c
+++ b/src/gallium/drivers/zink/zink_batch.c
@@ -486,8 +486,6 @@ zink_end_batch(struct zink_context *ctx, struct zink_batch *batch)
    if (!ctx->queries_disabled)
       zink_suspend_queries(ctx, batch);
 
-   tc_driver_internal_flush_notify(ctx->tc);
-
    if (vkEndCommandBuffer(batch->state->cmdbuf) != VK_SUCCESS) {
       debug_printf("vkEndCommandBuffer failed\n");
       return;
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 1b8d49d32be..af39ca21c10 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -2287,7 +2287,6 @@ zink_flush(struct pipe_context *pctx,
                 check_device_lost(ctx);
           }
        }
-       tc_driver_internal_flush_notify(ctx->tc);
    } else {
       fence = &batch->state->fence;
       if (deferred && !(flags & PIPE_FLUSH_FENCE_FD) && pfence)
@@ -3352,7 +3351,7 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags)
    struct threaded_context *tc = (struct threaded_context*)threaded_context_create(&ctx->base, &screen->transfer_pool,
                                                      zink_context_replace_buffer_storage,
                                                      zink_create_tc_fence_for_tc,
-                                                     zink_context_is_resource_busy, true, &ctx->tc);
+                                                     zink_context_is_resource_busy, false, &ctx->tc);
 
    if (tc && (struct zink_context*)tc != ctx) {
       tc->bytes_mapped_limit = screen->total_mem / 4;