radeonsi: remove the cache_flush atom

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

diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index 5041761b1cbb221cb85609e38b50b656cd75a09e..f43c616b2721887010f85144b8191b6b635fa497 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -474,7 +474,7 @@ static void si_launch_grid(
                si_initialize_compute(sctx);
 
        if (sctx->b.flags)
-               si_emit_cache_flush(sctx, NULL);
+               si_emit_cache_flush(sctx);
 
        if (!si_switch_compute_shader(sctx, program, &program->shader, info->pc))
                return;

diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c
index 7d4edc046cd220860cc8e23ceec83ef08f87e9d7..08d3dfe67e9e4d1b4a4c8303624c5eafe7d3301e 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_cp_dma.c
+++ b/src/gallium/drivers/radeonsi/si_cp_dma.c
@@ -170,7 +170,7 @@ static void si_cp_dma_prepare(struct si_context *sctx, struct pipe_resource *dst
         * Also wait for the previous CP DMA operations.
         */
        if (sctx->b.flags) {
-               si_emit_cache_flush(sctx, NULL);
+               si_emit_cache_flush(sctx);
                *flags |= SI_CP_DMA_RAW_WAIT;
        }
 

diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c
index 24b036048905faea6a5746b4d9c64f205f552486..67e83524ec0564874ffa15370d508d5992732f1a 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_hw_context.c
+++ b/src/gallium/drivers/radeonsi/si_hw_context.c
@@ -115,7 +115,7 @@ void si_context_gfx_flush(void *context, unsigned flags,
                ctx->b.flags |= SI_CONTEXT_INV_GLOBAL_L2 |
                                SI_CONTEXT_INV_VMEM_L1;
 
-       si_emit_cache_flush(ctx, NULL);
+       si_emit_cache_flush(ctx);
 
        if (ctx->trace_buf)
                si_trace_emit(ctx);

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index a648d868225401ce9271bfc67856c9402a5e5b31..1080e7270b7a9d38cc5d2013468945f011677b15 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -229,7 +229,6 @@ struct si_context {
        union si_state                  emitted;
 
        /* Atom declarations. */
-       struct r600_atom                cache_flush;
        struct si_framebuffer           framebuffer;
        struct si_sample_locs           msaa_sample_locs;
        struct r600_atom                db_render_state;

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 0d3de9ab31abdd3a2a30ae92181413c78b62458d..1703e42e9b2425db51f4e56796465eac512ab53a 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3441,7 +3441,6 @@ void si_init_state_functions(struct si_context *sctx)
        si_init_external_atom(sctx, &sctx->b.scissors.atom, &sctx->atoms.s.scissors);
        si_init_external_atom(sctx, &sctx->b.viewports.atom, &sctx->atoms.s.viewports);
 
-       si_init_atom(sctx, &sctx->cache_flush, &sctx->atoms.s.cache_flush, si_emit_cache_flush);
        si_init_atom(sctx, &sctx->framebuffer.atom, &sctx->atoms.s.framebuffer, si_emit_framebuffer_state);
        si_init_atom(sctx, &sctx->msaa_sample_locs.atom, &sctx->atoms.s.msaa_sample_locs, si_emit_msaa_sample_locs);
        si_init_atom(sctx, &sctx->db_render_state, &sctx->atoms.s.db_render_state, si_emit_db_render_state);

diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index d0e519c499477100bff0bd1560d50e0ad448ec84..e83b42843009e8d0e5acd8e877deb4735db1d0a5 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -124,7 +124,6 @@ union si_state {
 union si_state_atoms {
        struct {
                /* The order matters. */
-               struct r600_atom *cache_flush;
                struct r600_atom *render_cond;
                struct r600_atom *streamout_begin;
                struct r600_atom *streamout_enable; /* must be after streamout_begin */
@@ -343,7 +342,7 @@ void si_destroy_shader_cache(struct si_screen *sscreen);
 void si_init_shader_selector_async(void *job, int thread_index);
 
 /* si_state_draw.c */
-void si_emit_cache_flush(struct si_context *sctx, struct r600_atom *atom);
+void si_emit_cache_flush(struct si_context *sctx);
 void si_ce_pre_draw_synchronization(struct si_context *sctx);
 void si_ce_post_draw_synchronization(struct si_context *sctx);
 void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *dinfo);

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index d7325ff37d2c7ef6247b891bff273feb9450b6d4..d3e6e1ac93762ee596fbb96b3e5e13bb46199173 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -706,7 +706,7 @@ static void si_emit_draw_packets(struct si_context *sctx,
        }
 }
 
-void si_emit_cache_flush(struct si_context *sctx, struct r600_atom *atom)
+void si_emit_cache_flush(struct si_context *sctx)
 {
        struct r600_common_context *rctx = &sctx->b;
        struct radeon_winsys_cs *cs = rctx->gfx.cs;
@@ -1029,10 +1029,6 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
                r600_resource(info->indirect_params)->TC_L2_dirty = false;
        }
 
-       /* Check flush flags. */
-       if (sctx->b.flags)
-               si_mark_atom_dirty(sctx, sctx->atoms.s.cache_flush);
-
        /* Add buffer sizes for memory checking in need_cs_space. */
        if (sctx->emit_scratch_reloc && sctx->scratch_buffer)
                r600_context_add_resource_size(ctx, &sctx->scratch_buffer->b.b);
@@ -1048,6 +1044,10 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
        if (!si_upload_vertex_buffer_descriptors(sctx))
                return;
 
+       /* Flushed caches prior to emitting states. */
+       if (sctx->b.flags)
+               si_emit_cache_flush(sctx);
+
        /* Emit states. */
        mask = sctx->dirty_atoms;
        while (mask) {