Browse Source

radeonsi: get the raster config from AMDGPU on SI

Not sure yet if we wanna do this on CIK and VI too.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
tags/17.3-branchpoint
Marek Olšák 8 years ago
parent
commit
fc99cb3c9e

+ 3
- 0
src/amd/common/ac_gpu_info.c View File

@@ -301,6 +301,9 @@ bool ac_query_gpu_info(int fd, amdgpu_device_handle dev,
memcpy(info->si_tile_mode_array, amdinfo->gb_tile_mode,
sizeof(amdinfo->gb_tile_mode));
info->enabled_rb_mask = amdinfo->enabled_rb_pipes_mask;
memcpy(info->pa_sc_raster_config, amdinfo->pa_sc_raster_cfg,
sizeof(info->pa_sc_raster_config));
info->pa_sc_raster_config_1 = amdinfo->pa_sc_raster_cfg1[0];

memcpy(info->cik_macrotile_mode_array, amdinfo->gb_macro_tile_mode,
sizeof(amdinfo->gb_macro_tile_mode));

+ 2
- 0
src/amd/common/ac_gpu_info.h View File

@@ -96,6 +96,8 @@ struct radeon_info {
uint32_t num_tile_pipes; /* pipe count from PIPE_CONFIG */
uint32_t pipe_interleave_bytes;
uint32_t enabled_rb_mask; /* GCN harvest config */
uint32_t pa_sc_raster_config[4]; /* per SE */
uint32_t pa_sc_raster_config_1;

uint64_t max_alignment; /* from addrlib */
/* Tile modes. */

+ 17
- 0
src/gallium/drivers/radeonsi/si_state.c View File

@@ -4421,6 +4421,23 @@ si_write_harvested_raster_configs(struct si_context *sctx,
static void si_set_raster_config(struct si_context *sctx, struct si_pm4_state *pm4)
{
struct si_screen *sscreen = sctx->screen;

/* On SI, set the raster config value from AMDGPU. */
if (sscreen->b.info.drm_major == 3 && sscreen->b.chip_class == SI) {
if (sscreen->b.info.max_se == 1) {
si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG,
sscreen->b.info.pa_sc_raster_config[0]);
} else {
for (unsigned se = 0; se < sscreen->b.info.max_se; se++) {
si_set_grbm_gfx_index_se(sctx, pm4, se);
si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG,
sscreen->b.info.pa_sc_raster_config[se]);
}
si_set_grbm_gfx_index_se(sctx, pm4, ~0);
}
return;
}

unsigned num_rb = MIN2(sctx->screen->b.info.num_render_backends, 16);
unsigned rb_mask = sctx->screen->b.info.enabled_rb_mask;
unsigned raster_config, raster_config_1;

Loading…
Cancel
Save