From 4e5006202810ae3450a28372a2bf79663e1b6066 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 22 Apr 2017 19:34:26 +0200 Subject: [PATCH] radeonsi: pass tessellation ring addresses via user SGPRs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This removes s_load_dword latency for tess rings. We need just 1 SGPR for the address if we use 64K alignment. The final asm for recreating the descriptor is: // s2 is (address >> 16) s_mov_b32 s3, 0 s_lshl_b64 s[4:5], s[2:3], 16 s_mov_b32 s6, -1 s_mov_b32 s7, 0x27fac v2: bitcast the descriptor type from v2i64 to v4i32 Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_pm4.h | 2 +- src/gallium/drivers/radeonsi/si_shader.c | 103 +++++++++++------- src/gallium/drivers/radeonsi/si_shader.h | 5 + .../drivers/radeonsi/si_shader_internal.h | 2 + src/gallium/drivers/radeonsi/si_state.h | 3 - src/gallium/drivers/radeonsi/si_state_draw.c | 3 +- .../drivers/radeonsi/si_state_shaders.c | 50 +++++++-- 7 files changed, 112 insertions(+), 56 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pm4.h b/src/gallium/drivers/radeonsi/si_pm4.h index 106abe1ec7d..189c4819a55 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.h +++ b/src/gallium/drivers/radeonsi/si_pm4.h @@ -30,7 +30,7 @@ #include "radeon/radeon_winsys.h" #define SI_PM4_MAX_DW 176 -#define SI_PM4_MAX_BO 1 +#define SI_PM4_MAX_BO 3 // forward defines struct si_context; diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 9af3106aae9..f917cf50522 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -912,6 +912,30 @@ static void lds_store(struct lp_build_tgsi_context *bld_base, dw_addr, value); } +static LLVMValueRef desc_from_addr_base64k(struct si_shader_context *ctx, + unsigned param) +{ + LLVMBuilderRef builder = ctx->gallivm.builder; + + LLVMValueRef addr = LLVMGetParam(ctx->main_fn, param); + addr = LLVMBuildZExt(builder, addr, ctx->i64, ""); + addr = LLVMBuildShl(builder, addr, LLVMConstInt(ctx->i64, 16, 0), ""); + + uint64_t desc2 = 0xffffffff; + uint64_t desc3 = S_008F0C_DST_SEL_X(V_008F0C_SQ_SEL_X) | + S_008F0C_DST_SEL_Y(V_008F0C_SQ_SEL_Y) | + S_008F0C_DST_SEL_Z(V_008F0C_SQ_SEL_Z) | + S_008F0C_DST_SEL_W(V_008F0C_SQ_SEL_W) | + S_008F0C_NUM_FORMAT(V_008F0C_BUF_NUM_FORMAT_FLOAT) | + S_008F0C_DATA_FORMAT(V_008F0C_BUF_DATA_FORMAT_32); + LLVMValueRef hi = LLVMConstInt(ctx->i64, desc2 | (desc3 << 32), 0); + + LLVMValueRef desc = LLVMGetUndef(LLVMVectorType(ctx->i64, 2)); + desc = LLVMBuildInsertElement(builder, desc, addr, ctx->i32_0, ""); + desc = LLVMBuildInsertElement(builder, desc, hi, ctx->i32_1, ""); + return LLVMBuildBitCast(builder, desc, ctx->v4i32, ""); +} + static LLVMValueRef fetch_input_tcs( struct lp_build_tgsi_context *bld_base, const struct tgsi_full_src_register *reg, @@ -953,12 +977,9 @@ static LLVMValueRef fetch_input_tes( enum tgsi_opcode_type type, unsigned swizzle) { struct si_shader_context *ctx = si_shader_context(bld_base); - LLVMValueRef rw_buffers, buffer, base, addr; + LLVMValueRef buffer, base, addr; - rw_buffers = LLVMGetParam(ctx->main_fn, - ctx->param_rw_buffers); - buffer = ac_build_indexed_load_const(&ctx->ac, rw_buffers, - LLVMConstInt(ctx->i32, SI_HS_RING_TESS_OFFCHIP, 0)); + buffer = desc_from_addr_base64k(ctx, ctx->param_tcs_offchip_addr_base64k); base = LLVMGetParam(ctx->main_fn, ctx->param_tcs_offchip_offset); addr = get_tcs_tes_buffer_address_from_reg(ctx, NULL, reg); @@ -977,7 +998,7 @@ static void store_output_tcs(struct lp_build_tgsi_context *bld_base, const struct tgsi_shader_info *sh_info = &ctx->shader->selector->info; unsigned chan_index; LLVMValueRef dw_addr, stride; - LLVMValueRef rw_buffers, buffer, base, buf_addr; + LLVMValueRef buffer, base, buf_addr; LLVMValueRef values[4]; bool skip_lds_store; bool is_tess_factor = false; @@ -1013,10 +1034,7 @@ static void store_output_tcs(struct lp_build_tgsi_context *bld_base, } } - rw_buffers = LLVMGetParam(ctx->main_fn, - ctx->param_rw_buffers); - buffer = ac_build_indexed_load_const(&ctx->ac, rw_buffers, - LLVMConstInt(ctx->i32, SI_HS_RING_TESS_OFFCHIP, 0)); + buffer = desc_from_addr_base64k(ctx, ctx->param_tcs_offchip_addr_base64k); base = LLVMGetParam(ctx->main_fn, ctx->param_tcs_offchip_offset); buf_addr = get_tcs_tes_buffer_address_from_reg(ctx, reg, NULL); @@ -1536,13 +1554,10 @@ static void declare_system_value(struct si_shader_context *ctx, case TGSI_SEMANTIC_TESSINNER: case TGSI_SEMANTIC_TESSOUTER: { - LLVMValueRef rw_buffers, buffer, base, addr; + LLVMValueRef buffer, base, addr; int param = si_shader_io_get_unique_index(decl->Semantic.Name, 0); - rw_buffers = LLVMGetParam(ctx->main_fn, - ctx->param_rw_buffers); - buffer = ac_build_indexed_load_const(&ctx->ac, rw_buffers, - LLVMConstInt(ctx->i32, SI_HS_RING_TESS_OFFCHIP, 0)); + buffer = desc_from_addr_base64k(ctx, ctx->param_tcs_offchip_addr_base64k); base = LLVMGetParam(ctx->main_fn, ctx->param_tcs_offchip_offset); addr = get_tcs_tes_buffer_address(ctx, get_rel_patch_id(ctx), NULL, @@ -2432,16 +2447,12 @@ static void si_copy_tcs_inputs(struct lp_build_tgsi_context *bld_base) { struct si_shader_context *ctx = si_shader_context(bld_base); struct gallivm_state *gallivm = &ctx->gallivm; - LLVMValueRef invocation_id, rw_buffers, buffer, buffer_offset; + LLVMValueRef invocation_id, buffer, buffer_offset; LLVMValueRef lds_vertex_stride, lds_vertex_offset, lds_base; uint64_t inputs; invocation_id = unpack_param(ctx, ctx->param_tcs_rel_ids, 8, 5); - - rw_buffers = LLVMGetParam(ctx->main_fn, ctx->param_rw_buffers); - buffer = ac_build_indexed_load_const(&ctx->ac, rw_buffers, - LLVMConstInt(ctx->i32, SI_HS_RING_TESS_OFFCHIP, 0)); - + buffer = desc_from_addr_base64k(ctx, ctx->param_tcs_offchip_addr_base64k); buffer_offset = LLVMGetParam(ctx->main_fn, ctx->param_tcs_offchip_offset); lds_vertex_stride = unpack_param(ctx, ctx->param_vs_state_bits, 24, 8); @@ -2481,7 +2492,7 @@ static void si_write_tess_factors(struct lp_build_tgsi_context *bld_base, struct si_shader *shader = ctx->shader; unsigned tess_inner_index, tess_outer_index; LLVMValueRef lds_base, lds_inner, lds_outer, byteoffset, buffer; - LLVMValueRef out[6], vec0, vec1, rw_buffers, tf_base, inner[4], outer[4]; + LLVMValueRef out[6], vec0, vec1, tf_base, inner[4], outer[4]; unsigned stride, outer_comps, inner_comps, i, offset; struct lp_build_if_state if_ctx, inner_if_ctx; @@ -2563,10 +2574,7 @@ static void si_write_tess_factors(struct lp_build_tgsi_context *bld_base, vec1 = lp_build_gather_values(gallivm, out+4, stride - 4); /* Get the buffer. */ - rw_buffers = LLVMGetParam(ctx->main_fn, - ctx->param_rw_buffers); - buffer = ac_build_indexed_load_const(&ctx->ac, rw_buffers, - LLVMConstInt(ctx->i32, SI_HS_RING_TESS_FACTOR, 0)); + buffer = desc_from_addr_base64k(ctx, ctx->param_tcs_factor_addr_base64k); /* Get the offset. */ tf_base = LLVMGetParam(ctx->main_fn, @@ -2606,8 +2614,7 @@ static void si_write_tess_factors(struct lp_build_tgsi_context *bld_base, LLVMValueRef tf_inner_offset; unsigned param_outer, param_inner; - buf = ac_build_indexed_load_const(&ctx->ac, rw_buffers, - LLVMConstInt(ctx->i32, SI_HS_RING_TESS_OFFCHIP, 0)); + buf = desc_from_addr_base64k(ctx, ctx->param_tcs_offchip_addr_base64k); base = LLVMGetParam(ctx->main_fn, ctx->param_tcs_offchip_offset); param_outer = si_shader_io_get_unique_index( @@ -2692,19 +2699,24 @@ static void si_llvm_emit_tcs_epilogue(struct lp_build_tgsi_context *bld_base) LLVMValueRef ret = ctx->return_value; unsigned vgpr; - ret = si_insert_input_ptr_as_2xi32(ctx, ret, - ctx->param_rw_buffers, 0); - if (ctx->screen->b.chip_class >= GFX9) { ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_offchip_layout, 8 + GFX9_SGPR_TCS_OFFCHIP_LAYOUT); + ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_offchip_addr_base64k, + 8 + GFX9_SGPR_TCS_OFFCHIP_ADDR_BASE64K); + ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_factor_addr_base64k, + 8 + GFX9_SGPR_TCS_FACTOR_ADDR_BASE64K); /* Tess offchip and tess factor offsets are at the beginning. */ ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_offchip_offset, 2); ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_factor_offset, 4); - vgpr = 8 + GFX9_SGPR_TCS_OFFCHIP_LAYOUT + 1; + vgpr = 8 + GFX9_SGPR_TCS_FACTOR_ADDR_BASE64K + 1; } else { ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_offchip_layout, GFX6_SGPR_TCS_OFFCHIP_LAYOUT); + ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_offchip_addr_base64k, + GFX6_SGPR_TCS_OFFCHIP_ADDR_BASE64K); + ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_factor_addr_base64k, + GFX6_SGPR_TCS_FACTOR_ADDR_BASE64K); /* Tess offchip and tess factor offsets are after user SGPRs. */ ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_offchip_offset, GFX6_TCS_NUM_USER_SGPR); @@ -2743,8 +2755,12 @@ static void si_set_ls_return_value_for_tcs(struct si_shader_context *ctx) 8 + GFX9_SGPR_TCS_OUT_OFFSETS); ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_out_lds_layout, 8 + GFX9_SGPR_TCS_OUT_LAYOUT); + ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_offchip_addr_base64k, + 8 + GFX9_SGPR_TCS_OFFCHIP_ADDR_BASE64K); + ret = si_insert_input_ret(ctx, ret, ctx->param_tcs_factor_addr_base64k, + 8 + GFX9_SGPR_TCS_FACTOR_ADDR_BASE64K); - unsigned desc_param = ctx->param_tcs_out_lds_layout + 2; + unsigned desc_param = ctx->param_tcs_factor_addr_base64k + 2; ret = si_insert_input_ptr_as_2xi32(ctx, ret, desc_param, 8 + GFX9_SGPR_TCS_CONST_BUFFERS); ret = si_insert_input_ptr_as_2xi32(ctx, ret, desc_param + 1, @@ -5922,6 +5938,8 @@ static void create_function(struct si_shader_context *ctx) params[ctx->param_tcs_out_lds_offsets = num_params++] = ctx->i32; params[ctx->param_tcs_out_lds_layout = num_params++] = ctx->i32; params[ctx->param_vs_state_bits = num_params++] = ctx->i32; + params[ctx->param_tcs_offchip_addr_base64k = num_params++] = ctx->i32; + params[ctx->param_tcs_factor_addr_base64k = num_params++] = ctx->i32; params[ctx->param_tcs_offchip_offset = num_params++] = ctx->i32; params[ctx->param_tcs_factor_offset = num_params++] = ctx->i32; last_sgpr = num_params - 1; @@ -5959,6 +5977,8 @@ static void create_function(struct si_shader_context *ctx) params[ctx->param_tcs_offchip_layout = num_params++] = ctx->i32; params[ctx->param_tcs_out_lds_offsets = num_params++] = ctx->i32; params[ctx->param_tcs_out_lds_layout = num_params++] = ctx->i32; + params[ctx->param_tcs_offchip_addr_base64k = num_params++] = ctx->i32; + params[ctx->param_tcs_factor_addr_base64k = num_params++] = ctx->i32; params[num_params++] = ctx->i32; /* unused */ declare_per_stage_desc_pointers(ctx, params, &num_params, @@ -5985,7 +6005,7 @@ static void create_function(struct si_shader_context *ctx) * param_tcs_offchip_layout, and param_rw_buffers * should be passed to the epilog. */ - for (i = 0; i <= 8 + GFX9_SGPR_TCS_OFFCHIP_LAYOUT; i++) + for (i = 0; i <= 8 + GFX9_SGPR_TCS_FACTOR_ADDR_BASE64K; i++) returns[num_returns++] = ctx->i32; /* SGPRs */ for (i = 0; i < 3; i++) returns[num_returns++] = ctx->f32; /* VGPRs */ @@ -6014,7 +6034,7 @@ static void create_function(struct si_shader_context *ctx) /* TESS_EVAL (and also GEOMETRY): * Declare as many input SGPRs as the VS has. */ params[ctx->param_tcs_offchip_layout = num_params++] = ctx->i32; - params[num_params++] = ctx->i32; /* unused */ + params[ctx->param_tcs_offchip_addr_base64k = num_params++] = ctx->i32; params[num_params++] = ctx->i32; /* unused */ params[num_params++] = ctx->i32; /* unused */ params[num_params++] = ctx->i32; /* unused */ @@ -6052,6 +6072,7 @@ static void create_function(struct si_shader_context *ctx) case PIPE_SHADER_TESS_EVAL: declare_default_desc_pointers(ctx, params, &num_params); params[ctx->param_tcs_offchip_layout = num_params++] = ctx->i32; + params[ctx->param_tcs_offchip_addr_base64k = num_params++] = ctx->i32; if (shader->key.as_es) { params[ctx->param_tcs_offchip_offset = num_params++] = ctx->i32; @@ -8449,11 +8470,8 @@ static void si_build_tcs_epilog_function(struct si_shader_context *ctx, LLVMValueRef func; int last_sgpr, num_params = 0; - /* Declare inputs. Only RW_BUFFERS and TESS_FACTOR_OFFSET are used. */ - params[ctx->param_rw_buffers = num_params++] = - const_array(ctx->v16i8, SI_NUM_RW_BUFFERS); - if (ctx->screen->b.chip_class >= GFX9) { + params[num_params++] = ctx->i64; params[ctx->param_tcs_offchip_offset = num_params++] = ctx->i32; params[num_params++] = ctx->i32; /* wave info */ params[ctx->param_tcs_factor_offset = num_params++] = ctx->i32; @@ -8471,15 +8489,22 @@ static void si_build_tcs_epilog_function(struct si_shader_context *ctx, params[num_params++] = ctx->i32; params[num_params++] = ctx->i32; params[ctx->param_tcs_offchip_layout = num_params++] = ctx->i32; + params[num_params++] = ctx->i32; + params[num_params++] = ctx->i32; + params[ctx->param_tcs_offchip_addr_base64k = num_params++] = ctx->i32; + params[ctx->param_tcs_factor_addr_base64k = num_params++] = ctx->i32; } else { params[num_params++] = ctx->i64; params[num_params++] = ctx->i64; params[num_params++] = ctx->i64; params[num_params++] = ctx->i64; + params[num_params++] = ctx->i64; params[ctx->param_tcs_offchip_layout = num_params++] = ctx->i32; params[num_params++] = ctx->i32; params[num_params++] = ctx->i32; params[num_params++] = ctx->i32; + params[ctx->param_tcs_offchip_addr_base64k = num_params++] = ctx->i32; + params[ctx->param_tcs_factor_addr_base64k = num_params++] = ctx->i32; params[ctx->param_tcs_offchip_offset = num_params++] = ctx->i32; params[ctx->param_tcs_factor_offset = num_params++] = ctx->i32; } diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index ad50df92327..8c098ac60a5 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -173,6 +173,7 @@ enum { /* TES */ SI_SGPR_TES_OFFCHIP_LAYOUT = SI_NUM_RESOURCE_SGPRS, + SI_SGPR_TES_OFFCHIP_ADDR_BASE64K, SI_TES_NUM_USER_SGPR, /* GFX6-8: TCS only */ @@ -180,12 +181,16 @@ enum { GFX6_SGPR_TCS_OUT_OFFSETS, GFX6_SGPR_TCS_OUT_LAYOUT, GFX6_SGPR_TCS_IN_LAYOUT, + GFX6_SGPR_TCS_OFFCHIP_ADDR_BASE64K, + GFX6_SGPR_TCS_FACTOR_ADDR_BASE64K, GFX6_TCS_NUM_USER_SGPR, /* GFX9: Merged LS-HS (VS-TCS) only. */ GFX9_SGPR_TCS_OFFCHIP_LAYOUT = SI_VS_NUM_USER_SGPR, GFX9_SGPR_TCS_OUT_OFFSETS, GFX9_SGPR_TCS_OUT_LAYOUT, + GFX9_SGPR_TCS_OFFCHIP_ADDR_BASE64K, + GFX9_SGPR_TCS_FACTOR_ADDR_BASE64K, GFX9_SGPR_unused_to_align_the_next_pointer, GFX9_SGPR_TCS_CONST_BUFFERS, GFX9_SGPR_TCS_CONST_BUFFERS_HI, diff --git a/src/gallium/drivers/radeonsi/si_shader_internal.h b/src/gallium/drivers/radeonsi/si_shader_internal.h index 233a96f8e0a..8a9bf109af7 100644 --- a/src/gallium/drivers/radeonsi/si_shader_internal.h +++ b/src/gallium/drivers/radeonsi/si_shader_internal.h @@ -162,6 +162,8 @@ struct si_shader_context { * [26:31] = gl_PatchVerticesIn, max = 32 */ int param_tcs_out_lds_layout; + int param_tcs_offchip_addr_base64k; + int param_tcs_factor_addr_base64k; int param_tcs_offchip_offset; int param_tcs_factor_offset; int param_tcs_patch_id; diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index 6257299fc3a..629d614f7fc 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -164,9 +164,6 @@ struct si_shader_data { /* Private read-write buffer slots. */ enum { - SI_HS_RING_TESS_FACTOR, - SI_HS_RING_TESS_OFFCHIP, - SI_ES_RING_ESGS, SI_GS_RING_ESGS, diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 393f64f372f..6a756c4bc5b 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -267,8 +267,9 @@ static void si_emit_derived_tess_state(struct si_context *sctx, } /* Set userdata SGPRs for TES. */ - radeon_set_sh_reg_seq(cs, tes_sh_base + SI_SGPR_TES_OFFCHIP_LAYOUT * 4, 1); + radeon_set_sh_reg_seq(cs, tes_sh_base + SI_SGPR_TES_OFFCHIP_LAYOUT * 4, 2); radeon_emit(cs, offchip_layout); + radeon_emit(cs, r600_resource(sctx->tess_offchip_ring)->gpu_address >> 16); ls_hs_config = S_028B58_NUM_PATCHES(*num_patches) | S_028B58_HS_NUM_INPUT_CP(num_tcs_input_cp) | diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 2150eb9896c..e4794220913 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -2766,11 +2766,14 @@ static void si_init_tess_factor_ring(struct si_context *sctx) } assert(!sctx->tf_ring); + /* Use 64K alignment for both rings, so that we can pass the address + * to shaders as one SGPR containing bits [16:47]. + */ sctx->tf_ring = r600_aligned_buffer_create(sctx->b.b.screen, R600_RESOURCE_FLAG_UNMAPPABLE, PIPE_USAGE_DEFAULT, 32768 * sctx->screen->b.info.max_se, - 256); + 64 * 1024); if (!sctx->tf_ring) return; @@ -2782,12 +2785,22 @@ static void si_init_tess_factor_ring(struct si_context *sctx) PIPE_USAGE_DEFAULT, max_offchip_buffers * sctx->screen->tess_offchip_block_dw_size * 4, - 256); + 64 * 1024); if (!sctx->tess_offchip_ring) return; si_init_config_add_vgt_flush(sctx); + uint64_t offchip_va = r600_resource(sctx->tess_offchip_ring)->gpu_address; + uint64_t factor_va = r600_resource(sctx->tf_ring)->gpu_address; + assert((offchip_va & 0xffff) == 0); + assert((factor_va & 0xffff) == 0); + + si_pm4_add_bo(sctx->init_config, r600_resource(sctx->tess_offchip_ring), + RADEON_USAGE_READWRITE, RADEON_PRIO_SHADER_RINGS); + si_pm4_add_bo(sctx->init_config, r600_resource(sctx->tf_ring), + RADEON_USAGE_READWRITE, RADEON_PRIO_SHADER_RINGS); + /* Append these registers to the init config state. */ if (sctx->b.chip_class >= CIK) { if (sctx->b.chip_class >= VI) @@ -2796,10 +2809,10 @@ static void si_init_tess_factor_ring(struct si_context *sctx) si_pm4_set_reg(sctx->init_config, R_030938_VGT_TF_RING_SIZE, S_030938_SIZE(sctx->tf_ring->width0 / 4)); si_pm4_set_reg(sctx->init_config, R_030940_VGT_TF_MEMORY_BASE, - r600_resource(sctx->tf_ring)->gpu_address >> 8); + factor_va >> 8); if (sctx->b.chip_class >= GFX9) si_pm4_set_reg(sctx->init_config, R_030944_VGT_TF_MEMORY_BASE_HI, - r600_resource(sctx->tf_ring)->gpu_address >> 40); + factor_va >> 40); si_pm4_set_reg(sctx->init_config, R_03093C_VGT_HS_OFFCHIP_PARAM, S_03093C_OFFCHIP_BUFFERING(max_offchip_buffers) | S_03093C_OFFCHIP_GRANULARITY(offchip_granularity)); @@ -2808,24 +2821,37 @@ static void si_init_tess_factor_ring(struct si_context *sctx) si_pm4_set_reg(sctx->init_config, R_008988_VGT_TF_RING_SIZE, S_008988_SIZE(sctx->tf_ring->width0 / 4)); si_pm4_set_reg(sctx->init_config, R_0089B8_VGT_TF_MEMORY_BASE, - r600_resource(sctx->tf_ring)->gpu_address >> 8); + factor_va >> 8); si_pm4_set_reg(sctx->init_config, R_0089B0_VGT_HS_OFFCHIP_PARAM, S_0089B0_OFFCHIP_BUFFERING(max_offchip_buffers)); } + if (sctx->b.chip_class >= GFX9) { + si_pm4_set_reg(sctx->init_config, + R_00B430_SPI_SHADER_USER_DATA_LS_0 + + GFX9_SGPR_TCS_OFFCHIP_ADDR_BASE64K * 4, + offchip_va >> 16); + si_pm4_set_reg(sctx->init_config, + R_00B430_SPI_SHADER_USER_DATA_LS_0 + + GFX9_SGPR_TCS_FACTOR_ADDR_BASE64K * 4, + factor_va >> 16); + } else { + si_pm4_set_reg(sctx->init_config, + R_00B430_SPI_SHADER_USER_DATA_HS_0 + + GFX6_SGPR_TCS_OFFCHIP_ADDR_BASE64K * 4, + offchip_va >> 16); + si_pm4_set_reg(sctx->init_config, + R_00B430_SPI_SHADER_USER_DATA_HS_0 + + GFX6_SGPR_TCS_FACTOR_ADDR_BASE64K * 4, + factor_va >> 16); + } + /* 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); - - si_set_ring_buffer(&sctx->b.b, SI_HS_RING_TESS_FACTOR, sctx->tf_ring, - 0, sctx->tf_ring->width0, false, false, 0, 0, 0); - - si_set_ring_buffer(&sctx->b.b, SI_HS_RING_TESS_OFFCHIP, - sctx->tess_offchip_ring, 0, - sctx->tess_offchip_ring->width0, false, false, 0, 0, 0); } /** -- 2.30.2