From: Marek Olšák Date: Tue, 16 Jun 2020 17:56:10 +0000 (-0400) Subject: radeonsi: don't add the tess ring buffers into the cs_preamble state X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=428360662f300c44729dada9cd57c5b9a04befe8;p=mesa.git radeonsi: don't add the tess ring buffers into the cs_preamble state Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- diff --git a/src/gallium/drivers/radeonsi/si_gfx_cs.c b/src/gallium/drivers/radeonsi/si_gfx_cs.c index 2e7b34e3a09..188bda0858c 100644 --- a/src/gallium/drivers/radeonsi/si_gfx_cs.c +++ b/src/gallium/drivers/radeonsi/si_gfx_cs.c @@ -415,6 +415,11 @@ void si_begin_new_gfx_cs(struct si_context *ctx) return; } + if (ctx->tess_rings) { + radeon_add_to_buffer_list(ctx, ctx->gfx_cs, si_resource(ctx->tess_rings), + RADEON_USAGE_READWRITE, RADEON_PRIO_SHADER_RINGS); + } + /* set all valid group as dirty so they get reemited on * next draw command */ diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 396737bd2c2..cee13524edc 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -3640,9 +3640,6 @@ static void si_init_tess_factor_ring(struct si_context *sctx) si_cs_preamble_add_vgt_flush(sctx); - si_pm4_add_bo(sctx->cs_preamble_state, si_resource(sctx->tess_rings), RADEON_USAGE_READWRITE, - RADEON_PRIO_SHADER_RINGS); - uint64_t factor_va = si_resource(sctx->tess_rings)->gpu_address + sctx->screen->tess_offchip_ring_size;