Skip to contentSkip to conversation

Small cleanups for gfx6

PATCH In review Tom St Denis 2 participants 9 messages May 15, 2017 – May 23, 2017 4 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

PATCH 1/5 drm/amd/amdgpu: Clean up GFX6 tilemode programming

---
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 1556 ++++++++++++++-------------------
 1 file changed, 676 insertions(+), 880 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +676 -880
index 5d9e95bcd011..36a70e93b293 100644
@@ -393,8 +393,11 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
 
 static void gfx_v6_0_tiling_mode_table_init(struct amdgpu_device *adev)
 {
-	const u32 num_tile_mode_states = 32;
-	u32 reg_offset, gb_tile_moden, split_equal_to_row_size;
+	const u32 num_tile_mode_states = ARRAY_SIZE(adev->gfx.config.tile_mode_array);
+	u32 reg_offset, split_equal_to_row_size, *tilemode;
+
+	memset(adev->gfx.config.tile_mode_array, 0, sizeof(adev->gfx.config.tile_mode_array));
+	tilemode = adev->gfx.config.tile_mode_array;
 
 	switch (adev->gfx.config.mem_row_size_in_kb) {
 	case 1:
@@ -410,887 +413,680 @@ static void gfx_v6_0_tiling_mode_table_init(struct amdgpu_device *adev)
 	}
 
 	if (adev->asic_type == CHIP_VERDE) {
-		for (reg_offset = 0; reg_offset < num_tile_mode_states; reg_offset++) {
-			switch (reg_offset) {
-			case 0:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 1:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 2:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 3:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_8_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 4:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16));
-				break;
-			case 5:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 6:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 7:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 8:
-				gb_tile_moden = (ARRAY_MODE(ARRAY_LINEAR_ALIGNED));
-				break;
-			case 9:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16));
-				break;
-			case 10:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 11:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 12:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 13:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16));
-				break;
-			case 14:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 15:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 16:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 17:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 18:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THICK) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16));
-				break;
-			case 19:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 20:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THICK) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 21:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_8_BANK));
-				break;
-			case 22:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_8_BANK));
-				break;
-			case 23:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 24:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 25:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 26:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 27:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 28:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 29:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 30:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			default:
-				continue;
-			}
-			adev->gfx.config.tile_mode_array[reg_offset] = gb_tile_moden;
-			WREG32(mmGB_TILE_MODE0 + reg_offset, gb_tile_moden);
-		}
-	} else if (adev->asic_type == CHIP_OLAND ||
-	    adev->asic_type == CHIP_HAINAN) {
-		for (reg_offset = 0; reg_offset < num_tile_mode_states; reg_offset++) {
-			switch (reg_offset) {
-			case 0:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 1:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 2:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 3:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_8_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 4:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2));
-				break;
-			case 5:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_8_BANK));
-				break;
-			case 6:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_8_BANK));
-				break;
-			case 7:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 8:
-				gb_tile_moden = (ARRAY_MODE(ARRAY_LINEAR_ALIGNED));
-				break;
-			case 9:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2));
-				break;
-			case 10:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 11:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 12:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 13:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2));
-				break;
-			case 14:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 15:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 16:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 17:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 18:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THICK) |
-						 PIPE_CONFIG(ADDR_SURF_P2));
-				break;
-			case 19:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 20:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THICK) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 21:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_2) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_8_BANK));
-				break;
-			case 22:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_2) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_8_BANK));
-				break;
-			case 23:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_8_BANK));
-				break;
-			case 24:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_8_BANK));
-				break;
-			case 25:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 26:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 27:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 28:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 29:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 30:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P2) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			default:
-				continue;
-			}
-			adev->gfx.config.tile_mode_array[reg_offset] = gb_tile_moden;
-			WREG32(mmGB_TILE_MODE0 + reg_offset, gb_tile_moden);
-		}
+		tilemode[0] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[1] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[2] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[3] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_8_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[4] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16);
+		tilemode[5] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[6] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[7] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[8] =   ARRAY_MODE(ARRAY_LINEAR_ALIGNED);
+		tilemode[9] =   MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16);
+		tilemode[10] =  MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[11] =  MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[12] =  MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[13] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16);
+		tilemode[14] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[15] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[16] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[17] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[18] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16);
+		tilemode[19] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[20] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[21] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[22] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[23] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[24] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[25] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[26] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[27] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[28] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[29] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[30] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		for (reg_offset = 0; reg_offset < num_tile_mode_states; reg_offset++)
+			WREG32(mmGB_TILE_MODE0 + reg_offset, tilemode[reg_offset]);
+	} else if (adev->asic_type == CHIP_OLAND || adev->asic_type == CHIP_HAINAN) {
+		tilemode[0] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[1] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[2] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[3] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_8_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[4] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2);
+		tilemode[5] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[6] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[7] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[8] =   ARRAY_MODE(ARRAY_LINEAR_ALIGNED);
+		tilemode[9] =   MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2);
+		tilemode[10] =  MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[11] =  MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[12] =  MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[13] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2);
+		tilemode[14] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[15] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[16] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[17] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[18] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P2);
+		tilemode[19] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[20] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[21] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_2) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[22] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_2) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[23] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[24] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[25] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[26] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[27] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[28] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[29] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[30] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		for (reg_offset = 0; reg_offset < num_tile_mode_states; reg_offset++)
+			WREG32(mmGB_TILE_MODE0 + reg_offset, tilemode[reg_offset]);
 	} else if ((adev->asic_type == CHIP_TAHITI) || (adev->asic_type == CHIP_PITCAIRN)) {
-		for (reg_offset = 0; reg_offset < num_tile_mode_states; reg_offset++) {
-			switch (reg_offset) {
-			case 0:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 1:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 2:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 3:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 4:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16));
-				break;
-			case 5:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 6:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 7:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 8:
-				gb_tile_moden = (ARRAY_MODE(ARRAY_LINEAR_ALIGNED));
-				break;
-			case 9:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16));
-				break;
-			case 10:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 11:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 12:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 13:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16));
-				break;
-			case 14:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 15:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 16:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_16_BANK));
-				break;
-			case 17:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_16_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 18:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_1D_TILED_THICK) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16));
-				break;
-			case 19:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_16_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 20:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THICK) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_16_BANK) |
-						 TILE_SPLIT(split_equal_to_row_size));
-				break;
-			case 21:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 22:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_4_BANK));
-				break;
-			case 23:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 24:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 25:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 26:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 27:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 28:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 29:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			case 30:
-				gb_tile_moden = (MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-						 ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-						 PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-						 TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
-						 BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-						 BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-						 MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-						 NUM_BANKS(ADDR_SURF_2_BANK));
-				break;
-			default:
-				continue;
-			}
-			adev->gfx.config.tile_mode_array[reg_offset] = gb_tile_moden;
-			WREG32(mmGB_TILE_MODE0 + reg_offset, gb_tile_moden);
-		}
-	} else{
-
+		tilemode[0] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[1] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[2] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[3] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[4] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16);
+		tilemode[5] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[6] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[7] =   MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[8] =   ARRAY_MODE(ARRAY_LINEAR_ALIGNED);
+		tilemode[9] =   MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16);
+		tilemode[10] =  MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[11] =  MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[12] =  MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[13] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16);
+		tilemode[14] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[15] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[16] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[17] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[18] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_1D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16);
+		tilemode[19] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[20] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[21] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[22] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[23] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[24] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[25] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[26] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[27] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[28] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[29] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[30] =  MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
+				BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+				MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		for (reg_offset = 0; reg_offset < num_tile_mode_states; reg_offset++)
+			WREG32(mmGB_TILE_MODE0 + reg_offset, tilemode[reg_offset]);
+	} else {
 		DRM_ERROR("unknown asic: 0x%x\n", adev->asic_type);
 	}
-
 }
 
 static void gfx_v6_0_select_se_sh(struct amdgpu_device *adev, u32 se_num,
Signature · 6 lines
2.12.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

Reviewed-by Alex Deucher
#4 lore raw

RE: [PATCH 1/5] drm/amd/amdgpu: Clean up GFX6 tilemode programming

Quoted 10 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Monday, May 15, 2017 9:49 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 1/5] drm/amd/amdgpu: Clean up GFX6 tilemode programming

Patches 1-4 are:

Quoted 2,614 lines
---
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 1556 ++++++++++++++---------
----------
 1 file changed, 676 insertions(+), 880 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +5 -2
