fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ac: move PBB MAX_ALLOC_COUNT into radeon_info

Browse source 
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Marek Olšák 2019-09-12 19:00:23 -04:00
parent 05da025f35
commit 2c62b461e9
4 changed files with 35 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/amd/common/ac_gpu_info.c
View file

@ -538,6 +538,38 @@ bool ac_query_gpu_info(int fd, void *dev_p,
info->has_gds_ordered_append = info->chip_class >= GFX7 && info->has_gds_ordered_append = info->chip_class >= GFX7 &&
info->drm_minor >= 29; info->drm_minor >= 29;
if (info->chip_class >= GFX9) {
unsigned pc_lines = 0;
switch (info->family) {
case CHIP_VEGA10:
case CHIP_VEGA12:
case CHIP_VEGA20:
pc_lines = 2048;
break;
case CHIP_RAVEN:
case CHIP_RAVEN2:
case CHIP_RENOIR:
case CHIP_NAVI10:
case CHIP_NAVI12:
pc_lines = 1024;
break;
case CHIP_NAVI14:
pc_lines = 512;
break;
default:
assert(0);
}
if (info->chip_class >= GFX10) {
info->pbb_max_alloc_count = pc_lines / 3;
} else {
info->pbb_max_alloc_count =
MIN2(128, pc_lines / (4 * info->max_se));
}
}
return true; return true;
} }

1
src/amd/common/ac_gpu_info.h
View file

@ -66,6 +66,7 @@ struct radeon_info {
bool has_load_ctx_reg_pkt; bool has_load_ctx_reg_pkt;
bool has_out_of_order_rast; bool has_out_of_order_rast;
bool cpdma_prefetch_writes_memory; bool cpdma_prefetch_writes_memory;
uint32_t pbb_max_alloc_count;
/* There are 2 display DCC codepaths, because display expects unaligned DCC. */ /* There are 2 display DCC codepaths, because display expects unaligned DCC. */
/* Disable RB and pipe alignment to skip the retile blit. (1 RB chips only) */ /* Disable RB and pipe alignment to skip the retile blit. (1 RB chips only) */

32
src/amd/vulkan/si_cmd_buffer.c
View file

@ -427,38 +427,8 @@ si_emit_graphics(struct radv_physical_device *physical_device,
} }
if (physical_device->rad_info.chip_class >= GFX9) { if (physical_device->rad_info.chip_class >= GFX9) {
unsigned num_se = physical_device->rad_info.max_se;
unsigned pc_lines = 0;
unsigned max_alloc_count = 0;
switch (physical_device->rad_info.family) {
case CHIP_VEGA10:
case CHIP_VEGA12:
case CHIP_VEGA20:
pc_lines = 4096;
break;
case CHIP_RAVEN:
case CHIP_RAVEN2:
case CHIP_RENOIR:
case CHIP_NAVI10:
case CHIP_NAVI12:
pc_lines = 1024;
break;
case CHIP_NAVI14:
pc_lines = 512;
break;
default:
assert(0);
}
if (physical_device->rad_info.chip_class >= GFX10) {
max_alloc_count = pc_lines / 3;
} else {
max_alloc_count = MIN2(128, pc_lines / (4 * num_se));
}
radeon_set_context_reg(cs, R_028C48_PA_SC_BINNER_CNTL_1, radeon_set_context_reg(cs, R_028C48_PA_SC_BINNER_CNTL_1,
S_028C48_MAX_ALLOC_COUNT(max_alloc_count - 1) | S_028C48_MAX_ALLOC_COUNT(physical_device->rad_info.pbb_max_alloc_count - 1) |
S_028C48_MAX_PRIM_PER_BATCH(1023)); S_028C48_MAX_PRIM_PER_BATCH(1023));
radeon_set_context_reg(cs, R_028C4C_PA_SC_CONSERVATIVE_RASTERIZATION_CNTL, radeon_set_context_reg(cs, R_028C4C_PA_SC_CONSERVATIVE_RASTERIZATION_CNTL,
S_028C4C_NULL_SQUAD_AA_MASK_ENABLE(1)); S_028C4C_NULL_SQUAD_AA_MASK_ENABLE(1));

32
src/gallium/drivers/radeonsi/si_state.c
View file

@ -5686,38 +5686,8 @@ static void si_init_config(struct si_context *sctx)
RADEON_PRIO_BORDER_COLORS); RADEON_PRIO_BORDER_COLORS);
if (sctx->chip_class >= GFX9) { if (sctx->chip_class >= GFX9) {
unsigned num_se = sscreen->info.max_se;
unsigned pc_lines = 0;
unsigned max_alloc_count = 0;
switch (sctx->family) {
case CHIP_VEGA10:
case CHIP_VEGA12:
case CHIP_VEGA20:
pc_lines = 2048;
break;
case CHIP_RAVEN:
case CHIP_RAVEN2:
case CHIP_RENOIR:
case CHIP_NAVI10:
case CHIP_NAVI12:
pc_lines = 1024;
break;
case CHIP_NAVI14:
pc_lines = 512;
break;
default:
assert(0);
}
if (sctx->chip_class >= GFX10) {
max_alloc_count = pc_lines / 3;
} else {
max_alloc_count = MIN2(128, pc_lines / (4 * num_se));
}
si_pm4_set_reg(pm4, R_028C48_PA_SC_BINNER_CNTL_1, si_pm4_set_reg(pm4, R_028C48_PA_SC_BINNER_CNTL_1,
S_028C48_MAX_ALLOC_COUNT(max_alloc_count - 1) | S_028C48_MAX_ALLOC_COUNT(sscreen->info.pbb_max_alloc_count - 1) |
S_028C48_MAX_PRIM_PER_BATCH(1023)); S_028C48_MAX_PRIM_PER_BATCH(1023));
si_pm4_set_reg(pm4, R_028C4C_PA_SC_CONSERVATIVE_RASTERIZATION_CNTL, si_pm4_set_reg(pm4, R_028C4C_PA_SC_CONSERVATIVE_RASTERIZATION_CNTL,
S_028C4C_NULL_SQUAD_AA_MASK_ENABLE(1)); S_028C4C_NULL_SQUAD_AA_MASK_ENABLE(1));