radeonsi: use an indirect buffer for init_config

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index e31895d6933887f8c451be809b71eb0e53a0b56c..1e2f32a87991a852a3bd3ffae6627560d228f5eb 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -3392,5 +3392,6 @@ static void si_init_config(struct si_context *sctx)
        si_pm4_add_bo(pm4, sctx->border_color_buffer, RADEON_USAGE_READ,
                      RADEON_PRIO_SHADER_DATA);
 
+       si_pm4_upload_indirect_buffer(sctx, pm4);
        sctx->init_config = pm4;
 }

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 78b68bc3dfe136ef5314b176b2e7edc57b98288b..db45cc181c60cb6b4995cd54503393f85e8a0e3a 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -1087,6 +1087,7 @@ static void si_init_gs_rings(struct si_context *sctx)
        /* Flush the context to re-emit the init_config state.
         * This is done only once in a lifetime of a context.
         */
+       si_pm4_upload_indirect_buffer(sctx, sctx->init_config);
        sctx->b.initial_gfx_cs_size = 0; /* force flush */
        si_context_gfx_flush(sctx, RADEON_FLUSH_ASYNC, NULL);
 
@@ -1288,6 +1289,7 @@ static void si_init_tess_factor_ring(struct si_context *sctx)
        /* Flush the context to re-emit the init_config state.
         * This is done only once in a lifetime of a context.
         */
+       si_pm4_upload_indirect_buffer(sctx, sctx->init_config);
        sctx->b.initial_gfx_cs_size = 0; /* force flush */
        si_context_gfx_flush(sctx, RADEON_FLUSH_ASYNC, NULL);