diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2012-07-26 17:42:25 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2013-02-01 19:34:32 -0500 |
commit | d0ae7fccb3bae2f3749aa70636c537aa16f37bb7 (patch) | |
tree | 3fcec747c985eb5077107c396e7176167ea976c3 | |
parent | 624d35242a90cb508064c11c1ff3beb54f08a6a5 (diff) |
drm/radeon: fill in gpu init for Oland
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/radeon/si.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index a910cb92cfd0..ec62110f22f5 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
@@ -1127,7 +1127,8 @@ static void si_tiling_mode_table_init(struct radeon_device *rdev) | |||
1127 | } | 1127 | } |
1128 | WREG32(GB_TILE_MODE0 + (reg_offset * 4), gb_tile_moden); | 1128 | WREG32(GB_TILE_MODE0 + (reg_offset * 4), gb_tile_moden); |
1129 | } | 1129 | } |
1130 | } else if (rdev->family == CHIP_VERDE) { | 1130 | } else if ((rdev->family == CHIP_VERDE) || |
1131 | (rdev->family == CHIP_OLAND)) { | ||
1131 | for (reg_offset = 0; reg_offset < num_tile_mode_states; reg_offset++) { | 1132 | for (reg_offset = 0; reg_offset < num_tile_mode_states; reg_offset++) { |
1132 | switch (reg_offset) { | 1133 | switch (reg_offset) { |
1133 | case 0: /* non-AA compressed depth or any compressed stencil */ | 1134 | case 0: /* non-AA compressed depth or any compressed stencil */ |
@@ -1572,6 +1573,23 @@ static void si_gpu_init(struct radeon_device *rdev) | |||
1572 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; | 1573 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; |
1573 | gb_addr_config = VERDE_GB_ADDR_CONFIG_GOLDEN; | 1574 | gb_addr_config = VERDE_GB_ADDR_CONFIG_GOLDEN; |
1574 | break; | 1575 | break; |
1576 | case CHIP_OLAND: | ||
1577 | rdev->config.si.max_shader_engines = 1; | ||
1578 | rdev->config.si.max_tile_pipes = 4; | ||
1579 | rdev->config.si.max_cu_per_sh = 6; | ||
1580 | rdev->config.si.max_sh_per_se = 1; | ||
1581 | rdev->config.si.max_backends_per_se = 2; | ||
1582 | rdev->config.si.max_texture_channel_caches = 4; | ||
1583 | rdev->config.si.max_gprs = 256; | ||
1584 | rdev->config.si.max_gs_threads = 16; | ||
1585 | rdev->config.si.max_hw_contexts = 8; | ||
1586 | |||
1587 | rdev->config.si.sc_prim_fifo_size_frontend = 0x20; | ||
1588 | rdev->config.si.sc_prim_fifo_size_backend = 0x40; | ||
1589 | rdev->config.si.sc_hiz_tile_fifo_size = 0x30; | ||
1590 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; | ||
1591 | gb_addr_config = VERDE_GB_ADDR_CONFIG_GOLDEN; | ||
1592 | break; | ||
1575 | } | 1593 | } |
1576 | 1594 | ||
1577 | /* Initialize HDP */ | 1595 | /* Initialize HDP */ |