index 5d9e95bcd011..36a70e93b293 100644
@@ -393,8 +393,11 @@ static int gfx_v6_0_init_microcode(struct
 amdgpu_device *adev)
 
 static void gfx_v6_0_tiling_mode_table_init(struct amdgpu_device *adev)
 {
-	const u32 num_tile_mode_states = 32;
-	u32 reg_offset, gb_tile_moden, split_equal_to_row_size;
+	const u32 num_tile_mode_states = ARRAY_SIZE(adev-
 >gfx.config.tile_mode_array);
+	u32 reg_offset, split_equal_to_row_size, *tilemode;
+
+	memset(adev->gfx.config.tile_mode_array, 0, sizeof(adev-
 >gfx.config.tile_mode_array));
+	tilemode = adev->gfx.config.tile_mode_array;
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -4
 	switch (adev->gfx.config.mem_row_size_in_kb) {
 	case 1:
@@ -410,887 +413,680 @@ static void
 gfx_v6_0_tiling_mode_table_init(struct amdgpu_device *adev)
 	}
 
 	if (adev->asic_type == CHIP_VERDE) {
-		for (reg_offset = 0; reg_offset < num_tile_mode_states;
 reg_offset++) {
-			switch (reg_offset) {
-			case 0:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 1:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 2:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 3:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_8_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 4:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 5:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 6:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 7:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 8:
-				gb_tile_moden =

(ARRAY_MODE(ARRAY_LINEAR_ALIGNED));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 9:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 10:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
- MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) | -
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 11:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
- MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) | -
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 12:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
- MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) | -
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 13:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 14:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 15:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 16:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 17:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 18:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_1D_TILED_THICK) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 19:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 20:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THICK) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 21:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_8_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 22:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_8_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 23:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 24:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 25:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 26:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 27:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 28:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 29:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 30:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -5
-				break;
-			default:
-				continue;
-			}
-			adev->gfx.config.tile_mode_array[reg_offset] =

gb_tile_moden;

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -1
-			WREG32(mmGB_TILE_MODE0 + reg_offset,

gb_tile_moden);

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -4
-		}
-	} else if (adev->asic_type == CHIP_OLAND ||
-	    adev->asic_type == CHIP_HAINAN) {
-		for (reg_offset = 0; reg_offset < num_tile_mode_states;

reg_offset++) {

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-			switch (reg_offset) {
-			case 0:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 1:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 2:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 3:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_8_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 4:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 5:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_8_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 6:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_8_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 7:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 8:
-				gb_tile_moden =

(ARRAY_MODE(ARRAY_LINEAR_ALIGNED));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 9:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 10:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
- MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) | -
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 11:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
- MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) | -
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 12:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
- MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) | -
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 13:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 14:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 15:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 16:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 17:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 18:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_1D_TILED_THICK) |
-
PIPE_CONFIG(ADDR_SURF_P2));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 19:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 20:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THICK) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 21:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_2) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_8_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 22:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_2) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_8_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 23:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_8_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 24:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_8_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 25:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 26:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 27:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 28:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 29:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 30:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P2) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -5
-				break;
-			default:
-				continue;
-			}
-			adev->gfx.config.tile_mode_array[reg_offset] =

gb_tile_moden;

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -1
-			WREG32(mmGB_TILE_MODE0 + reg_offset,

gb_tile_moden);

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
-		}
+		tilemode[0] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[1] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[2] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[3] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_8_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[4] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16);
+		tilemode[5] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[6] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[7] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[8] =   ARRAY_MODE(ARRAY_LINEAR_ALIGNED);
+		tilemode[9] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16);
+		tilemode[10] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[11] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[12] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[13] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16);
+		tilemode[14] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[15] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[16] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[17] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[18] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16);
+		tilemode[19] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[20] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[21] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[22] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[23] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[24] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[25] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[26] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[27] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[28] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[29] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[30] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		for (reg_offset = 0; reg_offset < num_tile_mode_states;

reg_offset++)

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -0
+			WREG32(mmGB_TILE_MODE0 + reg_offset,

tilemode[reg_offset]);

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -0
+	} else if (adev->asic_type == CHIP_OLAND || adev->asic_type ==

CHIP_HAINAN) {

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -0
+		tilemode[0] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[1] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[2] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[3] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_8_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[4] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2);
+		tilemode[5] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[6] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[7] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[8] =   ARRAY_MODE(ARRAY_LINEAR_ALIGNED);
+		tilemode[9] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2);
+		tilemode[10] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[11] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[12] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[13] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2);
+		tilemode[14] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[15] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[16] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[17] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[18] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P2);
+		tilemode[19] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[20] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[21] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_2)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[22] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_2)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[23] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[24] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_8_BANK);
+		tilemode[25] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[26] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[27] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[28] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[29] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[30] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P2) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		for (reg_offset = 0; reg_offset < num_tile_mode_states;

reg_offset++)

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -0
+			WREG32(mmGB_TILE_MODE0 + reg_offset,

tilemode[reg_offset]);
} else if ((adev->asic_type == CHIP_TAHITI) || (adev->asic_type ==
CHIP_PITCAIRN)) {

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -1
-		for (reg_offset = 0; reg_offset < num_tile_mode_states;

reg_offset++) {

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-			switch (reg_offset) {
-			case 0:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 1:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 2:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 3:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 4:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 5:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 6:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 7:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 8:
-				gb_tile_moden =

(ARRAY_MODE(ARRAY_LINEAR_ALIGNED));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 9:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 10:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
- MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) | -
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 11:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
- MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) | -
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 12:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) | -
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
- MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) | -
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 13:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 14:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 15:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 16:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_16_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 17:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_16_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 18:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_1D_TILED_THICK) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 19:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_16_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 20:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THICK) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_16_BANK) |
-
TILE_SPLIT(split_equal_to_row_size));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 21:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 22:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_4_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 23:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 24:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 25:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 26:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 27:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 28:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 29:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -3
-				break;
-			case 30:
-				gb_tile_moden =

(MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
PIPE_CONFIG(ADDR_SURF_P4_8x16) |
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
-
NUM_BANKS(ADDR_SURF_2_BANK));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -5
-				break;
-			default:
-				continue;
-			}
-			adev->gfx.config.tile_mode_array[reg_offset] =

gb_tile_moden;

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -1
-			WREG32(mmGB_TILE_MODE0 + reg_offset,

gb_tile_moden);

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -3
-		}
-	} else{
-
+		tilemode[0] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[1] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[2] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[3] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -0
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_4_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[4] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16);
+		tilemode[5] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[6] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[7] =

MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[8] =   ARRAY_MODE(ARRAY_LINEAR_ALIGNED);
+		tilemode[9] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16);
+		tilemode[10] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[11] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[12] =

MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[13] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16);
+		tilemode[14] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[15] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[16] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_16_BANK);
+		tilemode[17] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -0
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[18] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				ARRAY_MODE(ARRAY_1D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16);
+		tilemode[19] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_XTHICK) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -0
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[20] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THICK) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -0
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -0
+				NUM_BANKS(ADDR_SURF_16_BANK) |
+				TILE_SPLIT(split_equal_to_row_size);
+		tilemode[21] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[22] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_4_BANK);
+		tilemode[23] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_256B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_8) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[24] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16)

|

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_512B) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[25] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[26] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[27] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[28] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[29] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_1KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		tilemode[30] =

MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+				ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
+				PIPE_CONFIG(ADDR_SURF_P4_8x16) |
+				TILE_SPLIT(ADDR_SURF_TILE_SPLIT_2KB) |
+				BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1)

|
+
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -0
+				NUM_BANKS(ADDR_SURF_2_BANK);
+		for (reg_offset = 0; reg_offset < num_tile_mode_states;

reg_offset++)

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -0
+			WREG32(mmGB_TILE_MODE0 + reg_offset,

tilemode[reg_offset]);

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
+	} else {
 		DRM_ERROR("unknown asic: 0x%x\n", adev->asic_type);
 	}
