| @@ -867,200 +867,6 @@ void dce6_bandwidth_update(struct radeon_device *rdev) · 866 unmodified lines |
| 867 | 867 | /* |
| 868 | 868 | * Core functions |
| 869 | 869 | */ |
| 870 | | −static u32 si_get_tile_pipe_to_backend_map(struct radeon_device *rdev, |
| 871 | | − u32 num_tile_pipes, |
| 872 | | − u32 num_backends_per_asic, |
| 873 | | − u32 *backend_disable_mask_per_asic, |
| 874 | | − u32 num_shader_engines) |
| 875 | | −{ |
| 876 | | − u32 backend_map = 0; |
| 877 | | − u32 enabled_backends_mask = 0; |
| 878 | | − u32 enabled_backends_count = 0; |
| 879 | | − u32 num_backends_per_se; |
| 880 | | − u32 cur_pipe; |
| 881 | | − u32 swizzle_pipe[SI_MAX_PIPES]; |
| 882 | | − u32 cur_backend = 0; |
| 883 | | − u32 i; |
| 884 | | − bool force_no_swizzle; |
| 885 | | − |
| 886 | | − /* force legal values */ |
| 887 | | − if (num_tile_pipes < 1) |
| 888 | | − num_tile_pipes = 1; |
| 889 | | − if (num_tile_pipes > rdev->config.si.max_tile_pipes) |
| 890 | | − num_tile_pipes = rdev->config.si.max_tile_pipes; |
| 891 | | − if (num_shader_engines < 1) |
| 892 | | − num_shader_engines = 1; |
| 893 | | − if (num_shader_engines > rdev->config.si.max_shader_engines) |
| 894 | | − num_shader_engines = rdev->config.si.max_shader_engines; |
| 895 | | − if (num_backends_per_asic < num_shader_engines) |
| 896 | | − num_backends_per_asic = num_shader_engines; |
| 897 | | − if (num_backends_per_asic > (rdev->config.si.max_backends_per_se * num_shader_engines)) |
| 898 | | − num_backends_per_asic = rdev->config.si.max_backends_per_se * num_shader_engines; |
| 899 | | − |
| 900 | | − /* make sure we have the same number of backends per se */ |
| 901 | | − num_backends_per_asic = ALIGN(num_backends_per_asic, num_shader_engines); |
| 902 | | − /* set up the number of backends per se */ |
| 903 | | − num_backends_per_se = num_backends_per_asic / num_shader_engines; |
| 904 | | − if (num_backends_per_se > rdev->config.si.max_backends_per_se) { |
| 905 | | − num_backends_per_se = rdev->config.si.max_backends_per_se; |
| 906 | | − num_backends_per_asic = num_backends_per_se * num_shader_engines; |
| 907 | | − } |
| 908 | | − |
| 909 | | − /* create enable mask and count for enabled backends */ |
| 910 | | − for (i = 0; i < SI_MAX_BACKENDS; ++i) { |
| 911 | | − if (((*backend_disable_mask_per_asic >> i) & 1) == 0) { |
| 912 | | − enabled_backends_mask |= (1 << i); |
| 913 | | − ++enabled_backends_count; |
| 914 | | − } |
| 915 | | − if (enabled_backends_count == num_backends_per_asic) |
| 916 | | − break; |
| 917 | | − } |
| 918 | | − |
| 919 | | − /* force the backends mask to match the current number of backends */ |
| 920 | | − if (enabled_backends_count != num_backends_per_asic) { |
| 921 | | − u32 this_backend_enabled; |
| 922 | | − u32 shader_engine; |
| 923 | | − u32 backend_per_se; |
| 924 | | − |
| 925 | | − enabled_backends_mask = 0; |
| 926 | | − enabled_backends_count = 0; |
| 927 | | − *backend_disable_mask_per_asic = SI_MAX_BACKENDS_MASK; |
| 928 | | − for (i = 0; i < SI_MAX_BACKENDS; ++i) { |
| 929 | | − /* calc the current se */ |
| 930 | | − shader_engine = i / rdev->config.si.max_backends_per_se; |
| 931 | | − /* calc the backend per se */ |
| 932 | | − backend_per_se = i % rdev->config.si.max_backends_per_se; |
| 933 | | − /* default to not enabled */ |
| 934 | | − this_backend_enabled = 0; |
| 935 | | − if ((shader_engine < num_shader_engines) && |
| 936 | | − (backend_per_se < num_backends_per_se)) |
| 937 | | − this_backend_enabled = 1; |
| 938 | | − if (this_backend_enabled) { |
| 939 | | − enabled_backends_mask |= (1 << i); |
| 940 | | − *backend_disable_mask_per_asic &= ~(1 << i); |
| 941 | | − ++enabled_backends_count; |
| 942 | | − } |
| 943 | | − } |
| 944 | | − } |
| 945 | | − |
| 946 | | − |
| 947 | | − memset((uint8_t *)&swizzle_pipe[0], 0, sizeof(u32) * SI_MAX_PIPES); |
| 948 | | − switch (rdev->family) { |
| 949 | | − case CHIP_TAHITI: |
| 950 | | − case CHIP_PITCAIRN: |
| 951 | | − case CHIP_VERDE: |
| 952 | | − force_no_swizzle = true; |
| 953 | | − break; |
| 954 | | − default: |
| 955 | | − force_no_swizzle = false; |
| 956 | | − break; |
| 957 | | − } |
| 958 | | − if (force_no_swizzle) { |
| 959 | | − bool last_backend_enabled = false; |
| 960 | | − |
| 961 | | − force_no_swizzle = false; |
| 962 | | − for (i = 0; i < SI_MAX_BACKENDS; ++i) { |
| 963 | | − if (((enabled_backends_mask >> i) & 1) == 1) { |
| 964 | | − if (last_backend_enabled) |
| 965 | | − force_no_swizzle = true; |
| 966 | | − last_backend_enabled = true; |
| 967 | | − } else |
| 968 | | − last_backend_enabled = false; |
| 969 | | − } |
| 970 | | − } |
| 971 | | − |
| 972 | | − switch (num_tile_pipes) { |
| 973 | | − case 1: |
| 974 | | − case 3: |
| 975 | | − case 5: |
| 976 | | − case 7: |
| 977 | | − DRM_ERROR("odd number of pipes!\n"); |
| 978 | | − break; |
| 979 | | − case 2: |
| 980 | | − swizzle_pipe[0] = 0; |
| 981 | | − swizzle_pipe[1] = 1; |
| 982 | | − break; |
| 983 | | − case 4: |
| 984 | | − if (force_no_swizzle) { |
| 985 | | − swizzle_pipe[0] = 0; |
| 986 | | − swizzle_pipe[1] = 1; |
| 987 | | − swizzle_pipe[2] = 2; |
| 988 | | − swizzle_pipe[3] = 3; |
| 989 | | − } else { |
| 990 | | − swizzle_pipe[0] = 0; |
| 991 | | − swizzle_pipe[1] = 2; |
| 992 | | − swizzle_pipe[2] = 1; |
| 993 | | − swizzle_pipe[3] = 3; |
| 994 | | − } |
| 995 | | − break; |
| 996 | | − case 6: |
| 997 | | − if (force_no_swizzle) { |
| 998 | | − swizzle_pipe[0] = 0; |
| 999 | | − swizzle_pipe[1] = 1; |
| 1000 | | − swizzle_pipe[2] = 2; |
| 1001 | | − swizzle_pipe[3] = 3; |
| 1002 | | − swizzle_pipe[4] = 4; |
| 1003 | | − swizzle_pipe[5] = 5; |
| 1004 | | − } else { |
| 1005 | | − swizzle_pipe[0] = 0; |
| 1006 | | − swizzle_pipe[1] = 2; |
| 1007 | | − swizzle_pipe[2] = 4; |
| 1008 | | − swizzle_pipe[3] = 1; |
| 1009 | | − swizzle_pipe[4] = 3; |
| 1010 | | − swizzle_pipe[5] = 5; |
| 1011 | | − } |
| 1012 | | − break; |
| 1013 | | − case 8: |
| 1014 | | − if (force_no_swizzle) { |
| 1015 | | − swizzle_pipe[0] = 0; |
| 1016 | | − swizzle_pipe[1] = 1; |
| 1017 | | − swizzle_pipe[2] = 2; |
| 1018 | | − swizzle_pipe[3] = 3; |
| 1019 | | − swizzle_pipe[4] = 4; |
| 1020 | | − swizzle_pipe[5] = 5; |
| 1021 | | − swizzle_pipe[6] = 6; |
| 1022 | | − swizzle_pipe[7] = 7; |
| 1023 | | − } else { |
| 1024 | | − swizzle_pipe[0] = 0; |
| 1025 | | − swizzle_pipe[1] = 2; |
| 1026 | | − swizzle_pipe[2] = 4; |
| 1027 | | − swizzle_pipe[3] = 6; |
| 1028 | | − swizzle_pipe[4] = 1; |
| 1029 | | − swizzle_pipe[5] = 3; |
| 1030 | | − swizzle_pipe[6] = 5; |
| 1031 | | − swizzle_pipe[7] = 7; |
| 1032 | | − } |
| 1033 | | − break; |
| 1034 | | − } |
| 1035 | | − |
| 1036 | | − for (cur_pipe = 0; cur_pipe < num_tile_pipes; ++cur_pipe) { |
| 1037 | | − while (((1 << cur_backend) & enabled_backends_mask) == 0) |
| 1038 | | − cur_backend = (cur_backend + 1) % SI_MAX_BACKENDS; |
| 1039 | | − |
| 1040 | | − backend_map |= (((cur_backend & 0xf) << (swizzle_pipe[cur_pipe] * 4))); |
| 1041 | | − |
| 1042 | | − cur_backend = (cur_backend + 1) % SI_MAX_BACKENDS; |
| 1043 | | − } |
| 1044 | | − |
| 1045 | | − return backend_map; |
| 1046 | | −} |
| 1047 | | − |
| 1048 | | −static u32 si_get_disable_mask_per_asic(struct radeon_device *rdev, |
| 1049 | | − u32 disable_mask_per_se, |
| 1050 | | − u32 max_disable_mask_per_se, |
| 1051 | | − u32 num_shader_engines) |
| 1052 | | −{ |
| 1053 | | − u32 disable_field_width_per_se = r600_count_pipe_bits(disable_mask_per_se); |
| 1054 | | − u32 disable_mask_per_asic = disable_mask_per_se & max_disable_mask_per_se; |
| 1055 | | − |
| 1056 | | − if (num_shader_engines == 1) |
| 1057 | | − return disable_mask_per_asic; |
| 1058 | | − else if (num_shader_engines == 2) |
| 1059 | | − return disable_mask_per_asic | (disable_mask_per_asic << disable_field_width_per_se); |
| 1060 | | − else |
| 1061 | | − return 0xffffffff; |
| 1062 | | −} |
| 1063 | | − |
| 1064 | 870 | static void si_tiling_mode_table_init(struct radeon_device *rdev) |
| 1065 | 871 | { |
| 1066 | 872 | const u32 num_tile_mode_states = 32; |
| @@ -1562,18 +1368,151 @@ static void si_tiling_mode_table_init(struct radeon_device *rdev) · 495 unmodified lines |
| 1562 | 1368 | DRM_ERROR("unknown asic: 0x%x\n", rdev->family); |
| 1563 | 1369 | } |
| 1564 | 1370 | |
| 1371 | +static void si_select_se_sh(struct radeon_device *rdev, |
| 1372 | + u32 se_num, u32 sh_num) |
| 1373 | +{ |
| 1374 | + u32 data = INSTANCE_BROADCAST_WRITES; |
| 1375 | + |
| 1376 | + if ((se_num == 0xffffffff) && (sh_num == 0xffffffff)) |
| 1377 | + data = SH_BROADCAST_WRITES | SE_BROADCAST_WRITES; |
| 1378 | + else if (se_num == 0xffffffff) |
| 1379 | + data |= SE_BROADCAST_WRITES | SH_INDEX(sh_num); |
| 1380 | + else if (sh_num == 0xffffffff) |
| 1381 | + data |= SH_BROADCAST_WRITES | SE_INDEX(se_num); |
| 1382 | + else |
| 1383 | + data |= SH_INDEX(sh_num) | SE_INDEX(se_num); |
| 1384 | + WREG32(GRBM_GFX_INDEX, data); |
| 1385 | +} |
| 1386 | + |
| 1387 | +static u32 si_create_bitmask(u32 bit_width) |
| 1388 | +{ |
| 1389 | + u32 i, mask = 0; |
| 1390 | + |
| 1391 | + for (i = 0; i < bit_width; i++) { |
| 1392 | + mask <<= 1; |
| 1393 | + mask |= 1; |
| 1394 | + } |
| 1395 | + return mask; |
| 1396 | +} |
| 1397 | + |
| 1398 | +static u32 si_get_cu_enabled(struct radeon_device *rdev, u32 cu_per_sh) |
| 1399 | +{ |
| 1400 | + u32 data, mask; |
| 1401 | + |
| 1402 | + data = RREG32(CC_GC_SHADER_ARRAY_CONFIG); |
| 1403 | + if (data & 1) |
| 1404 | + data &= INACTIVE_CUS_MASK; |
| 1405 | + else |
| 1406 | + data = 0; |
| 1407 | + data |= RREG32(GC_USER_SHADER_ARRAY_CONFIG); |
| 1408 | + |
| 1409 | + data >>= INACTIVE_CUS_SHIFT; |
| 1410 | + |
| 1411 | + mask = si_create_bitmask(cu_per_sh); |
| 1412 | + |
| 1413 | + return ~data & mask; |
| 1414 | +} |
| 1415 | + |
| 1416 | +static void si_setup_spi(struct radeon_device *rdev, |
| 1417 | + u32 se_num, u32 sh_per_se, |
| 1418 | + u32 cu_per_sh) |
| 1419 | +{ |
| 1420 | + int i, j, k; |
| 1421 | + u32 data, mask, active_cu; |
| 1422 | + |
| 1423 | + for (i = 0; i < se_num; i++) { |
| 1424 | + for (j = 0; j < sh_per_se; j++) { |
| 1425 | + si_select_se_sh(rdev, i, j); |
| 1426 | + data = RREG32(SPI_STATIC_THREAD_MGMT_3); |
| 1427 | + active_cu = si_get_cu_enabled(rdev, cu_per_sh); |
| 1428 | + |
| 1429 | + mask = 1; |
| 1430 | + for (k = 0; k < 16; k++) { |
| 1431 | + mask <<= k; |
| 1432 | + if (active_cu & mask) { |
| 1433 | + data &= ~mask; |
| 1434 | + WREG32(SPI_STATIC_THREAD_MGMT_3, data); |
| 1435 | + break; |
| 1436 | + } |
| 1437 | + } |
| 1438 | + } |
| 1439 | + } |
| 1440 | + si_select_se_sh(rdev, 0xffffffff, 0xffffffff); |
| 1441 | +} |
| 1442 | + |
| 1443 | +static u32 si_get_rb_disabled(struct radeon_device *rdev, |
| 1444 | + u32 max_rb_num, u32 se_num, |
| 1445 | + u32 sh_per_se) |
| 1446 | +{ |
| 1447 | + u32 data, mask; |
| 1448 | + |
| 1449 | + data = RREG32(CC_RB_BACKEND_DISABLE); |
| 1450 | + if (data & 1) |
| 1451 | + data &= BACKEND_DISABLE_MASK; |
| 1452 | + else |
| 1453 | + data = 0; |
| 1454 | + data |= RREG32(GC_USER_RB_BACKEND_DISABLE); |
| 1455 | + |
| 1456 | + data >>= BACKEND_DISABLE_SHIFT; |
| 1457 | + |
| 1458 | + mask = si_create_bitmask(max_rb_num / se_num / sh_per_se); |
| 1459 | + |
| 1460 | + return data & mask; |
| 1461 | +} |
| 1462 | + |
| 1463 | +static void si_setup_rb(struct radeon_device *rdev, |
| 1464 | + u32 se_num, u32 sh_per_se, |
| 1465 | + u32 max_rb_num) |
| 1466 | +{ |
| 1467 | + int i, j; |
| 1468 | + u32 data, mask; |
| 1469 | + u32 disabled_rbs = 0; |
| 1470 | + u32 enabled_rbs = 0; |
| 1471 | + |
| 1472 | + for (i = 0; i < se_num; i++) { |
| 1473 | + for (j = 0; j < sh_per_se; j++) { |
| 1474 | + si_select_se_sh(rdev, i, j); |
| 1475 | + data = si_get_rb_disabled(rdev, max_rb_num, se_num, sh_per_se); |
| 1476 | + disabled_rbs |= data << ((i * sh_per_se + j) * TAHITI_RB_BITMAP_WIDTH_PER_SH); |
| 1477 | + } |
| 1478 | + } |
| 1479 | + si_select_se_sh(rdev, 0xffffffff, 0xffffffff); |
| 1480 | + |
| 1481 | + mask = 1; |
| 1482 | + for (i = 0; i < max_rb_num; i++) { |
| 1483 | + if (!(disabled_rbs & mask)) |
| 1484 | + enabled_rbs |= mask; |
| 1485 | + mask <<= 1; |
| 1486 | + } |
| 1487 | + |
| 1488 | + for (i = 0; i < se_num; i++) { |
| 1489 | + si_select_se_sh(rdev, i, 0xffffffff); |
| 1490 | + data = 0; |
| 1491 | + for (j = 0; j < sh_per_se; j++) { |
| 1492 | + switch (enabled_rbs & 3) { |
| 1493 | + case 1: |
| 1494 | + data |= (RASTER_CONFIG_RB_MAP_0 << (i * sh_per_se + j) * 2); |
| 1495 | + break; |
| 1496 | + case 2: |
| 1497 | + data |= (RASTER_CONFIG_RB_MAP_3 << (i * sh_per_se + j) * 2); |
| 1498 | + break; |
| 1499 | + case 3: |
| 1500 | + default: |
| 1501 | + data |= (RASTER_CONFIG_RB_MAP_2 << (i * sh_per_se + j) * 2); |
| 1502 | + break; |
| 1503 | + } |
| 1504 | + enabled_rbs >>= 2; |
| 1505 | + } |
| 1506 | + WREG32(PA_SC_RASTER_CONFIG, data); |
| 1507 | + } |
| 1508 | + si_select_se_sh(rdev, 0xffffffff, 0xffffffff); |
| 1509 | +} |
| 1510 | + |
| 1565 | 1511 | static void si_gpu_init(struct radeon_device *rdev) |
| 1566 | 1512 | { |
| 1567 | | − u32 cc_rb_backend_disable = 0; |
| 1568 | | − u32 cc_gc_shader_array_config; |
| 1569 | 1513 | u32 gb_addr_config = 0; |
| 1570 | 1514 | u32 mc_shared_chmap, mc_arb_ramcfg; |
| 1571 | | − u32 gb_backend_map; |
| 1572 | | − u32 cgts_tcc_disable; |
| 1573 | 1515 | u32 sx_debug_1; |
| 1574 | | − u32 gc_user_shader_array_config; |
| 1575 | | − u32 gc_user_rb_backend_disable; |
| 1576 | | − u32 cgts_user_tcc_disable; |
| 1577 | 1516 | u32 hdp_host_path_cntl; |
| 1578 | 1517 | u32 tmp; |
| 1579 | 1518 | int i, j; |
| @@ -1581,9 +1520,9 @@ static void si_gpu_init(struct radeon_device *rdev) · 1 unmodified line |
| 1581 | 1520 | switch (rdev->family) { |
| 1582 | 1521 | case CHIP_TAHITI: |
| 1583 | 1522 | rdev->config.si.max_shader_engines = 2; |
| 1584 | | − rdev->config.si.max_pipes_per_simd = 4; |
| 1585 | 1523 | rdev->config.si.max_tile_pipes = 12; |
| 1586 | | − rdev->config.si.max_simds_per_se = 8; |
| 1524 | + rdev->config.si.max_cu_per_sh = 8; |
| 1525 | + rdev->config.si.max_sh_per_se = 2; |
| 1587 | 1526 | rdev->config.si.max_backends_per_se = 4; |
| 1588 | 1527 | rdev->config.si.max_texture_channel_caches = 12; |
| 1589 | 1528 | rdev->config.si.max_gprs = 256; |
| @@ -1594,12 +1533,13 @@ static void si_gpu_init(struct radeon_device *rdev) · 4 unmodified lines |
| 1594 | 1533 | rdev->config.si.sc_prim_fifo_size_backend = 0x100; |
| 1595 | 1534 | rdev->config.si.sc_hiz_tile_fifo_size = 0x30; |
| 1596 | 1535 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; |
| 1536 | + gb_addr_config = TAHITI_GB_ADDR_CONFIG_GOLDEN; |
| 1597 | 1537 | break; |
| 1598 | 1538 | case CHIP_PITCAIRN: |
| 1599 | 1539 | rdev->config.si.max_shader_engines = 2; |
| 1600 | | − rdev->config.si.max_pipes_per_simd = 4; |
| 1601 | 1540 | rdev->config.si.max_tile_pipes = 8; |
| 1602 | | − rdev->config.si.max_simds_per_se = 5; |
| 1541 | + rdev->config.si.max_cu_per_sh = 5; |
| 1542 | + rdev->config.si.max_sh_per_se = 2; |
| 1603 | 1543 | rdev->config.si.max_backends_per_se = 4; |
| 1604 | 1544 | rdev->config.si.max_texture_channel_caches = 8; |
| 1605 | 1545 | rdev->config.si.max_gprs = 256; |
| @@ -1610,13 +1550,14 @@ static void si_gpu_init(struct radeon_device *rdev) · 4 unmodified lines |
| 1610 | 1550 | rdev->config.si.sc_prim_fifo_size_backend = 0x100; |
| 1611 | 1551 | rdev->config.si.sc_hiz_tile_fifo_size = 0x30; |
| 1612 | 1552 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; |
| 1553 | + gb_addr_config = TAHITI_GB_ADDR_CONFIG_GOLDEN; |
| 1613 | 1554 | break; |
| 1614 | 1555 | case CHIP_VERDE: |
| 1615 | 1556 | default: |
| 1616 | 1557 | rdev->config.si.max_shader_engines = 1; |
| 1617 | | − rdev->config.si.max_pipes_per_simd = 4; |
| 1618 | 1558 | rdev->config.si.max_tile_pipes = 4; |
| 1619 | | − rdev->config.si.max_simds_per_se = 2; |
| 1559 | + rdev->config.si.max_cu_per_sh = 2; |
| 1560 | + rdev->config.si.max_sh_per_se = 2; |
| 1620 | 1561 | rdev->config.si.max_backends_per_se = 4; |
| 1621 | 1562 | rdev->config.si.max_texture_channel_caches = 4; |
| 1622 | 1563 | rdev->config.si.max_gprs = 256; |
| @@ -1627,6 +1568,7 @@ static void si_gpu_init(struct radeon_device *rdev) · 4 unmodified lines |
| 1627 | 1568 | rdev->config.si.sc_prim_fifo_size_backend = 0x40; |
| 1628 | 1569 | rdev->config.si.sc_hiz_tile_fifo_size = 0x30; |
| 1629 | 1570 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; |
| 1571 | + gb_addr_config = VERDE_GB_ADDR_CONFIG_GOLDEN; |
| 1630 | 1572 | break; |
| 1631 | 1573 | } |
| 1632 | 1574 | |
| @@ -1648,31 +1590,7 @@ static void si_gpu_init(struct radeon_device *rdev) · 15 unmodified lines |
| 1648 | 1590 | mc_shared_chmap = RREG32(MC_SHARED_CHMAP); |
| 1649 | 1591 | mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG); |
| 1650 | 1592 | |
| 1651 | | − cc_rb_backend_disable = RREG32(CC_RB_BACKEND_DISABLE); |
| 1652 | | − cc_gc_shader_array_config = RREG32(CC_GC_SHADER_ARRAY_CONFIG); |
| 1653 | | − cgts_tcc_disable = 0xffff0000; |
| 1654 | | − for (i = 0; i < rdev->config.si.max_texture_channel_caches; i++) |
| 1655 | | − cgts_tcc_disable &= ~(1 << (16 + i)); |
| 1656 | | − gc_user_rb_backend_disable = RREG32(GC_USER_RB_BACKEND_DISABLE); |
| 1657 | | − gc_user_shader_array_config = RREG32(GC_USER_SHADER_ARRAY_CONFIG); |
| 1658 | | − cgts_user_tcc_disable = RREG32(CGTS_USER_TCC_DISABLE); |
| 1659 | | − |
| 1660 | | − rdev->config.si.num_shader_engines = rdev->config.si.max_shader_engines; |
| 1661 | 1593 | rdev->config.si.num_tile_pipes = rdev->config.si.max_tile_pipes; |
| 1662 | | − tmp = ((~gc_user_rb_backend_disable) & BACKEND_DISABLE_MASK) >> BACKEND_DISABLE_SHIFT; |
| 1663 | | − rdev->config.si.num_backends_per_se = r600_count_pipe_bits(tmp); |
| 1664 | | − tmp = (gc_user_rb_backend_disable & BACKEND_DISABLE_MASK) >> BACKEND_DISABLE_SHIFT; |
| 1665 | | − rdev->config.si.backend_disable_mask_per_asic = |
| 1666 | | − si_get_disable_mask_per_asic(rdev, tmp, SI_MAX_BACKENDS_PER_SE_MASK, |
| 1667 | | − rdev->config.si.num_shader_engines); |
| 1668 | | − rdev->config.si.backend_map = |
| 1669 | | − si_get_tile_pipe_to_backend_map(rdev, rdev->config.si.num_tile_pipes, |
| 1670 | | − rdev->config.si.num_backends_per_se * |
| 1671 | | − rdev->config.si.num_shader_engines, |
| 1672 | | − &rdev->config.si.backend_disable_mask_per_asic, |
| 1673 | | − rdev->config.si.num_shader_engines); |
| 1674 | | − tmp = ((~cgts_user_tcc_disable) & TCC_DISABLE_MASK) >> TCC_DISABLE_SHIFT; |
| 1675 | | − rdev->config.si.num_texture_channel_caches = r600_count_pipe_bits(tmp); |
| 1676 | 1594 | rdev->config.si.mem_max_burst_length_bytes = 256; |
| 1677 | 1595 | tmp = (mc_arb_ramcfg & NOOFCOLS_MASK) >> NOOFCOLS_SHIFT; |
| 1678 | 1596 | rdev->config.si.mem_row_size_in_kb = (4 * (1 << (8 + tmp))) / 1024; |
| @@ -1683,55 +1601,8 @@ static void si_gpu_init(struct radeon_device *rdev) · 4 unmodified lines |
| 1683 | 1601 | rdev->config.si.num_gpus = 1; |
| 1684 | 1602 | rdev->config.si.multi_gpu_tile_size = 64; |
| 1685 | 1603 | |
| 1686 | | − gb_addr_config = 0; |
| 1687 | | − switch (rdev->config.si.num_tile_pipes) { |
| 1688 | | − case 1: |
| 1689 | | − gb_addr_config |= NUM_PIPES(0); |
| 1690 | | − break; |
| 1691 | | − case 2: |
| 1692 | | − gb_addr_config |= NUM_PIPES(1); |
| 1693 | | − break; |
| 1694 | | − case 4: |
| 1695 | | − gb_addr_config |= NUM_PIPES(2); |
| 1696 | | − break; |
| 1697 | | − case 8: |
| 1698 | | − default: |
| 1699 | | − gb_addr_config |= NUM_PIPES(3); |
| 1700 | | − break; |
| 1701 | | − } |
| 1702 | | − |
| 1703 | | − tmp = (rdev->config.si.mem_max_burst_length_bytes / 256) - 1; |
| 1704 | | − gb_addr_config |= PIPE_INTERLEAVE_SIZE(tmp); |
| 1705 | | − gb_addr_config |= NUM_SHADER_ENGINES(rdev->config.si.num_shader_engines - 1); |
| 1706 | | − tmp = (rdev->config.si.shader_engine_tile_size / 16) - 1; |
| 1707 | | − gb_addr_config |= SHADER_ENGINE_TILE_SIZE(tmp); |
| 1708 | | − switch (rdev->config.si.num_gpus) { |
| 1709 | | − case 1: |
| 1710 | | − default: |
| 1711 | | − gb_addr_config |= NUM_GPUS(0); |
| 1712 | | − break; |
| 1713 | | − case 2: |
| 1714 | | − gb_addr_config |= NUM_GPUS(1); |
| 1715 | | − break; |
| 1716 | | − case 4: |
| 1717 | | − gb_addr_config |= NUM_GPUS(2); |
| 1718 | | − break; |
| 1719 | | − } |
| 1720 | | − switch (rdev->config.si.multi_gpu_tile_size) { |
| 1721 | | − case 16: |
| 1722 | | − gb_addr_config |= MULTI_GPU_TILE_SIZE(0); |
| 1723 | | − break; |
| 1724 | | − case 32: |
| 1725 | | − default: |
| 1726 | | − gb_addr_config |= MULTI_GPU_TILE_SIZE(1); |
| 1727 | | − break; |
| 1728 | | − case 64: |
| 1729 | | − gb_addr_config |= MULTI_GPU_TILE_SIZE(2); |
| 1730 | | − break; |
| 1731 | | − case 128: |
| 1732 | | − gb_addr_config |= MULTI_GPU_TILE_SIZE(3); |
| 1733 | | − break; |
| 1734 | | − } |
| 1604 | + /* fix up row size */ |
| 1605 | + gb_addr_config &= ~ROW_SIZE_MASK; |
| 1735 | 1606 | switch (rdev->config.si.mem_row_size_in_kb) { |
| 1736 | 1607 | case 1: |
| 1737 | 1608 | default: |
| @@ -1745,26 +1616,6 @@ static void si_gpu_init(struct radeon_device *rdev) · 7 unmodified lines |
| 1745 | 1616 | break; |
| 1746 | 1617 | } |
| 1747 | 1618 | |
| 1748 | | − tmp = (gb_addr_config & NUM_PIPES_MASK) >> NUM_PIPES_SHIFT; |
| 1749 | | − rdev->config.si.num_tile_pipes = (1 << tmp); |
| 1750 | | − tmp = (gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT; |
| 1751 | | − rdev->config.si.mem_max_burst_length_bytes = (tmp + 1) * 256; |
| 1752 | | − tmp = (gb_addr_config & NUM_SHADER_ENGINES_MASK) >> NUM_SHADER_ENGINES_SHIFT; |
| 1753 | | − rdev->config.si.num_shader_engines = tmp + 1; |
| 1754 | | − tmp = (gb_addr_config & NUM_GPUS_MASK) >> NUM_GPUS_SHIFT; |
| 1755 | | − rdev->config.si.num_gpus = tmp + 1; |
| 1756 | | − tmp = (gb_addr_config & MULTI_GPU_TILE_SIZE_MASK) >> MULTI_GPU_TILE_SIZE_SHIFT; |
| 1757 | | − rdev->config.si.multi_gpu_tile_size = 1 << tmp; |
| 1758 | | − tmp = (gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT; |
| 1759 | | − rdev->config.si.mem_row_size_in_kb = 1 << tmp; |
| 1760 | | − |
| 1761 | | − gb_backend_map = |
| 1762 | | − si_get_tile_pipe_to_backend_map(rdev, rdev->config.si.num_tile_pipes, |
| 1763 | | − rdev->config.si.num_backends_per_se * |
| 1764 | | − rdev->config.si.num_shader_engines, |
| 1765 | | − &rdev->config.si.backend_disable_mask_per_asic, |
| 1766 | | − rdev->config.si.num_shader_engines); |
| 1767 | | − |
| 1768 | 1619 | /* setup tiling info dword. gb_addr_config is not adequate since it does |
| 1769 | 1620 | * not have bank info, so create a custom tiling dword. |
| 1770 | 1621 | * bits 3:0 num_pipes |
| @@ -1789,33 +1640,29 @@ static void si_gpu_init(struct radeon_device *rdev) · 18 unmodified lines |
| 1789 | 1640 | rdev->config.si.tile_config |= (3 << 0); |
| 1790 | 1641 | break; |
| 1791 | 1642 | } |
| 1792 | | − rdev->config.si.tile_config |= |
| 1793 | | − ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4; |
| 1643 | + if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) |
| 1644 | + rdev->config.si.tile_config |= 1 << 4; |
| 1645 | + else |
| 1646 | + rdev->config.si.tile_config |= 0 << 4; |
| 1794 | 1647 | rdev->config.si.tile_config |= |
| 1795 | 1648 | ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8; |
| 1796 | 1649 | rdev->config.si.tile_config |= |
| 1797 | 1650 | ((gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT) << 12; |
| 1798 | 1651 | |
| 1799 | | − rdev->config.si.backend_map = gb_backend_map; |
| 1800 | 1652 | WREG32(GB_ADDR_CONFIG, gb_addr_config); |
| 1801 | 1653 | WREG32(DMIF_ADDR_CONFIG, gb_addr_config); |
| 1802 | 1654 | WREG32(HDP_ADDR_CONFIG, gb_addr_config); |
| 1803 | 1655 | |
| 1804 | | − /* primary versions */ |
| 1805 | | − WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable); |
| 1806 | | − WREG32(CC_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable); |
| 1807 | | − WREG32(CC_GC_SHADER_ARRAY_CONFIG, cc_gc_shader_array_config); |
| 1808 | | − |
| 1809 | | − WREG32(CGTS_TCC_DISABLE, cgts_tcc_disable); |
| 1656 | + si_tiling_mode_table_init(rdev); |
| 1810 | 1657 | |
| 1811 | | − /* user versions */ |
| 1812 | | − WREG32(GC_USER_RB_BACKEND_DISABLE, cc_rb_backend_disable); |
| 1813 | | − WREG32(GC_USER_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable); |
| 1814 | | − WREG32(GC_USER_SHADER_ARRAY_CONFIG, cc_gc_shader_array_config); |
| 1658 | + si_setup_rb(rdev, rdev->config.si.max_shader_engines, |
| 1659 | + rdev->config.si.max_sh_per_se, |
| 1660 | + rdev->config.si.max_backends_per_se); |
| 1815 | 1661 | |
| 1816 | | − WREG32(CGTS_USER_TCC_DISABLE, cgts_tcc_disable); |
| 1662 | + si_setup_spi(rdev, rdev->config.si.max_shader_engines, |
| 1663 | + rdev->config.si.max_sh_per_se, |
| 1664 | + rdev->config.si.max_cu_per_sh); |
| 1817 | 1665 | |
| 1818 | | − si_tiling_mode_table_init(rdev); |
| 1819 | 1666 | |
| 1820 | 1667 | /* set HW defaults for 3D engine */ |
| 1821 | 1668 | WREG32(CP_QUEUE_THRESHOLDS, (ROQ_IB1_START(0x16) | |