gallium/radeon: remove the IB flushing flag

Not needed anymore. A similar flag will be introduced in the next commit,
which will be private in radeonsi.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index cf8a07f5a1a7837b6a1609dcff438898a169de75..1cffc34a5a0ad25927daa952aff76b4f30a2353d 100644 (file)
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -256,8 +256,6 @@ void r600_context_gfx_flush(void *context, unsigned flags,
        if (cs->cdw == ctx->b.initial_gfx_cs_size && !fence)
                return;
 
-       ctx->b.rings.gfx.flushing = true;
-
        r600_preflush_suspend_features(&ctx->b);
 
        /* flush the framebuffer cache */
@@ -283,7 +281,6 @@ void r600_context_gfx_flush(void *context, unsigned flags,
 
        /* Flush the CS. */
        ctx->b.ws->cs_flush(cs, flags, fence, ctx->screen->b.cs_count++);
-       ctx->b.rings.gfx.flushing = false;
 
        r600_begin_new_cs(ctx);
 }

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index e7179dc0a463b20f0e865fdea27a4d319795c0e2..daa325dae0453f0254943801723e98dbcb12b319 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -221,13 +221,8 @@ static void r600_flush_dma_ring(void *ctx, unsigned flags,
        struct r600_common_context *rctx = (struct r600_common_context *)ctx;
        struct radeon_winsys_cs *cs = rctx->rings.dma.cs;
 
-       if (!cs->cdw)
-               goto done;
-
-       rctx->rings.dma.flushing = true;
-       rctx->ws->cs_flush(cs, flags, &rctx->last_sdma_fence, 0);
-       rctx->rings.dma.flushing = false;
-done:
+       if (cs->cdw)
+               rctx->ws->cs_flush(cs, flags, &rctx->last_sdma_fence, 0);
        if (fence)
                rctx->ws->fence_reference(fence, rctx->last_sdma_fence);
 }

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index b7f1a234baf3217676e23540bb718904dcbe4066..9fae5c8da26c800607f91fc24d9777dcd82d991d 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -365,7 +365,6 @@ struct r600_streamout {
 
 struct r600_ring {
        struct radeon_winsys_cs         *cs;
-       bool                            flushing;
        void (*flush)(void *ctx, unsigned flags,
                      struct pipe_fence_handle **fence);
 };

diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c
index 7d0e6d4dd45eb93e29e1640e9889197de8a909c5..8eade11078c325656ddcba9ec5692e8ed6c1411f 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_hw_context.c
+++ b/src/gallium/drivers/radeonsi/si_hw_context.c
@@ -73,8 +73,6 @@ void si_context_gfx_flush(void *context, unsigned flags,
                return;
        }
 
-       ctx->b.rings.gfx.flushing = true;
-
        r600_preflush_suspend_features(&ctx->b);
 
        ctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_FRAMEBUFFER |
@@ -116,7 +114,6 @@ void si_context_gfx_flush(void *context, unsigned flags,
        /* Flush the CS. */
        ws->cs_flush(cs, flags, &ctx->last_gfx_fence,
                     ctx->screen->b.cs_count++);
-       ctx->b.rings.gfx.flushing = false;
 
        if (fence)
                ws->fence_reference(fence, ctx->last_gfx_fence);