Change-Id: Ib8b66559d662cbe8a9f40f7405a4a052c189f604 Signed-off-by: Flora Cui <flora....@amd.com> --- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 330 ++++++++++++++++++++-------------- 1 file changed, 191 insertions(+), 139 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
index ce75d46..4a633a3 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
@@ -708,238 +708,290 @@ static void gfx_v6_0_tiling_mode_table_init(struct
amdgpu_device *adev)
for (reg_offset = 0; reg_offset < num_tile_mode_states;
reg_offset++) {
switch (reg_offset) {
case 0:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+ NUM_BANKS(ADDR_SURF_16_BANK));
break;
case 1:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+ NUM_BANKS(ADDR_SURF_16_BANK));
break;
case 2:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+ NUM_BANKS(ADDR_SURF_16_BANK));
break;
case 3:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_128B) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
+ 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_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4));
+
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 =
(ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+ 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 =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
-
TILE_SPLIT(split_equal_to_row_size) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
+ 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_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+
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 =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
-
TILE_SPLIT(split_equal_to_row_size) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
+ 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_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+
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 =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DEPTH_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
-
TILE_SPLIT(split_equal_to_row_size) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
+ 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_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4));
+
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) |
-
MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+ gb_tile_moden =
(ARRAY_MODE(ARRAY_LINEAR_ALIGNED));
break;
case 9:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+ 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 =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4) |
+ NUM_BANKS(ADDR_SURF_16_BANK));
break;
case 11:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+ NUM_BANKS(ADDR_SURF_16_BANK));
break;
case 12:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_DISPLAY_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+ NUM_BANKS(ADDR_SURF_16_BANK));
break;
case 13:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_1D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
-
TILE_SPLIT(ADDR_SURF_TILE_SPLIT_64B) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+ 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 =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+ NUM_BANKS(ADDR_SURF_16_BANK));
break;
case 15:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+ NUM_BANKS(ADDR_SURF_16_BANK));
break;
case 16:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2) |
+ NUM_BANKS(ADDR_SURF_16_BANK));
break;
case 17:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
- PIPE_CONFIG(ADDR_SURF_P4_8x16)
|
-
TILE_SPLIT(split_equal_to_row_size) |
+ 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));
+
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 =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_2) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+ NUM_BANKS(ADDR_SURF_8_BANK));
break;
case 22:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
-
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
-
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_4) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_4));
+
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 =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_2) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+ NUM_BANKS(ADDR_SURF_8_BANK));
break;
case 24:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+ 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) |
- NUM_BANKS(ADDR_SURF_16_BANK) |
BANK_WIDTH(ADDR_SURF_BANK_WIDTH_1) |
BANK_HEIGHT(ADDR_SURF_BANK_HEIGHT_1) |
-
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_2));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+ NUM_BANKS(ADDR_SURF_8_BANK));
break;
case 25:
- gb_tile_moden =
(ARRAY_MODE(ARRAY_2D_TILED_THIN1) |
-
MICRO_TILE_MODE(ADDR_SURF_THIN_MICRO_TILING) |
-
PIPE_CONFIG(ADDR_SURF_P8_32x32_8x16) |
+ 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) |
- NUM_BANKS(ADDR_SURF_8_BANK) |
+
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));
+
MACRO_TILE_ASPECT(ADDR_SURF_MACRO_ASPECT_1) |
+ NUM_BANKS(ADDR_SURF_4_BANK));
break;
default:
- gb_tile_moden = 0;
- break;
+ continue;
}
adev->gfx.config.tile_mode_array[reg_offset] =
gb_tile_moden;
WREG32(mmGB_TILE_MODE0 + reg_offset, gb_tile_moden);
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