-
 }
 
 static void gfx_v6_0_select_se_sh(struct amdgpu_device *adev, u32

se_num,
--
2.12.0

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#5 lore raw

PATCH 2/5 drm/amd/amdgpu: gfx6 tidy up raster config

In reply to a message not in the archive

Clean up coding style in gfx_v6_0_write_harvested_raster_configs()

---
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +8 -12
index 36a70e93b293..b7a70551d49f 100644
@@ -1195,11 +1195,10 @@ static void gfx_v6_0_write_harvested_raster_configs(struct amdgpu_device *adev,
 		if ((num_se > 1) && (!se_mask[idx] || !se_mask[idx + 1])) {
 			raster_config_se &= ~PA_SC_RASTER_CONFIG__SE_MAP_MASK;
 
-			if (!se_mask[idx]) {
+			if (!se_mask[idx])
 				raster_config_se |= RASTER_CONFIG_SE_MAP_3 << PA_SC_RASTER_CONFIG__SE_MAP__SHIFT;
-			} else {
+			else
 				raster_config_se |= RASTER_CONFIG_SE_MAP_0 << PA_SC_RASTER_CONFIG__SE_MAP__SHIFT;
-			}
 		}
 
 		pkr0_mask &= rb_mask;
@@ -1207,11 +1206,10 @@ static void gfx_v6_0_write_harvested_raster_configs(struct amdgpu_device *adev,
 		if (rb_per_se > 2 && (!pkr0_mask || !pkr1_mask)) {
 			raster_config_se &= ~PA_SC_RASTER_CONFIG__PKR_MAP_MASK;
 
-			if (!pkr0_mask) {
+			if (!pkr0_mask)
 				raster_config_se |= RASTER_CONFIG_PKR_MAP_3 << PA_SC_RASTER_CONFIG__PKR_MAP__SHIFT;
-			} else {
+			else
 				raster_config_se |= RASTER_CONFIG_PKR_MAP_0 << PA_SC_RASTER_CONFIG__PKR_MAP__SHIFT;
-			}
 		}
 
 		if (rb_per_se >= 2) {
@@ -1223,13 +1221,12 @@ static void gfx_v6_0_write_harvested_raster_configs(struct amdgpu_device *adev,
 			if (!rb0_mask || !rb1_mask) {
 				raster_config_se &= ~PA_SC_RASTER_CONFIG__RB_MAP_PKR0_MASK;
 
-				if (!rb0_mask) {
+				if (!rb0_mask)
 					raster_config_se |=
 						RASTER_CONFIG_RB_MAP_3 << PA_SC_RASTER_CONFIG__RB_MAP_PKR0__SHIFT;
-				} else {
+				else
 					raster_config_se |=
 						RASTER_CONFIG_RB_MAP_0 << PA_SC_RASTER_CONFIG__RB_MAP_PKR0__SHIFT;
-				}
 			}
 
 			if (rb_per_se > 2) {
@@ -1240,13 +1237,12 @@ static void gfx_v6_0_write_harvested_raster_configs(struct amdgpu_device *adev,
 				if (!rb0_mask || !rb1_mask) {
 					raster_config_se &= ~PA_SC_RASTER_CONFIG__RB_MAP_PKR1_MASK;
 
-					if (!rb0_mask) {
+					if (!rb0_mask)
 						raster_config_se |=
 							RASTER_CONFIG_RB_MAP_3 << PA_SC_RASTER_CONFIG__RB_MAP_PKR1__SHIFT;
-					} else {
+					else
 						raster_config_se |=
 							RASTER_CONFIG_RB_MAP_0 << PA_SC_RASTER_CONFIG__RB_MAP_PKR1__SHIFT;
-					}
 				}
 			}
 		}
Signature · 6 lines
2.12.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#6 lore raw

PATCH 3/5 drm/amd/amdgpu: Tidy up of gfx_v6_0_setup_rb()

In reply to a message not in the archive
---
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +5 -5
index b7a70551d49f..2463fcae35a7 100644
@@ -1271,8 +1271,9 @@ static void gfx_v6_0_setup_rb(struct amdgpu_device *adev)
 		for (j = 0; j < adev->gfx.config.max_sh_per_se; j++) {
 			gfx_v6_0_select_se_sh(adev, i, j, 0xffffffff);
 			data = gfx_v6_0_get_rb_active_bitmap(adev);
-			active_rbs |= data << ((i * adev->gfx.config.max_sh_per_se + j) *
-					rb_bitmap_width_per_sh);
+			active_rbs |= data <<
+				((i * adev->gfx.config.max_sh_per_se + j) *
+				 rb_bitmap_width_per_sh);
 		}
 	}
 	gfx_v6_0_select_se_sh(adev, 0xffffffff, 0xffffffff, 0xffffffff);
@@ -1286,13 +1287,12 @@ static void gfx_v6_0_setup_rb(struct amdgpu_device *adev)
 	gfx_v6_0_raster_config(adev, &raster_config);
 
 	if (!adev->gfx.config.backend_enable_mask ||
-			adev->gfx.config.num_rbs >= num_rb_pipes) {
+	     adev->gfx.config.num_rbs >= num_rb_pipes)
 		WREG32(mmPA_SC_RASTER_CONFIG, raster_config);
-	} else {
+	else
 		gfx_v6_0_write_harvested_raster_configs(adev, raster_config,
 							adev->gfx.config.backend_enable_mask,
 							num_rb_pipes);
-	}
 
 	/* cache the values for userspace */
 	for (i = 0; i < adev->gfx.config.max_shader_engines; i++) {
Signature · 6 lines
2.12.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#7 lore raw

PATCH 4/5 drm/amd/amdgpu: Drop commented out stub function

In reply to a message not in the archive

Drop the function gmc_v6_0_init_compute_vmid() since it wasn't implemented and commented out.

---
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -5
index 2463fcae35a7..1351f9230fcd 100644
@@ -1309,11 +1309,6 @@ static void gfx_v6_0_setup_rb(struct amdgpu_device *adev)
 	gfx_v6_0_select_se_sh(adev, 0xffffffff, 0xffffffff, 0xffffffff);
 	mutex_unlock(&adev->grbm_idx_mutex);
 }
-/*
-static void gmc_v6_0_init_compute_vmid(struct amdgpu_device *adev)
-{
-}
-*/
 
 static void gfx_v6_0_set_user_cu_inactive_bitmap(struct amdgpu_device *adev,
 						 u32 bitmap)
Signature · 6 lines
2.12.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#8 lore raw

PATCH 5/5 drm/amd/amdgpu: Use modern 32/64-bit types in gfx6

In reply to a message not in the archive

Switch to uintNN_t from "uNN" types to be more consistent with modern coding styles.

---
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 150 +++++++++++++++++-----------------
 1 file changed, 75 insertions(+), 75 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +75 -75
index 1351f9230fcd..a6c88f98df08 100644
@@ -68,8 +68,8 @@ MODULE_FIRMWARE("radeon/hainan_me.bin");
 MODULE_FIRMWARE("radeon/hainan_ce.bin");
 MODULE_FIRMWARE("radeon/hainan_rlc.bin");
 
-static u32 gfx_v6_0_get_csb_size(struct amdgpu_device *adev);
-static void gfx_v6_0_get_csb_buffer(struct amdgpu_device *adev, volatile u32 *buffer);
+static uint32_t gfx_v6_0_get_csb_size(struct amdgpu_device *adev);
+static void gfx_v6_0_get_csb_buffer(struct amdgpu_device *adev, volatile uint32_t *buffer);
 //static void gfx_v6_0_init_cp_pg_table(struct amdgpu_device *adev);
 static void gfx_v6_0_init_pg(struct amdgpu_device *adev);
 
@@ -83,7 +83,7 @@ static void gfx_v6_0_init_pg(struct amdgpu_device *adev);
 #define MACRO_TILE_ASPECT(x)				((x) << 18)
 #define NUM_BANKS(x)					((x) << 20)
 
-static const u32 verde_rlc_save_restore_register_list[] =
+static const uint32_t verde_rlc_save_restore_register_list[] =
 {
 	(0x8000 << 16) | (0x98f4 >> 2),
 	0x00000000,
@@ -393,8 +393,8 @@ static int gfx_v6_0_init_microcode(struct amdgpu_device *adev)
 
 static void gfx_v6_0_tiling_mode_table_init(struct amdgpu_device *adev)
 {
-	const u32 num_tile_mode_states = ARRAY_SIZE(adev->gfx.config.tile_mode_array);
-	u32 reg_offset, split_equal_to_row_size, *tilemode;
+	const uint32_t num_tile_mode_states = ARRAY_SIZE(adev->gfx.config.tile_mode_array);
+	uint32_t reg_offset, split_equal_to_row_size, *tilemode;
 
 	memset(adev->gfx.config.tile_mode_array, 0, sizeof(adev->gfx.config.tile_mode_array));
 	tilemode = adev->gfx.config.tile_mode_array;
@@ -1089,10 +1089,10 @@ static void gfx_v6_0_tiling_mode_table_init(struct amdgpu_device *adev)
 	}
 }
 
-static void gfx_v6_0_select_se_sh(struct amdgpu_device *adev, u32 se_num,
-				  u32 sh_num, u32 instance)
+static void gfx_v6_0_select_se_sh(struct amdgpu_device *adev, uint32_t se_num,
+				  uint32_t sh_num, uint32_t instance)
 {
-	u32 data;
+	uint32_t data;
 
 	if (instance == 0xffffffff)
 		data = REG_SET_FIELD(0, GRBM_GFX_INDEX, INSTANCE_BROADCAST_WRITES, 1);
@@ -1114,14 +1114,14 @@ static void gfx_v6_0_select_se_sh(struct amdgpu_device *adev, u32 se_num,
 	WREG32(mmGRBM_GFX_INDEX, data);
 }
 
-static u32 gfx_v6_0_create_bitmask(u32 bit_width)
+static uint32_t gfx_v6_0_create_bitmask(uint32_t bit_width)
 {
-	return (u32)(((u64)1 << bit_width) - 1);
+	return (uint32_t)(((uint64_t)1 << bit_width) - 1);
 }
 
-static u32 gfx_v6_0_get_rb_active_bitmap(struct amdgpu_device *adev)
+static uint32_t gfx_v6_0_get_rb_active_bitmap(struct amdgpu_device *adev)
 {
-	u32 data, mask;
+	uint32_t data, mask;
 
 	data = RREG32(mmCC_RB_BACKEND_DISABLE) |
 		RREG32(mmGC_USER_RB_BACKEND_DISABLE);
@@ -1134,7 +1134,7 @@ static u32 gfx_v6_0_get_rb_active_bitmap(struct amdgpu_device *adev)
 	return ~data & mask;
 }
 
-static void gfx_v6_0_raster_config(struct amdgpu_device *adev, u32 *rconf)
+static void gfx_v6_0_raster_config(struct amdgpu_device *adev, uint32_t *rconf)
 {
 	switch (adev->asic_type) {
 	case CHIP_TAHITI:
@@ -1167,7 +1167,7 @@ static void gfx_v6_0_raster_config(struct amdgpu_device *adev, u32 *rconf)
 }
 
 static void gfx_v6_0_write_harvested_raster_configs(struct amdgpu_device *adev,
-						    u32 raster_config, unsigned rb_mask,
+						    uint32_t raster_config, unsigned rb_mask,
 						    unsigned num_rb)
 {
 	unsigned sh_per_se = max_t(unsigned, adev->gfx.config.max_sh_per_se, 1);
@@ -1259,10 +1259,10 @@ static void gfx_v6_0_write_harvested_raster_configs(struct amdgpu_device *adev,
 static void gfx_v6_0_setup_rb(struct amdgpu_device *adev)
 {
 	int i, j;
-	u32 data;
-	u32 raster_config = 0;
-	u32 active_rbs = 0;
-	u32 rb_bitmap_width_per_sh = adev->gfx.config.max_backends_per_se /
+	uint32_t data;
+	uint32_t raster_config = 0;
+	uint32_t active_rbs = 0;
+	uint32_t rb_bitmap_width_per_sh = adev->gfx.config.max_backends_per_se /
 					adev->gfx.config.max_sh_per_se;
 	unsigned num_rb_pipes;
 
@@ -1311,9 +1311,9 @@ static void gfx_v6_0_setup_rb(struct amdgpu_device *adev)
 }
 
 static void gfx_v6_0_set_user_cu_inactive_bitmap(struct amdgpu_device *adev,
-						 u32 bitmap)
+						 uint32_t bitmap)
 {
-	u32 data;
+	uint32_t data;
 
 	if (!bitmap)
 		return;
@@ -1324,9 +1324,9 @@ static void gfx_v6_0_set_user_cu_inactive_bitmap(struct amdgpu_device *adev,
 	WREG32(mmGC_USER_SHADER_ARRAY_CONFIG, data);
 }
 
-static u32 gfx_v6_0_get_cu_enabled(struct amdgpu_device *adev)
+static uint32_t gfx_v6_0_get_cu_enabled(struct amdgpu_device *adev)
 {
-	u32 data, mask;
+	uint32_t data, mask;
 
 	data = RREG32(mmCC_GC_SHADER_ARRAY_CONFIG) |
 		RREG32(mmGC_USER_SHADER_ARRAY_CONFIG);
@@ -1339,8 +1339,8 @@ static u32 gfx_v6_0_get_cu_enabled(struct amdgpu_device *adev)
 static void gfx_v6_0_setup_spi(struct amdgpu_device *adev)
 {
 	int i, j, k;
-	u32 data, mask;
-	u32 active_cu = 0;
+	uint32_t data, mask;
+	uint32_t active_cu = 0;
 
 	mutex_lock(&adev->grbm_idx_mutex);
 	for (i = 0; i < adev->gfx.config.max_shader_engines; i++) {
@@ -1371,11 +1371,11 @@ static void gfx_v6_0_config_init(struct amdgpu_device *adev)
 
 static void gfx_v6_0_gpu_init(struct amdgpu_device *adev)
 {
-	u32 gb_addr_config = 0;
-	u32 mc_shared_chmap, mc_arb_ramcfg;
-	u32 sx_debug_1;
-	u32 hdp_host_path_cntl;
-	u32 tmp;
+	uint32_t gb_addr_config = 0;
+	uint32_t mc_shared_chmap, mc_arb_ramcfg;
+	uint32_t sx_debug_1;
+	uint32_t hdp_host_path_cntl;
+	uint32_t tmp;
 
 	switch (adev->asic_type) {
 	case CHIP_TAHITI:
@@ -1661,8 +1661,8 @@ static void gfx_v6_0_ring_emit_hdp_invalidate(struct amdgpu_ring *ring)
 	amdgpu_ring_write(ring, 0x1);
 }
 
-static void gfx_v6_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr,
-				     u64 seq, unsigned flags)
+static void gfx_v6_0_ring_emit_fence(struct amdgpu_ring *ring, uint64_t addr,
+				     uint64_t seq, unsigned flags)
 {
 	bool write64bit = flags & AMDGPU_FENCE_FLAG_64BIT;
 	bool int_sel = flags & AMDGPU_FENCE_FLAG_INT;
@@ -1693,7 +1693,7 @@ static void gfx_v6_0_ring_emit_ib(struct amdgpu_ring *ring,
 				  struct amdgpu_ib *ib,
 				  unsigned vm_id, bool ctx_switch)
 {
-	u32 header, control = 0;
+	uint32_t header, control = 0;
 
 	/* insert SWITCH_BUFFER packet before first IB in the ring frame */
 	if (ctx_switch) {
@@ -1809,7 +1809,7 @@ static int gfx_v6_0_cp_gfx_load_microcode(struct amdgpu_device *adev)
 	const struct gfx_firmware_header_v1_0 *ce_hdr;
 	const struct gfx_firmware_header_v1_0 *me_hdr;
 	const __le32 *fw_data;
-	u32 fw_size;
+	uint32_t fw_size;
 
 	if (!adev->gfx.me_fw || !adev->gfx.pfp_fw || !adev->gfx.ce_fw)
 		return -EINVAL;
@@ -1925,10 +1925,10 @@ static int gfx_v6_0_cp_gfx_start(struct amdgpu_device *adev)
 static int gfx_v6_0_cp_gfx_resume(struct amdgpu_device *adev)
 {
 	struct amdgpu_ring *ring;
-	u32 tmp;
-	u32 rb_bufsz;
+	uint32_t tmp;
+	uint32_t rb_bufsz;
 	int r;
-	u64 rptr_addr;
+	uint64_t rptr_addr;
 
 	WREG32(mmCP_SEM_WAIT_TIMER, 0x0);
 	WREG32(mmCP_SEM_INCOMPLETE_TIMER_CNTL, 0x0);
@@ -1979,12 +1979,12 @@ static int gfx_v6_0_cp_gfx_resume(struct amdgpu_device *adev)
 	return 0;
 }
 
-static u64 gfx_v6_0_ring_get_rptr(struct amdgpu_ring *ring)
+static uint64_t gfx_v6_0_ring_get_rptr(struct amdgpu_ring *ring)
 {
 	return ring->adev->wb.wb[ring->rptr_offs];
 }
 
-static u64 gfx_v6_0_ring_get_wptr(struct amdgpu_ring *ring)
+static uint64_t gfx_v6_0_ring_get_wptr(struct amdgpu_ring *ring)
 {
 	struct amdgpu_device *adev = ring->adev;
 
@@ -2025,10 +2025,10 @@ static void gfx_v6_0_ring_set_wptr_compute(struct amdgpu_ring *ring)
 static int gfx_v6_0_cp_compute_resume(struct amdgpu_device *adev)
 {
 	struct amdgpu_ring *ring;
-	u32 tmp;
-	u32 rb_bufsz;
+	uint32_t tmp;
+	uint32_t rb_bufsz;
 	int i, r;
-	u64 rptr_addr;
+	uint64_t rptr_addr;
 
 	/* ring1  - compute only */
 	/* Set ring buffer size */
@@ -2098,8 +2098,8 @@ static int gfx_v6_0_cp_load_microcode(struct amdgpu_device *adev)
 static void gfx_v6_0_enable_gui_idle_interrupt(struct amdgpu_device *adev,
 					       bool enable)
 {
-	u32 tmp = RREG32(mmCP_INT_CNTL_RING0);
-	u32 mask;
+	uint32_t tmp = RREG32(mmCP_INT_CNTL_RING0);
+	uint32_t mask;
 	int i;
 
 	if (enable)
@@ -2259,16 +2259,16 @@ static void gfx_v6_0_rlc_fini(struct amdgpu_device *adev)
 
 static int gfx_v6_0_rlc_init(struct amdgpu_device *adev)
 {
-	const u32 *src_ptr;
-	volatile u32 *dst_ptr;
-	u32 dws, i;
-	u64 reg_list_mc_addr;
+	const uint32_t *src_ptr;
+	volatile uint32_t *dst_ptr;
+	uint32_t dws, i;
+	uint64_t reg_list_mc_addr;
 	const struct cs_section_def *cs_data;
 	int r;
 
 	adev->gfx.rlc.reg_list = verde_rlc_save_restore_register_list;
 	adev->gfx.rlc.reg_list_size =
-			(u32)ARRAY_SIZE(verde_rlc_save_restore_register_list);
+			(uint32_t)ARRAY_SIZE(verde_rlc_save_restore_register_list);
 
 	adev->gfx.rlc.cs_data = si_cs_data;
 	src_ptr = adev->gfx.rlc.reg_list;
@@ -2397,18 +2397,18 @@ static void gfx_v6_0_wait_for_rlc_serdes(struct amdgpu_device *adev)
 	}
 }
 
-static void gfx_v6_0_update_rlc(struct amdgpu_device *adev, u32 rlc)
+static void gfx_v6_0_update_rlc(struct amdgpu_device *adev, uint32_t rlc)
 {
-	u32 tmp;
+	uint32_t tmp;
 
 	tmp = RREG32(mmRLC_CNTL);
 	if (tmp != rlc)
 		WREG32(mmRLC_CNTL, rlc);
 }
 
-static u32 gfx_v6_0_halt_rlc(struct amdgpu_device *adev)
+static uint32_t gfx_v6_0_halt_rlc(struct amdgpu_device *adev)
 {
-	u32 data, orig;
+	uint32_t data, orig;
 
 	orig = data = RREG32(mmRLC_CNTL);
 
@@ -2449,7 +2449,7 @@ static void gfx_v6_0_rlc_reset(struct amdgpu_device *adev)
 
 static bool gfx_v6_0_lbpw_supported(struct amdgpu_device *adev)
 {
-	u32 tmp;
+	uint32_t tmp;
 
 	/* Enable LBPW only for DDR3 */
 	tmp = RREG32(mmMC_SEQ_MISC0);
@@ -2464,10 +2464,10 @@ static void gfx_v6_0_init_cg(struct amdgpu_device *adev)
 
 static int gfx_v6_0_rlc_resume(struct amdgpu_device *adev)
 {
-	u32 i;
+	uint32_t i;
 	const struct rlc_firmware_header_v1_0 *hdr;
 	const __le32 *fw_data;
-	u32 fw_size;
+	uint32_t fw_size;
 
 
 	if (!adev->gfx.rlc_fw)
@@ -2509,7 +2509,7 @@ static int gfx_v6_0_rlc_resume(struct amdgpu_device *adev)
 
 static void gfx_v6_0_enable_cgcg(struct amdgpu_device *adev, bool enable)
 {
-	u32 data, orig, tmp;
+	uint32_t data, orig, tmp;
 
 	orig = data = RREG32(mmRLC_CGCG_CGLS_CTRL);
 
@@ -2549,7 +2549,7 @@ static void gfx_v6_0_enable_cgcg(struct amdgpu_device *adev, bool enable)
 static void gfx_v6_0_enable_mgcg(struct amdgpu_device *adev, bool enable)
 {
 
-	u32 data, orig, tmp = 0;
+	uint32_t data, orig, tmp = 0;
 
 	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_GFX_MGCG)) {
 		orig = data = RREG32(mmCGTS_SM_CTRL_REG);
@@ -2629,7 +2629,7 @@ static void gfx_v6_0_enable_sclk_slowdown_on_pd(struct amdgpu_device *adev,
 
 static void gfx_v6_0_enable_cp_pg(struct amdgpu_device *adev, bool enable)
 {
-	u32 data, orig;
+	uint32_t data, orig;
 
 	orig = data = RREG32(mmRLC_PG_CNTL);
 	if (enable && (adev->pg_flags & AMD_PG_SUPPORT_CP))
@@ -2647,10 +2647,10 @@ static void gfx_v6_0_enable_gds_pg(struct amdgpu_device *adev, bool enable)
 static void gfx_v6_0_init_cp_pg_table(struct amdgpu_device *adev)
 {
 	const __le32 *fw_data;
-	volatile u32 *dst_ptr;
+	volatile uint32_t *dst_ptr;
 	int me, i, max_me = 4;
-	u32 bo_offset = 0;
-	u32 table_offset, table_size;
+	uint32_t bo_offset = 0;
+	uint32_t table_offset, table_size;
 
 	if (adev->asic_type == CHIP_KAVERI)
 		max_me = 5;
@@ -2726,7 +2726,7 @@ static void gfx_v6_0_enable_gfx_cgpg(struct amdgpu_device *adev,
 
 static void gfx_v6_0_init_ao_cu_mask(struct amdgpu_device *adev)
 {
-	u32 tmp;
+	uint32_t tmp;
 
 	WREG32(mmRLC_PG_ALWAYS_ON_CU_MASK, adev->gfx.cu_info.ao_cu_mask);
 
@@ -2739,7 +2739,7 @@ static void gfx_v6_0_init_ao_cu_mask(struct amdgpu_device *adev)
 static void gfx_v6_0_enable_gfx_static_mgpg(struct amdgpu_device *adev,
 					    bool enable)
 {
-	u32 data, orig;
+	uint32_t data, orig;
 
 	orig = data = RREG32(mmRLC_PG_CNTL);
 	if (enable && (adev->pg_flags & AMD_PG_SUPPORT_GFX_SMG))
@@ -2753,7 +2753,7 @@ static void gfx_v6_0_enable_gfx_static_mgpg(struct amdgpu_device *adev,
 static void gfx_v6_0_enable_gfx_dynamic_mgpg(struct amdgpu_device *adev,
 					     bool enable)
 {
-	u32 data, orig;
+	uint32_t data, orig;
 
 	orig = data = RREG32(mmRLC_PG_CNTL);
 	if (enable && (adev->pg_flags & AMD_PG_SUPPORT_GFX_DMG))
@@ -2766,7 +2766,7 @@ static void gfx_v6_0_enable_gfx_dynamic_mgpg(struct amdgpu_device *adev,
 
 static void gfx_v6_0_init_gfx_cgpg(struct amdgpu_device *adev)
 {
-	u32 tmp;
+	uint32_t tmp;
 
 	WREG32(mmRLC_SAVE_AND_RESTORE_BASE, adev->gfx.rlc.save_restore_gpu_addr >> 8);
 	WREG32_FIELD(RLC_PG_CNTL, GFX_POWER_GATING_SRC, 1);
@@ -2786,9 +2786,9 @@ static void gfx_v6_0_update_gfx_pg(struct amdgpu_device *adev, bool enable)
 	gfx_v6_0_enable_gfx_dynamic_mgpg(adev, enable);
 }
 
-static u32 gfx_v6_0_get_csb_size(struct amdgpu_device *adev)
+static uint32_t gfx_v6_0_get_csb_size(struct amdgpu_device *adev)
 {
-	u32 count = 0;
+	uint32_t count = 0;
 	const struct cs_section_def *sect = NULL;
 	const struct cs_extent_def *ext = NULL;
 
@@ -2819,9 +2819,9 @@ static u32 gfx_v6_0_get_csb_size(struct amdgpu_device *adev)
 }
 
 static void gfx_v6_0_get_csb_buffer(struct amdgpu_device *adev,
-				    volatile u32 *buffer)
+				    volatile uint32_t *buffer)
 {
-	u32 count = 0, i;
+	uint32_t count = 0, i;
 	const struct cs_section_def *sect = NULL;
 	const struct cs_extent_def *ext = NULL;
 
@@ -3181,7 +3181,7 @@ static int gfx_v6_0_soft_reset(void *handle)
 static void gfx_v6_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev,
 						 enum amdgpu_interrupt_state state)
 {
-	u32 cp_int_cntl;
+	uint32_t cp_int_cntl;
 
 	switch (state) {
 	case AMDGPU_IRQ_STATE_DISABLE:
@@ -3203,7 +3203,7 @@ static void gfx_v6_0_set_compute_eop_interrupt_state(struct amdgpu_device *adev,
 						     int ring,
 						     enum amdgpu_interrupt_state state)
 {
-	u32 cp_int_cntl;
+	uint32_t cp_int_cntl;
 	switch (state){
 	case AMDGPU_IRQ_STATE_DISABLE:
 		if (ring == 0) {
@@ -3244,7 +3244,7 @@ static int gfx_v6_0_set_priv_reg_fault_state(struct amdgpu_device *adev,
 					     unsigned type,
 					     enum amdgpu_interrupt_state state)
 {
-	u32 cp_int_cntl;
+	uint32_t cp_int_cntl;
 
 	switch (state) {
 	case AMDGPU_IRQ_STATE_DISABLE:
@@ -3269,7 +3269,7 @@ static int gfx_v6_0_set_priv_inst_fault_state(struct amdgpu_device *adev,
 					      unsigned type,
 					      enum amdgpu_interrupt_state state)
 {
-	u32 cp_int_cntl;
+	uint32_t cp_int_cntl;
 
 	switch (state) {
 	case AMDGPU_IRQ_STATE_DISABLE:
@@ -3503,10 +3503,10 @@ static void gfx_v6_0_set_irq_funcs(struct amdgpu_device *adev)
 static void gfx_v6_0_get_cu_info(struct amdgpu_device *adev)
 {
 	int i, j, k, counter, active_cu_number = 0;
-	u32 mask, bitmap, ao_bitmap, ao_cu_mask = 0;
+	uint32_t mask, bitmap, ao_bitmap, ao_cu_mask = 0;
 	struct amdgpu_cu_info *cu_info = &adev->gfx.cu_info;
 	unsigned disable_masks[4 * 2];
-	u32 ao_cu_num;
+	uint32_t ao_cu_num;
 
 	if (adev->flags & AMD_IS_APU)
 		ao_cu_num = 2;
Signature · 6 lines
2.12.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): [email protected]

#10 lore raw

RE: [PATCH 5/5] drm/amd/amdgpu: Use modern 32/64-bit types in gfx6

Quoted 10 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Monday, May 15, 2017 9:49 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 5/5] drm/amd/amdgpu: Use modern 32/64-bit types in gfx6

Switch to uintNN_t from "uNN" types to be more consistent with modern coding styles.

I think technically the uNN types are native for the kernel. the c99 types are just for convenience. Seems like a lot of churn to me.

Alex

Quoted 533 lines
---
 drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 150 +++++++++++++++++------
-----------
 1 file changed, 75 insertions(+), 75 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -2
index 1351f9230fcd..a6c88f98df08 100644
@@ -68,8 +68,8 @@ MODULE_FIRMWARE("radeon/hainan_me.bin");
 MODULE_FIRMWARE("radeon/hainan_ce.bin");
 MODULE_FIRMWARE("radeon/hainan_rlc.bin");
 
-static u32 gfx_v6_0_get_csb_size(struct amdgpu_device *adev);
-static void gfx_v6_0_get_csb_buffer(struct amdgpu_device *adev, volatile
 u32 *buffer);
+static uint32_t gfx_v6_0_get_csb_size(struct amdgpu_device *adev);
+static void gfx_v6_0_get_csb_buffer(struct amdgpu_device *adev, volatile
 uint32_t *buffer);
 //static void gfx_v6_0_init_cp_pg_table(struct amdgpu_device *adev);

static void gfx_v6_0_init_pg(struct amdgpu_device *adev);

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
@@ -83,7 +83,7 @@ static void gfx_v6_0_init_pg(struct amdgpu_device
 *adev);
 #define MACRO_TILE_ASPECT(x)				((x) << 18)
 #define NUM_BANKS(x)					((x) << 20)
 
-static const u32 verde_rlc_save_restore_register_list[] =
+static const uint32_t verde_rlc_save_restore_register_list[] =
 {
 	(0x8000 << 16) | (0x98f4 >> 2),
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -2
 	0x00000000,
@@ -393,8 +393,8 @@ static int gfx_v6_0_init_microcode(struct
 amdgpu_device *adev)
 
 static void gfx_v6_0_tiling_mode_table_init(struct amdgpu_device *adev)
 {
-	const u32 num_tile_mode_states = ARRAY_SIZE(adev-
 >gfx.config.tile_mode_array);
-	u32 reg_offset, split_equal_to_row_size, *tilemode;
+	const uint32_t num_tile_mode_states = ARRAY_SIZE(adev-
 >gfx.config.tile_mode_array);
+	uint32_t reg_offset, split_equal_to_row_size, *tilemode;

memset(adev->gfx.config.tile_mode_array, 0, sizeof(adev-

Quoted 1 line

gfx.config.tile_mode_array));

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -3
 	tilemode = adev->gfx.config.tile_mode_array;
@@ -1089,10 +1089,10 @@ static void
 gfx_v6_0_tiling_mode_table_init(struct amdgpu_device *adev)
 	}
 }
 
-static void gfx_v6_0_select_se_sh(struct amdgpu_device *adev, u32
 se_num,
-				  u32 sh_num, u32 instance)
+static void gfx_v6_0_select_se_sh(struct amdgpu_device *adev, uint32_t
 se_num,
+				  uint32_t sh_num, uint32_t instance)
 {
-	u32 data;
+	uint32_t data;
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -0
 	if (instance == 0xffffffff)
 		data = REG_SET_FIELD(0, GRBM_GFX_INDEX,

INSTANCE_BROADCAST_WRITES, 1);

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -4
@@ -1114,14 +1114,14 @@ static void gfx_v6_0_select_se_sh(struct
 amdgpu_device *adev, u32 se_num,
 	WREG32(mmGRBM_GFX_INDEX, data);
 }
 
-static u32 gfx_v6_0_create_bitmask(u32 bit_width)
+static uint32_t gfx_v6_0_create_bitmask(uint32_t bit_width)
 {
-	return (u32)(((u64)1 << bit_width) - 1);
+	return (uint32_t)(((uint64_t)1 << bit_width) - 1);
 }
 
-static u32 gfx_v6_0_get_rb_active_bitmap(struct amdgpu_device *adev)
+static uint32_t gfx_v6_0_get_rb_active_bitmap(struct amdgpu_device
 *adev)
 {
-	u32 data, mask;
+	uint32_t data, mask;
 
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	data = RREG32(mmCC_RB_BACKEND_DISABLE) |
 		RREG32(mmGC_USER_RB_BACKEND_DISABLE);
@@ -1134,7 +1134,7 @@ static u32 gfx_v6_0_get_rb_active_bitmap(struct
 amdgpu_device *adev)
 	return ~data & mask;
 }
 
-static void gfx_v6_0_raster_config(struct amdgpu_device *adev, u32
 *rconf)
+static void gfx_v6_0_raster_config(struct amdgpu_device *adev, uint32_t
 *rconf)

{

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	switch (adev->asic_type) {
 	case CHIP_TAHITI:
@@ -1167,7 +1167,7 @@ static void gfx_v6_0_raster_config(struct
 amdgpu_device *adev, u32 *rconf)
 }
 
 static void gfx_v6_0_write_harvested_raster_configs(struct amdgpu_device
 *adev,
-						    u32 raster_config, unsigned
 rb_mask,
+						    uint32_t raster_config,

unsigned rb_mask,

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -0
 						    unsigned num_rb)
 {
 	unsigned sh_per_se = max_t(unsigned, adev-
Quoted 1 line

gfx.config.max_sh_per_se, 1);

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +0 -4
@@ -1259,10 +1259,10 @@ static void
 gfx_v6_0_write_harvested_raster_configs(struct amdgpu_device *adev,
 static void gfx_v6_0_setup_rb(struct amdgpu_device *adev)
 {
 	int i, j;
-	u32 data;
-	u32 raster_config = 0;
-	u32 active_rbs = 0;
-	u32 rb_bitmap_width_per_sh = adev-
Quoted 1 line

gfx.config.max_backends_per_se /

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +4 -0
+	uint32_t data;
+	uint32_t raster_config = 0;
+	uint32_t active_rbs = 0;
+	uint32_t rb_bitmap_width_per_sh = adev-
Quoted 1 line

gfx.config.max_backends_per_se /

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -2
 					adev->gfx.config.max_sh_per_se;
 	unsigned num_rb_pipes;
@@ -1311,9 +1311,9 @@ static void gfx_v6_0_setup_rb(struct
 amdgpu_device *adev)
 }
 
 static void gfx_v6_0_set_user_cu_inactive_bitmap(struct amdgpu_device
 *adev,
-						 u32 bitmap)
+						 uint32_t bitmap)
 {
-	u32 data;
+	uint32_t data;
 
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -2
 	if (!bitmap)
 		return;
@@ -1324,9 +1324,9 @@ static void
 gfx_v6_0_set_user_cu_inactive_bitmap(struct amdgpu_device *adev,
 	WREG32(mmGC_USER_SHADER_ARRAY_CONFIG, data);
 }
 
-static u32 gfx_v6_0_get_cu_enabled(struct amdgpu_device *adev)
+static uint32_t gfx_v6_0_get_cu_enabled(struct amdgpu_device *adev)
 {
-	u32 data, mask;
+	uint32_t data, mask;
 
 	data = RREG32(mmCC_GC_SHADER_ARRAY_CONFIG) |
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -2
 		RREG32(mmGC_USER_SHADER_ARRAY_CONFIG);
@@ -1339,8 +1339,8 @@ static u32 gfx_v6_0_get_cu_enabled(struct
 amdgpu_device *adev)
 static void gfx_v6_0_setup_spi(struct amdgpu_device *adev)
 {
 	int i, j, k;
-	u32 data, mask;
-	u32 active_cu = 0;
+	uint32_t data, mask;
+	uint32_t active_cu = 0;
 
 	mutex_lock(&adev->grbm_idx_mutex);
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +5 -5
 	for (i = 0; i < adev->gfx.config.max_shader_engines; i++) {
@@ -1371,11 +1371,11 @@ static void gfx_v6_0_config_init(struct
 amdgpu_device *adev)
 
 static void gfx_v6_0_gpu_init(struct amdgpu_device *adev)
 {
-	u32 gb_addr_config = 0;
-	u32 mc_shared_chmap, mc_arb_ramcfg;
-	u32 sx_debug_1;
-	u32 hdp_host_path_cntl;
-	u32 tmp;
+	uint32_t gb_addr_config = 0;
+	uint32_t mc_shared_chmap, mc_arb_ramcfg;
+	uint32_t sx_debug_1;
+	uint32_t hdp_host_path_cntl;
+	uint32_t tmp;
 
 	switch (adev->asic_type) {
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -2
 	case CHIP_TAHITI:
@@ -1661,8 +1661,8 @@ static void
 gfx_v6_0_ring_emit_hdp_invalidate(struct amdgpu_ring *ring)
 	amdgpu_ring_write(ring, 0x1);
 }
 
-static void gfx_v6_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr,
-				     u64 seq, unsigned flags)
+static void gfx_v6_0_ring_emit_fence(struct amdgpu_ring *ring, uint64_t
 addr,
+				     uint64_t seq, unsigned flags)
 {
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	bool write64bit = flags & AMDGPU_FENCE_FLAG_64BIT;
 	bool int_sel = flags & AMDGPU_FENCE_FLAG_INT;
@@ -1693,7 +1693,7 @@ static void gfx_v6_0_ring_emit_ib(struct
 amdgpu_ring *ring,
 				  struct amdgpu_ib *ib,
 				  unsigned vm_id, bool ctx_switch)
 {
-	u32 header, control = 0;
+	uint32_t header, control = 0;
 
 	/* insert SWITCH_BUFFER packet before first IB in the ring frame */
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	if (ctx_switch) {
@@ -1809,7 +1809,7 @@ static int gfx_v6_0_cp_gfx_load_microcode(struct
 amdgpu_device *adev)
 	const struct gfx_firmware_header_v1_0 *ce_hdr;
 	const struct gfx_firmware_header_v1_0 *me_hdr;
 	const __le32 *fw_data;
-	u32 fw_size;
+	uint32_t fw_size;
 
 	if (!adev->gfx.me_fw || !adev->gfx.pfp_fw || !adev->gfx.ce_fw)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -3
 		return -EINVAL;
@@ -1925,10 +1925,10 @@ static int gfx_v6_0_cp_gfx_start(struct
 amdgpu_device *adev)
 static int gfx_v6_0_cp_gfx_resume(struct amdgpu_device *adev)
 {
 	struct amdgpu_ring *ring;
-	u32 tmp;
-	u32 rb_bufsz;
+	uint32_t tmp;
+	uint32_t rb_bufsz;
 	int r;
-	u64 rptr_addr;
+	uint64_t rptr_addr;
 
 	WREG32(mmCP_SEM_WAIT_TIMER, 0x0);
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +5 -5
 	WREG32(mmCP_SEM_INCOMPLETE_TIMER_CNTL, 0x0);
@@ -1979,12 +1979,12 @@ static int gfx_v6_0_cp_gfx_resume(struct
 amdgpu_device *adev)
 	return 0;
 }
 
-static u64 gfx_v6_0_ring_get_rptr(struct amdgpu_ring *ring)
+static uint64_t gfx_v6_0_ring_get_rptr(struct amdgpu_ring *ring)
 {
 	return ring->adev->wb.wb[ring->rptr_offs];
 }
 
-static u64 gfx_v6_0_ring_get_wptr(struct amdgpu_ring *ring)
+static uint64_t gfx_v6_0_ring_get_wptr(struct amdgpu_ring *ring)
 {
 	struct amdgpu_device *adev = ring->adev;
@@ -2025,10 +2025,10 @@ static void
 gfx_v6_0_ring_set_wptr_compute(struct amdgpu_ring *ring)
 static int gfx_v6_0_cp_compute_resume(struct amdgpu_device *adev)
 {
 	struct amdgpu_ring *ring;
-	u32 tmp;
-	u32 rb_bufsz;
+	uint32_t tmp;
+	uint32_t rb_bufsz;
 	int i, r;
-	u64 rptr_addr;
+	uint64_t rptr_addr;
 
 	/* ring1  - compute only */
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -2
 	/* Set ring buffer size */
@@ -2098,8 +2098,8 @@ static int gfx_v6_0_cp_load_microcode(struct
 amdgpu_device *adev)
 static void gfx_v6_0_enable_gui_idle_interrupt(struct amdgpu_device
 *adev,
 					       bool enable)
 {
-	u32 tmp = RREG32(mmCP_INT_CNTL_RING0);
-	u32 mask;
+	uint32_t tmp = RREG32(mmCP_INT_CNTL_RING0);
+	uint32_t mask;
 	int i;
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +5 -5
 	if (enable)
@@ -2259,16 +2259,16 @@ static void gfx_v6_0_rlc_fini(struct
 amdgpu_device *adev)
 
 static int gfx_v6_0_rlc_init(struct amdgpu_device *adev)
 {
-	const u32 *src_ptr;
-	volatile u32 *dst_ptr;
-	u32 dws, i;
-	u64 reg_list_mc_addr;
+	const uint32_t *src_ptr;
+	volatile uint32_t *dst_ptr;
+	uint32_t dws, i;
+	uint64_t reg_list_mc_addr;
 	const struct cs_section_def *cs_data;
 	int r;
 
 	adev->gfx.rlc.reg_list = verde_rlc_save_restore_register_list;
 	adev->gfx.rlc.reg_list_size =
-
 	(u32)ARRAY_SIZE(verde_rlc_save_restore_register_list);
+
 	(uint32_t)ARRAY_SIZE(verde_rlc_save_restore_register_list);
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +5 -5
 	adev->gfx.rlc.cs_data = si_cs_data;
 	src_ptr = adev->gfx.rlc.reg_list;
@@ -2397,18 +2397,18 @@ static void gfx_v6_0_wait_for_rlc_serdes(struct
 amdgpu_device *adev)
 	}
 }
 
-static void gfx_v6_0_update_rlc(struct amdgpu_device *adev, u32 rlc)
+static void gfx_v6_0_update_rlc(struct amdgpu_device *adev, uint32_t rlc)
 {
-	u32 tmp;
+	uint32_t tmp;
 
 	tmp = RREG32(mmRLC_CNTL);
 	if (tmp != rlc)
 		WREG32(mmRLC_CNTL, rlc);
 }
 
-static u32 gfx_v6_0_halt_rlc(struct amdgpu_device *adev)
+static uint32_t gfx_v6_0_halt_rlc(struct amdgpu_device *adev)
 {
-	u32 data, orig;
+	uint32_t data, orig;
 
 	orig = data = RREG32(mmRLC_CNTL);
@@ -2449,7 +2449,7 @@ static void gfx_v6_0_rlc_reset(struct
 amdgpu_device *adev)
 
 static bool gfx_v6_0_lbpw_supported(struct amdgpu_device *adev)
 {
-	u32 tmp;
+	uint32_t tmp;
 
 	/* Enable LBPW only for DDR3 */
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -2
 	tmp = RREG32(mmMC_SEQ_MISC0);
@@ -2464,10 +2464,10 @@ static void gfx_v6_0_init_cg(struct
 amdgpu_device *adev)
 
 static int gfx_v6_0_rlc_resume(struct amdgpu_device *adev)
 {
-	u32 i;
+	uint32_t i;
 	const struct rlc_firmware_header_v1_0 *hdr;
 	const __le32 *fw_data;
-	u32 fw_size;
+	uint32_t fw_size;
 
 
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	if (!adev->gfx.rlc_fw)
@@ -2509,7 +2509,7 @@ static int gfx_v6_0_rlc_resume(struct
 amdgpu_device *adev)
 
 static void gfx_v6_0_enable_cgcg(struct amdgpu_device *adev, bool
 enable)
 {
-	u32 data, orig, tmp;
+	uint32_t data, orig, tmp;
 
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	orig = data = RREG32(mmRLC_CGCG_CGLS_CTRL);
@@ -2549,7 +2549,7 @@ static void gfx_v6_0_enable_cgcg(struct
 amdgpu_device *adev, bool enable)
 static void gfx_v6_0_enable_mgcg(struct amdgpu_device *adev, bool
 enable)
 {
 
-	u32 data, orig, tmp = 0;
+	uint32_t data, orig, tmp = 0;
 
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	if (enable && (adev->cg_flags & AMD_CG_SUPPORT_GFX_MGCG)) {
 		orig = data = RREG32(mmCGTS_SM_CTRL_REG);
@@ -2629,7 +2629,7 @@ static void
 gfx_v6_0_enable_sclk_slowdown_on_pd(struct amdgpu_device *adev,
 
 static void gfx_v6_0_enable_cp_pg(struct amdgpu_device *adev, bool
 enable)
 {
-	u32 data, orig;
+	uint32_t data, orig;
 
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +3 -3
 	orig = data = RREG32(mmRLC_PG_CNTL);
 	if (enable && (adev->pg_flags & AMD_PG_SUPPORT_CP))
@@ -2647,10 +2647,10 @@ static void gfx_v6_0_enable_gds_pg(struct
 amdgpu_device *adev, bool enable)
 static void gfx_v6_0_init_cp_pg_table(struct amdgpu_device *adev)
 {
 	const __le32 *fw_data;
-	volatile u32 *dst_ptr;
+	volatile uint32_t *dst_ptr;
 	int me, i, max_me = 4;
-	u32 bo_offset = 0;
-	u32 table_offset, table_size;
+	uint32_t bo_offset = 0;
+	uint32_t table_offset, table_size;
 
 	if (adev->asic_type == CHIP_KAVERI)
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 		max_me = 5;
@@ -2726,7 +2726,7 @@ static void gfx_v6_0_enable_gfx_cgpg(struct
 amdgpu_device *adev,
 
 static void gfx_v6_0_init_ao_cu_mask(struct amdgpu_device *adev)
 {
-	u32 tmp;
+	uint32_t tmp;
 
 	WREG32(mmRLC_PG_ALWAYS_ON_CU_MASK, adev-
Quoted 1 line

gfx.cu_info.ao_cu_mask);

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
@@ -2739,7 +2739,7 @@ static void gfx_v6_0_init_ao_cu_mask(struct
 amdgpu_device *adev)
 static void gfx_v6_0_enable_gfx_static_mgpg(struct amdgpu_device *adev,
 					    bool enable)
 {
-	u32 data, orig;
+	uint32_t data, orig;
 
 	orig = data = RREG32(mmRLC_PG_CNTL);
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	if (enable && (adev->pg_flags & AMD_PG_SUPPORT_GFX_SMG))
@@ -2753,7 +2753,7 @@ static void
 gfx_v6_0_enable_gfx_static_mgpg(struct amdgpu_device *adev,
 static void gfx_v6_0_enable_gfx_dynamic_mgpg(struct amdgpu_device
 *adev,
 					     bool enable)
 {
-	u32 data, orig;
+	uint32_t data, orig;
 
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	orig = data = RREG32(mmRLC_PG_CNTL);
 	if (enable && (adev->pg_flags & AMD_PG_SUPPORT_GFX_DMG))
@@ -2766,7 +2766,7 @@ static void
 gfx_v6_0_enable_gfx_dynamic_mgpg(struct amdgpu_device *adev,
 
 static void gfx_v6_0_init_gfx_cgpg(struct amdgpu_device *adev)
 {
-	u32 tmp;
+	uint32_t tmp;
 
 	WREG32(mmRLC_SAVE_AND_RESTORE_BASE, adev-
Quoted 1 line

gfx.rlc.save_restore_gpu_addr >> 8);

drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +5 -5
 	WREG32_FIELD(RLC_PG_CNTL, GFX_POWER_GATING_SRC, 1);
@@ -2786,9 +2786,9 @@ static void gfx_v6_0_update_gfx_pg(struct
 amdgpu_device *adev, bool enable)
 	gfx_v6_0_enable_gfx_dynamic_mgpg(adev, enable);
 }
 
-static u32 gfx_v6_0_get_csb_size(struct amdgpu_device *adev)
+static uint32_t gfx_v6_0_get_csb_size(struct amdgpu_device *adev)
 {
-	u32 count = 0;
+	uint32_t count = 0;
 	const struct cs_section_def *sect = NULL;
 	const struct cs_extent_def *ext = NULL;
@@ -2819,9 +2819,9 @@ static u32 gfx_v6_0_get_csb_size(struct
 amdgpu_device *adev)
 }
 
 static void gfx_v6_0_get_csb_buffer(struct amdgpu_device *adev,
-				    volatile u32 *buffer)
+				    volatile uint32_t *buffer)
 {
-	u32 count = 0, i;
+	uint32_t count = 0, i;
 	const struct cs_section_def *sect = NULL;
 	const struct cs_extent_def *ext = NULL;
@@ -3181,7 +3181,7 @@ static int gfx_v6_0_soft_reset(void *handle)
 static void gfx_v6_0_set_gfx_eop_interrupt_state(struct amdgpu_device
 *adev,
 						 enum
 amdgpu_interrupt_state state)
 {
-	u32 cp_int_cntl;
+	uint32_t cp_int_cntl;
 
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	switch (state) {
 	case AMDGPU_IRQ_STATE_DISABLE:
@@ -3203,7 +3203,7 @@ static void
 gfx_v6_0_set_compute_eop_interrupt_state(struct amdgpu_device *adev,
 						     int ring,
 						     enum
 amdgpu_interrupt_state state)
 {
-	u32 cp_int_cntl;
+	uint32_t cp_int_cntl;
 	switch (state){
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	case AMDGPU_IRQ_STATE_DISABLE:
 		if (ring == 0) {
@@ -3244,7 +3244,7 @@ static int gfx_v6_0_set_priv_reg_fault_state(struct
 amdgpu_device *adev,
 					     unsigned type,
 					     enum amdgpu_interrupt_state
 state)
 {
-	u32 cp_int_cntl;
+	uint32_t cp_int_cntl;
 
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
 	switch (state) {
 	case AMDGPU_IRQ_STATE_DISABLE:
@@ -3269,7 +3269,7 @@ static int gfx_v6_0_set_priv_inst_fault_state(struct
 amdgpu_device *adev,
 					      unsigned type,
 					      enum amdgpu_interrupt_state
 state)
 {
-	u32 cp_int_cntl;
+	uint32_t cp_int_cntl;
 
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +2 -2
 	switch (state) {
 	case AMDGPU_IRQ_STATE_DISABLE:
@@ -3503,10 +3503,10 @@ static void gfx_v6_0_set_irq_funcs(struct
 amdgpu_device *adev)
 static void gfx_v6_0_get_cu_info(struct amdgpu_device *adev)
 {
 	int i, j, k, counter, active_cu_number = 0;
-	u32 mask, bitmap, ao_bitmap, ao_cu_mask = 0;
+	uint32_t mask, bitmap, ao_bitmap, ao_cu_mask = 0;
 	struct amdgpu_cu_info *cu_info = &adev->gfx.cu_info;
 	unsigned disable_masks[4 * 2];
-	u32 ao_cu_num;
+	uint32_t ao_cu_num;
 
 	if (adev->flags & AMD_IS_APU)

ao_cu_num = 2;
--
2.12.0

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): BN6PR12MB16522D18D14FFC069912ECF2F7F90-/b2+HYfkarQqUD6E6FAiowdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org

#12 lore raw

Re: [PATCH 5/5] drm/amd/amdgpu: Use modern 32/64-bit types in gfx6

Quoted 8 lines · Alexander
Quoted 8 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Tom St Denis
Sent: Monday, May 15, 2017 9:49 AM
To: [email protected]
Cc: StDenis, Tom
Subject: [PATCH 5/5] drm/amd/amdgpu: Use modern 32/64-bit types in gfx6

Quoted 6 lines
Quoted 2 lines

Switch to uintNN_t from "uNN" types to be more consistent with modern coding styles.

I think technically the uNN types are native for the kernel. the c99 types are just for convenience. Seems like a lot of churn to me.

Alex

Fair enough but amdgpu is littered with files that use one or the other or sometimes both. :-)

I agree it's low priority which is why I was attacking the lesser active SI code :-)

Though I'm not offended if they're NAK'ed either way.

Cheers,
Tom
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx