OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi/gfx11: rename si_calc_inst_pref_size -> si_get_shader_prefetch_size

Browse Source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17864>
This commit is contained in:
Marek Olšák
2022-07-10 23:50:38 -04:00
committed by Marge Bot
parent a791e7f37f
commit a09d971007
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_compute.c
View File

@@ -567,7 +567,7 @@ static bool si_switch_compute_shader(struct si_context *sctx, struct si_compute
if (sctx->gfx_level >= GFX11) {
radeon_set_sh_reg(R_00B8A0_COMPUTE_PGM_RSRC3,
S_00B8A0_INST_PREF_SIZE(si_calc_inst_pref_size(shader)));
S_00B8A0_INST_PREF_SIZE(si_get_shader_prefetch_size(shader)));
}
if (sctx->gfx_level >= GFX11 && shader->scratch_bo) {

2
src/gallium/drivers/radeonsi/si_state.h
View File

@@ -597,7 +597,7 @@ void si_ps_key_update_framebuffer_rasterizer_sample_shading(struct si_context *s
void si_init_tess_factor_ring(struct si_context *sctx);
bool si_update_gs_ring_buffers(struct si_context *sctx);
bool si_update_spi_tmpring_size(struct si_context *sctx, unsigned bytes);
unsigned si_calc_inst_pref_size(struct si_shader *shader);
unsigned si_get_shader_prefetch_size(struct si_shader *shader);
bool si_set_tcs_to_fixed_func_shader(struct si_context *sctx);
/* si_state_draw.cpp */

8
src/gallium/drivers/radeonsi/si_state_shaders.cpp
View File

@@ -666,7 +666,7 @@ static unsigned si_get_vs_vgpr_comp_cnt(struct si_screen *sscreen, struct si_sha
return max;
}
unsigned si_calc_inst_pref_size(struct si_shader *shader)
unsigned si_get_shader_prefetch_size(struct si_shader *shader)
{
/* TODO: Disable for now. */
if (shader->selector->screen->info.gfx_level == GFX11)
@@ -714,7 +714,7 @@ static void si_shader_hs(struct si_screen *sscreen, struct si_shader *shader)
if (sscreen->info.gfx_level >= GFX9) {
if (sscreen->info.gfx_level >= GFX11) {
ac_set_reg_cu_en(pm4, R_00B404_SPI_SHADER_PGM_RSRC4_HS,
S_00B404_INST_PREF_SIZE(si_calc_inst_pref_size(shader)) |
S_00B404_INST_PREF_SIZE(si_get_shader_prefetch_size(shader)) |
S_00B404_CU_EN(0xffff),
C_00B404_CU_EN, 16, &sscreen->info,
(void (*)(void*, unsigned, uint32_t))si_pm4_set_reg_idx3);
@@ -1436,7 +1436,7 @@ static void gfx10_shader_ngg(struct si_screen *sscreen, struct si_shader *shader
if (sscreen->info.gfx_level >= GFX11) {
shader->ctx_reg.ngg.spi_shader_pgm_rsrc4_gs =
S_00B204_CU_EN_GFX11(0x1) | S_00B204_SPI_SHADER_LATE_ALLOC_GS_GFX10(late_alloc_wave64) |
S_00B204_INST_PREF_SIZE(si_calc_inst_pref_size(shader));
S_00B204_INST_PREF_SIZE(si_get_shader_prefetch_size(shader));
} else {
shader->ctx_reg.ngg.spi_shader_pgm_rsrc4_gs =
S_00B204_CU_EN_GFX10(0xffff) | S_00B204_SPI_SHADER_LATE_ALLOC_GS_GFX10(late_alloc_wave64);
@@ -2023,7 +2023,7 @@ static void si_shader_ps(struct si_screen *sscreen, struct si_shader *shader)
unsigned cu_mask_ps = gfx103_get_cu_mask_ps(sscreen);
ac_set_reg_cu_en(pm4, R_00B004_SPI_SHADER_PGM_RSRC4_PS,
S_00B004_INST_PREF_SIZE(si_calc_inst_pref_size(shader)) |
S_00B004_INST_PREF_SIZE(si_get_shader_prefetch_size(shader)) |
S_00B004_CU_EN(cu_mask_ps >> 16),
C_00B004_CU_EN, 16, &sscreen->info,
(void (*)(void*, unsigned, uint32_t))si_pm4_set_reg_idx3);