Pull drm radeon fixes from Dave Airlie: "This is just radeon fixes and a bunch of new PCI ids. The fixes are for a deadlock, an audio regression, and a couple of audio fixes." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/radeon/kms: add new SI PCI ids drm/radeon/kms: add new BTC PCI ids drm/radeon/kms: add new Palm, Sumo PCI ids drm/radeon/kms: add new Trinity PCI ids drm/radeon: fix vm deadlocks on cayman drm/radeon: fix gpu_init on si drm/radeon/hdmi: don't set SEND_MAX_PACKETS bit drm/radeon/audio: don't hardcode CRTC id drm/radeon: make audio_init consistent across asics
Unified · Split
| @@ -460,15 +460,28 @@ static void cayman_gpu_init(struct radeon_device *rdev) · 459 unmodified lines | |||
| 460 | rdev->config.cayman.max_pipes_per_simd = 4; | 460 | rdev->config.cayman.max_pipes_per_simd = 4; |
| 461 | rdev->config.cayman.max_tile_pipes = 2; | 461 | rdev->config.cayman.max_tile_pipes = 2; |
| 462 | if ((rdev->pdev->device == 0x9900) || | 462 | if ((rdev->pdev->device == 0x9900) || |
| 463 | (rdev->pdev->device == 0x9901)) { | 463 | (rdev->pdev->device == 0x9901) || |
| 464 | (rdev->pdev->device == 0x9905) || | ||
| 465 | (rdev->pdev->device == 0x9906) || | ||
| 466 | (rdev->pdev->device == 0x9907) || | ||
| 467 | (rdev->pdev->device == 0x9908) || | ||
| 468 | (rdev->pdev->device == 0x9909) || | ||
| 469 | (rdev->pdev->device == 0x9910) || | ||
| 470 | (rdev->pdev->device == 0x9917)) { | ||
| 464 | rdev->config.cayman.max_simds_per_se = 6; | 471 | rdev->config.cayman.max_simds_per_se = 6; |
| 465 | rdev->config.cayman.max_backends_per_se = 2; | 472 | rdev->config.cayman.max_backends_per_se = 2; |
| 466 | } else if ((rdev->pdev->device == 0x9903) || | 473 | } else if ((rdev->pdev->device == 0x9903) || |
| 467 | (rdev->pdev->device == 0x9904)) { | 474 | (rdev->pdev->device == 0x9904) || |
| 475 | (rdev->pdev->device == 0x990A) || | ||
| 476 | (rdev->pdev->device == 0x9913) || | ||
| 477 | (rdev->pdev->device == 0x9918)) { | ||
| 468 | rdev->config.cayman.max_simds_per_se = 4; | 478 | rdev->config.cayman.max_simds_per_se = 4; |
| 469 | rdev->config.cayman.max_backends_per_se = 2; | 479 | rdev->config.cayman.max_backends_per_se = 2; |
| 470 | } else if ((rdev->pdev->device == 0x9990) || | 480 | } else if ((rdev->pdev->device == 0x9919) || |
| 471 | (rdev->pdev->device == 0x9991)) { | 481 | (rdev->pdev->device == 0x9990) || |
| 482 | (rdev->pdev->device == 0x9991) || | ||
| 483 | (rdev->pdev->device == 0x9994) || | ||
| 484 | (rdev->pdev->device == 0x99A0)) { | ||
| 472 | rdev->config.cayman.max_simds_per_se = 3; | 485 | rdev->config.cayman.max_simds_per_se = 3; |
| 473 | rdev->config.cayman.max_backends_per_se = 1; | 486 | rdev->config.cayman.max_backends_per_se = 1; |
| 474 | } else { | 487 | } else { |
| @@ -2426,6 +2426,12 @@ int r600_startup(struct radeon_device *rdev) · 2425 unmodified lines | |||
| 2426 | if (r) | 2426 | if (r) |
| 2427 | return r; | 2427 | return r; |
| 2428 | 2428 | ||
| 2429 | r = r600_audio_init(rdev); | ||
| 2430 | if (r) { | ||
| 2431 | DRM_ERROR("radeon: audio init failed\n"); | ||
| 2432 | return r; | ||
| 2433 | } | ||
| 2434 | |||
| 2429 | return 0; | 2435 | return 0; |
| 2430 | } | 2436 | } |
| 2431 | 2437 | ||
| @@ -2462,12 +2468,6 @@ int r600_resume(struct radeon_device *rdev) · 30 unmodified lines | |||
| 2462 | return r; | 2468 | return r; |
| 2463 | } | 2469 | } |
| 2464 | 2470 | ||
| 2465 | r = r600_audio_init(rdev); | ||
| 2466 | if (r) { | ||
| 2467 | DRM_ERROR("radeon: audio resume failed\n"); | ||
| 2468 | return r; | ||
| 2469 | } | ||
| 2470 | |||
| 2471 | return r; | 2471 | return r; |
| 2472 | } | 2472 | } |
| 2473 | 2473 | ||
| @@ -2577,9 +2577,6 @@ int r600_init(struct radeon_device *rdev) · 103 unmodified lines | |||
| 2577 | rdev->accel_working = false; | 2577 | rdev->accel_working = false; |
| 2578 | } | 2578 | } |
| 2579 | 2579 | ||
| 2580 | r = r600_audio_init(rdev); | ||
| 2581 | if (r) | ||
| 2582 | return r; /* TODO error handling */ | ||
| 2583 | return 0; | 2580 | return 0; |
| 2584 | } | 2581 | } |
| 2585 | 2582 | ||
| @@ -192,6 +192,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) · 191 unmodified lines | |||
| 192 | struct radeon_device *rdev = dev->dev_private; | 192 | struct radeon_device *rdev = dev->dev_private; |
| 193 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | 193 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
| 194 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; | 194 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; |
| 195 | struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc); | ||
| 195 | int base_rate = 48000; | 196 | int base_rate = 48000; |
| 196 | 197 | ||
| 197 | switch (radeon_encoder->encoder_id) { | 198 | switch (radeon_encoder->encoder_id) { |
| @@ -217,8 +218,8 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) · 19 unmodified lines | |||
| 217 | WREG32(EVERGREEN_AUDIO_PLL1_DIV, clock * 10); | 218 | WREG32(EVERGREEN_AUDIO_PLL1_DIV, clock * 10); |
| 218 | WREG32(EVERGREEN_AUDIO_PLL1_UNK, 0x00000071); | 219 | WREG32(EVERGREEN_AUDIO_PLL1_UNK, 0x00000071); |
| 219 | 220 | ||
| 220 | /* Some magic trigger or src sel? */ | 221 | /* Select DTO source */ |
| 221 | WREG32_P(0x5ac, 0x01, ~0x77); | 222 | WREG32(0x5ac, radeon_crtc->crtc_id); |
| 222 | } else { | 223 | } else { |
| 223 | switch (dig->dig_encoder) { | 224 | switch (dig->dig_encoder) { |
| 224 | case 0: | 225 | case 0: |
| @@ -348,7 +348,6 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod · 347 unmodified lines | |||
| 348 | WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset, | 348 | WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset, |
| 349 | HDMI0_AUDIO_SAMPLE_SEND | /* send audio packets */ | 349 | HDMI0_AUDIO_SAMPLE_SEND | /* send audio packets */ |
| 350 | HDMI0_AUDIO_DELAY_EN(1) | /* default audio delay */ | 350 | HDMI0_AUDIO_DELAY_EN(1) | /* default audio delay */ |
| 351 | HDMI0_AUDIO_SEND_MAX_PACKETS | /* send NULL packets if no audio is available */ | ||
| 352 | HDMI0_AUDIO_PACKETS_PER_LINE(3) | /* should be suffient for all audio modes and small enough for all hblanks */ | 351 | HDMI0_AUDIO_PACKETS_PER_LINE(3) | /* should be suffient for all audio modes and small enough for all hblanks */ |
| 353 | HDMI0_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */ | 352 | HDMI0_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */ |
| 354 | } | 353 | } |
| @@ -1374,9 +1374,9 @@ struct cayman_asic { · 1373 unmodified lines | |||
| 1374 | 1374 | ||
| 1375 | struct si_asic { | 1375 | struct si_asic { |
| 1376 | unsigned max_shader_engines; | 1376 | unsigned max_shader_engines; |
| 1377 | unsigned max_pipes_per_simd; | ||
| 1378 | unsigned max_tile_pipes; | 1377 | unsigned max_tile_pipes; |
| 1379 | unsigned max_simds_per_se; | 1378 | unsigned max_cu_per_sh; |
| 1379 | unsigned max_sh_per_se; | ||
| 1380 | unsigned max_backends_per_se; | 1380 | unsigned max_backends_per_se; |
| 1381 | unsigned max_texture_channel_caches; | 1381 | unsigned max_texture_channel_caches; |
| 1382 | unsigned max_gprs; | 1382 | unsigned max_gprs; |
| @@ -1387,7 +1387,6 @@ struct si_asic { · 4 unmodified lines | |||
| 1387 | unsigned sc_hiz_tile_fifo_size; | 1387 | unsigned sc_hiz_tile_fifo_size; |
| 1388 | unsigned sc_earlyz_tile_fifo_size; | 1388 | unsigned sc_earlyz_tile_fifo_size; |
| 1389 | 1389 | ||
| 1390 | unsigned num_shader_engines; | ||
| 1391 | unsigned num_tile_pipes; | 1390 | unsigned num_tile_pipes; |
| 1392 | unsigned num_backends_per_se; | 1391 | unsigned num_backends_per_se; |
| 1393 | unsigned backend_disable_mask_per_asic; | 1392 | unsigned backend_disable_mask_per_asic; |
| @@ -476,12 +476,18 @@ int radeon_vm_bo_add(struct radeon_device *rdev, · 475 unmodified lines | |||
| 476 | 476 | ||
| 477 | mutex_lock(&vm->mutex); | 477 | mutex_lock(&vm->mutex); |
| 478 | if (last_pfn > vm->last_pfn) { | 478 | if (last_pfn > vm->last_pfn) { |
| 479 | /* grow va space 32M by 32M */ | 479 | /* release mutex and lock in right order */ |
| 480 | unsigned align = ((32 << 20) >> 12) - 1; | 480 | mutex_unlock(&vm->mutex); |
| 481 | radeon_mutex_lock(&rdev->cs_mutex); | 481 | radeon_mutex_lock(&rdev->cs_mutex); |
| 482 | radeon_vm_unbind_locked(rdev, vm); | 482 | mutex_lock(&vm->mutex); |
| 483 | /* and check again */ | ||
| 484 | if (last_pfn > vm->last_pfn) { | ||
| 485 | /* grow va space 32M by 32M */ | ||
| 486 | unsigned align = ((32 << 20) >> 12) - 1; | ||
| 487 | radeon_vm_unbind_locked(rdev, vm); | ||
| 488 | vm->last_pfn = (last_pfn + align) & ~align; | ||
| 489 | } | ||
| 483 | radeon_mutex_unlock(&rdev->cs_mutex); | 490 | radeon_mutex_unlock(&rdev->cs_mutex); |
| 484 | vm->last_pfn = (last_pfn + align) & ~align; | ||
| 485 | } | 491 | } |
| 486 | head = &vm->va; | 492 | head = &vm->va; |
| 487 | last_offset = 0; | 493 | last_offset = 0; |
| @@ -595,8 +601,8 @@ int radeon_vm_bo_rmv(struct radeon_device *rdev, · 107 unmodified lines | |||
| 595 | if (bo_va == NULL) | 601 | if (bo_va == NULL) |
| 596 | return 0; | 602 | return 0; |
| 597 | 603 | ||
| 598 | mutex_lock(&vm->mutex); | ||
| 599 | radeon_mutex_lock(&rdev->cs_mutex); | 604 | radeon_mutex_lock(&rdev->cs_mutex); |
| 605 | mutex_lock(&vm->mutex); | ||
| 600 | radeon_vm_bo_update_pte(rdev, vm, bo, NULL); | 606 | radeon_vm_bo_update_pte(rdev, vm, bo, NULL); |
| 601 | radeon_mutex_unlock(&rdev->cs_mutex); | 607 | radeon_mutex_unlock(&rdev->cs_mutex); |
| 602 | list_del(&bo_va->vm_list); | 608 | list_del(&bo_va->vm_list); |
| @@ -641,9 +647,8 @@ void radeon_vm_fini(struct radeon_device *rdev, struct radeon_vm *vm) · 38 unmodified lines | |||
| 641 | struct radeon_bo_va *bo_va, *tmp; | 647 | struct radeon_bo_va *bo_va, *tmp; |
| 642 | int r; | 648 | int r; |
| 643 | 649 | ||
| 644 | mutex_lock(&vm->mutex); | ||
| 645 | |||
| 646 | radeon_mutex_lock(&rdev->cs_mutex); | 650 | radeon_mutex_lock(&rdev->cs_mutex); |
| 651 | mutex_lock(&vm->mutex); | ||
| 647 | radeon_vm_unbind_locked(rdev, vm); | 652 | radeon_vm_unbind_locked(rdev, vm); |
| 648 | radeon_mutex_unlock(&rdev->cs_mutex); | 653 | radeon_mutex_unlock(&rdev->cs_mutex); |
| 649 | 654 | ||
| @@ -273,7 +273,7 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) · 272 unmodified lines | |||
| 273 | break; | 273 | break; |
| 274 | case RADEON_INFO_MAX_PIPES: | 274 | case RADEON_INFO_MAX_PIPES: |
| 275 | if (rdev->family >= CHIP_TAHITI) | 275 | if (rdev->family >= CHIP_TAHITI) |
| 276 | value = rdev->config.si.max_pipes_per_simd; | 276 | value = rdev->config.si.max_cu_per_sh; |
| 277 | else if (rdev->family >= CHIP_CAYMAN) | 277 | else if (rdev->family >= CHIP_CAYMAN) |
| 278 | value = rdev->config.cayman.max_pipes_per_simd; | 278 | value = rdev->config.cayman.max_pipes_per_simd; |
| 279 | else if (rdev->family >= CHIP_CEDAR) | 279 | else if (rdev->family >= CHIP_CEDAR) |
| @@ -908,12 +908,6 @@ static int rs600_startup(struct radeon_device *rdev) · 907 unmodified lines | |||
| 908 | return r; | 908 | return r; |
| 909 | } | 909 | } |
| 910 | 910 | ||
| 911 | r = r600_audio_init(rdev); | ||
| 912 | if (r) { | ||
| 913 | dev_err(rdev->dev, "failed initializing audio\n"); | ||
| 914 | return r; | ||
| 915 | } | ||
| 916 | |||
| 917 | r = radeon_ib_pool_start(rdev); | 911 | r = radeon_ib_pool_start(rdev); |
| 918 | if (r) | 912 | if (r) |
| 919 | return r; | 913 | return r; |
| @@ -922,6 +916,12 @@ static int rs600_startup(struct radeon_device *rdev) · 2 unmodified lines | |||
| 922 | if (r) | 916 | if (r) |
| 923 | return r; | 917 | return r; |
| 924 | 918 | ||
| 919 | r = r600_audio_init(rdev); | ||
| 920 | if (r) { | ||
| 921 | dev_err(rdev->dev, "failed initializing audio\n"); | ||
| 922 | return r; | ||
| 923 | } | ||
| 924 | |||
| 925 | return 0; | 925 | return 0; |
| 926 | } | 926 | } |
| 927 | 927 | ||
| @@ -637,12 +637,6 @@ static int rs690_startup(struct radeon_device *rdev) · 636 unmodified lines | |||
| 637 | return r; | 637 | return r; |
| 638 | } | 638 | } |
| 639 | 639 | ||
| 640 | r = r600_audio_init(rdev); | ||
| 641 | if (r) { | ||
| 642 | dev_err(rdev->dev, "failed initializing audio\n"); | ||
| 643 | return r; | ||
| 644 | } | ||
| 645 | |||
| 646 | r = radeon_ib_pool_start(rdev); | 640 | r = radeon_ib_pool_start(rdev); |
| 647 | if (r) | 641 | if (r) |
| 648 | return r; | 642 | return r; |
| @@ -651,6 +645,12 @@ static int rs690_startup(struct radeon_device *rdev) · 2 unmodified lines | |||
| 651 | if (r) | 645 | if (r) |
| 652 | return r; | 646 | return r; |
| 653 | 647 | ||
| 648 | r = r600_audio_init(rdev); | ||
| 649 | if (r) { | ||
| 650 | dev_err(rdev->dev, "failed initializing audio\n"); | ||
| 651 | return r; | ||
| 652 | } | ||
| 653 | |||
| 654 | return 0; | 654 | return 0; |
| 655 | } | 655 | } |
| 656 | 656 | ||
| @@ -956,6 +956,12 @@ static int rv770_startup(struct radeon_device *rdev) · 955 unmodified lines | |||
| 956 | if (r) | 956 | if (r) |
| 957 | return r; | 957 | return r; |
| 958 | 958 | ||
| 959 | r = r600_audio_init(rdev); | ||
| 960 | if (r) { | ||
| 961 | DRM_ERROR("radeon: audio init failed\n"); | ||
| 962 | return r; | ||
| 963 | } | ||
| 964 | |||
| 959 | return 0; | 965 | return 0; |
| 960 | } | 966 | } |
| 961 | 967 | ||
| @@ -978,12 +984,6 @@ int rv770_resume(struct radeon_device *rdev) · 16 unmodified lines | |||
| 978 | return r; | 984 | return r; |
| 979 | } | 985 | } |
| 980 | 986 | ||
| 981 | r = r600_audio_init(rdev); | ||
| 982 | if (r) { | ||
| 983 | dev_err(rdev->dev, "radeon: audio init failed\n"); | ||
| 984 | return r; | ||
| 985 | } | ||
| 986 | |||
| 987 | return r; | 987 | return r; |
| 988 | 988 | ||
| 989 | } | 989 | } |
| @@ -1092,12 +1092,6 @@ int rv770_init(struct radeon_device *rdev) · 102 unmodified lines | |||
| 1092 | rdev->accel_working = false; | 1092 | rdev->accel_working = false; |
| 1093 | } | 1093 | } |
| 1094 | 1094 | ||
| 1095 | r = r600_audio_init(rdev); | ||
| 1096 | if (r) { | ||
| 1097 | dev_err(rdev->dev, "radeon: audio init failed\n"); | ||
| 1098 | return r; | ||
| 1099 | } | ||
| 1100 | |||
| 1101 | return 0; | 1095 | return 0; |
| 1102 | } | 1096 | } |
| 1103 | 1097 | ||
| @@ -867,200 +867,6 @@ void dce6_bandwidth_update(struct radeon_device *rdev) · 866 unmodified lines | |||
| 867 | /* | 867 | /* |
| 868 | * Core functions | 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 | static void si_tiling_mode_table_init(struct radeon_device *rdev) | 870 | static void si_tiling_mode_table_init(struct radeon_device *rdev) |
| 1065 | { | 871 | { |
| 1066 | const u32 num_tile_mode_states = 32; | 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 | DRM_ERROR("unknown asic: 0x%x\n", rdev->family); | 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 | static void si_gpu_init(struct radeon_device *rdev) | 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 | u32 gb_addr_config = 0; | 1513 | u32 gb_addr_config = 0; |
| 1570 | u32 mc_shared_chmap, mc_arb_ramcfg; | 1514 | u32 mc_shared_chmap, mc_arb_ramcfg; |
| 1571 | u32 gb_backend_map; | ||
| 1572 | u32 cgts_tcc_disable; | ||
| 1573 | u32 sx_debug_1; | 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 | u32 hdp_host_path_cntl; | 1516 | u32 hdp_host_path_cntl; |
| 1578 | u32 tmp; | 1517 | u32 tmp; |
| 1579 | int i, j; | 1518 | int i, j; |
| @@ -1581,9 +1520,9 @@ static void si_gpu_init(struct radeon_device *rdev) · 1 unmodified line | |||
| 1581 | switch (rdev->family) { | 1520 | switch (rdev->family) { |
| 1582 | case CHIP_TAHITI: | 1521 | case CHIP_TAHITI: |
| 1583 | rdev->config.si.max_shader_engines = 2; | 1522 | rdev->config.si.max_shader_engines = 2; |
| 1584 | rdev->config.si.max_pipes_per_simd = 4; | ||
| 1585 | rdev->config.si.max_tile_pipes = 12; | 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 | rdev->config.si.max_backends_per_se = 4; | 1526 | rdev->config.si.max_backends_per_se = 4; |
| 1588 | rdev->config.si.max_texture_channel_caches = 12; | 1527 | rdev->config.si.max_texture_channel_caches = 12; |
| 1589 | rdev->config.si.max_gprs = 256; | 1528 | rdev->config.si.max_gprs = 256; |
| @@ -1594,12 +1533,13 @@ static void si_gpu_init(struct radeon_device *rdev) · 4 unmodified lines | |||
| 1594 | rdev->config.si.sc_prim_fifo_size_backend = 0x100; | 1533 | rdev->config.si.sc_prim_fifo_size_backend = 0x100; |
| 1595 | rdev->config.si.sc_hiz_tile_fifo_size = 0x30; | 1534 | rdev->config.si.sc_hiz_tile_fifo_size = 0x30; |
| 1596 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; | 1535 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; |
| 1536 | gb_addr_config = TAHITI_GB_ADDR_CONFIG_GOLDEN; | ||
| 1597 | break; | 1537 | break; |
| 1598 | case CHIP_PITCAIRN: | 1538 | case CHIP_PITCAIRN: |
| 1599 | rdev->config.si.max_shader_engines = 2; | 1539 | rdev->config.si.max_shader_engines = 2; |
| 1600 | rdev->config.si.max_pipes_per_simd = 4; | ||
| 1601 | rdev->config.si.max_tile_pipes = 8; | 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 | rdev->config.si.max_backends_per_se = 4; | 1543 | rdev->config.si.max_backends_per_se = 4; |
| 1604 | rdev->config.si.max_texture_channel_caches = 8; | 1544 | rdev->config.si.max_texture_channel_caches = 8; |
| 1605 | rdev->config.si.max_gprs = 256; | 1545 | rdev->config.si.max_gprs = 256; |
| @@ -1610,13 +1550,14 @@ static void si_gpu_init(struct radeon_device *rdev) · 4 unmodified lines | |||
| 1610 | rdev->config.si.sc_prim_fifo_size_backend = 0x100; | 1550 | rdev->config.si.sc_prim_fifo_size_backend = 0x100; |
| 1611 | rdev->config.si.sc_hiz_tile_fifo_size = 0x30; | 1551 | rdev->config.si.sc_hiz_tile_fifo_size = 0x30; |
| 1612 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; | 1552 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; |
| 1553 | gb_addr_config = TAHITI_GB_ADDR_CONFIG_GOLDEN; | ||
| 1613 | break; | 1554 | break; |
| 1614 | case CHIP_VERDE: | 1555 | case CHIP_VERDE: |
| 1615 | default: | 1556 | default: |
| 1616 | rdev->config.si.max_shader_engines = 1; | 1557 | rdev->config.si.max_shader_engines = 1; |
| 1617 | rdev->config.si.max_pipes_per_simd = 4; | ||
| 1618 | rdev->config.si.max_tile_pipes = 4; | 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 | rdev->config.si.max_backends_per_se = 4; | 1561 | rdev->config.si.max_backends_per_se = 4; |
| 1621 | rdev->config.si.max_texture_channel_caches = 4; | 1562 | rdev->config.si.max_texture_channel_caches = 4; |
| 1622 | rdev->config.si.max_gprs = 256; | 1563 | rdev->config.si.max_gprs = 256; |
| @@ -1627,6 +1568,7 @@ static void si_gpu_init(struct radeon_device *rdev) · 4 unmodified lines | |||
| 1627 | rdev->config.si.sc_prim_fifo_size_backend = 0x40; | 1568 | rdev->config.si.sc_prim_fifo_size_backend = 0x40; |
| 1628 | rdev->config.si.sc_hiz_tile_fifo_size = 0x30; | 1569 | rdev->config.si.sc_hiz_tile_fifo_size = 0x30; |
| 1629 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; | 1570 | rdev->config.si.sc_earlyz_tile_fifo_size = 0x130; |
| 1571 | gb_addr_config = VERDE_GB_ADDR_CONFIG_GOLDEN; | ||
| 1630 | break; | 1572 | break; |
| 1631 | } | 1573 | } |
| 1632 | 1574 | ||
| @@ -1648,31 +1590,7 @@ static void si_gpu_init(struct radeon_device *rdev) · 15 unmodified lines | |||
| 1648 | mc_shared_chmap = RREG32(MC_SHARED_CHMAP); | 1590 | mc_shared_chmap = RREG32(MC_SHARED_CHMAP); |
| 1649 | mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG); | 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 | rdev->config.si.num_tile_pipes = rdev->config.si.max_tile_pipes; | 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 | rdev->config.si.mem_max_burst_length_bytes = 256; | 1594 | rdev->config.si.mem_max_burst_length_bytes = 256; |
| 1677 | tmp = (mc_arb_ramcfg & NOOFCOLS_MASK) >> NOOFCOLS_SHIFT; | 1595 | tmp = (mc_arb_ramcfg & NOOFCOLS_MASK) >> NOOFCOLS_SHIFT; |
| 1678 | rdev->config.si.mem_row_size_in_kb = (4 * (1 << (8 + tmp))) / 1024; | 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 | rdev->config.si.num_gpus = 1; | 1601 | rdev->config.si.num_gpus = 1; |
| 1684 | rdev->config.si.multi_gpu_tile_size = 64; | 1602 | rdev->config.si.multi_gpu_tile_size = 64; |
| 1685 | 1603 | ||
| 1686 | gb_addr_config = 0; | 1604 | /* fix up row size */ |
| 1687 | switch (rdev->config.si.num_tile_pipes) { | 1605 | gb_addr_config &= ~ROW_SIZE_MASK; |
| 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 | } | ||
| 1735 | switch (rdev->config.si.mem_row_size_in_kb) { | 1606 | switch (rdev->config.si.mem_row_size_in_kb) { |
| 1736 | case 1: | 1607 | case 1: |
| 1737 | default: | 1608 | default: |
| @@ -1745,26 +1616,6 @@ static void si_gpu_init(struct radeon_device *rdev) · 7 unmodified lines | |||
| 1745 | break; | 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 | /* setup tiling info dword. gb_addr_config is not adequate since it does | 1619 | /* setup tiling info dword. gb_addr_config is not adequate since it does |
| 1769 | * not have bank info, so create a custom tiling dword. | 1620 | * not have bank info, so create a custom tiling dword. |
| 1770 | * bits 3:0 num_pipes | 1621 | * bits 3:0 num_pipes |
| @@ -1789,33 +1640,29 @@ static void si_gpu_init(struct radeon_device *rdev) · 18 unmodified lines | |||
| 1789 | rdev->config.si.tile_config |= (3 << 0); | 1640 | rdev->config.si.tile_config |= (3 << 0); |
| 1790 | break; | 1641 | break; |
| 1791 | } | 1642 | } |
| 1792 | rdev->config.si.tile_config |= | 1643 | if ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) |
| 1793 | ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4; | 1644 | rdev->config.si.tile_config |= 1 << 4; |
| 1645 | else | ||
| 1646 | rdev->config.si.tile_config |= 0 << 4; | ||
| 1794 | rdev->config.si.tile_config |= | 1647 | rdev->config.si.tile_config |= |
| 1795 | ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8; | 1648 | ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8; |
| 1796 | rdev->config.si.tile_config |= | 1649 | rdev->config.si.tile_config |= |
| 1797 | ((gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT) << 12; | 1650 | ((gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT) << 12; |
| 1798 | 1651 | ||
| 1799 | rdev->config.si.backend_map = gb_backend_map; | ||
| 1800 | WREG32(GB_ADDR_CONFIG, gb_addr_config); | 1652 | WREG32(GB_ADDR_CONFIG, gb_addr_config); |
| 1801 | WREG32(DMIF_ADDR_CONFIG, gb_addr_config); | 1653 | WREG32(DMIF_ADDR_CONFIG, gb_addr_config); |
| 1802 | WREG32(HDP_ADDR_CONFIG, gb_addr_config); | 1654 | WREG32(HDP_ADDR_CONFIG, gb_addr_config); |
| 1803 | 1655 | ||
| 1804 | /* primary versions */ | 1656 | si_tiling_mode_table_init(rdev); |
| 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); | ||
| 1810 | 1657 | ||
| 1811 | /* user versions */ | 1658 | si_setup_rb(rdev, rdev->config.si.max_shader_engines, |
| 1812 | WREG32(GC_USER_RB_BACKEND_DISABLE, cc_rb_backend_disable); | 1659 | rdev->config.si.max_sh_per_se, |
| 1813 | WREG32(GC_USER_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable); | 1660 | rdev->config.si.max_backends_per_se); |
| 1814 | WREG32(GC_USER_SHADER_ARRAY_CONFIG, cc_gc_shader_array_config); | ||
| 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 | /* set HW defaults for 3D engine */ | 1667 | /* set HW defaults for 3D engine */ |
| 1821 | WREG32(CP_QUEUE_THRESHOLDS, (ROQ_IB1_START(0x16) | | 1668 | WREG32(CP_QUEUE_THRESHOLDS, (ROQ_IB1_START(0x16) | |
| @@ -24,6 +24,11 @@ · 23 unmodified lines | |||
| 24 | #ifndef SI_H | 24 | #ifndef SI_H |
| 25 | #define SI_H | 25 | #define SI_H |
| 26 | 26 | ||
| 27 | #define TAHITI_RB_BITMAP_WIDTH_PER_SH 2 | ||
| 28 | |||
| 29 | #define TAHITI_GB_ADDR_CONFIG_GOLDEN 0x12011003 | ||
| 30 | #define VERDE_GB_ADDR_CONFIG_GOLDEN 0x12010002 | ||
| 31 | |||
| 27 | #define CG_MULT_THERMAL_STATUS 0x714 | 32 | #define CG_MULT_THERMAL_STATUS 0x714 |
| 28 | #define ASIC_MAX_TEMP(x) ((x) << 0) | 33 | #define ASIC_MAX_TEMP(x) ((x) << 0) |
| 29 | #define ASIC_MAX_TEMP_MASK 0x000001ff | 34 | #define ASIC_MAX_TEMP_MASK 0x000001ff |
| @@ -408,6 +413,12 @@ · 378 unmodified lines | |||
| 408 | #define SOFT_RESET_IA (1 << 15) | 413 | #define SOFT_RESET_IA (1 << 15) |
| 409 | 414 | ||
| 410 | #define GRBM_GFX_INDEX 0x802C | 415 | #define GRBM_GFX_INDEX 0x802C |
| 416 | #define INSTANCE_INDEX(x) ((x) << 0) | ||
| 417 | #define SH_INDEX(x) ((x) << 8) | ||
| 418 | #define SE_INDEX(x) ((x) << 16) | ||
| 419 | #define SH_BROADCAST_WRITES (1 << 29) | ||
| 420 | #define INSTANCE_BROADCAST_WRITES (1 << 30) | ||
| 421 | #define SE_BROADCAST_WRITES (1 << 31) | ||
| 411 | 422 | ||
| 412 | #define GRBM_INT_CNTL 0x8060 | 423 | #define GRBM_INT_CNTL 0x8060 |
| 413 | # define RDERR_INT_ENABLE (1 << 0) | 424 | # define RDERR_INT_ENABLE (1 << 0) |
| @@ -480,6 +491,8 @@ · 66 unmodified lines | |||
| 480 | #define VGT_TF_MEMORY_BASE 0x89B8 | 491 | #define VGT_TF_MEMORY_BASE 0x89B8 |
| 481 | 492 | ||
| 482 | #define CC_GC_SHADER_ARRAY_CONFIG 0x89bc | 493 | #define CC_GC_SHADER_ARRAY_CONFIG 0x89bc |
| 494 | #define INACTIVE_CUS_MASK 0xFFFF0000 | ||
| 495 | #define INACTIVE_CUS_SHIFT 16 | ||
| 483 | #define GC_USER_SHADER_ARRAY_CONFIG 0x89c0 | 496 | #define GC_USER_SHADER_ARRAY_CONFIG 0x89c0 |
| 484 | 497 | ||
| 485 | #define PA_CL_ENHANCE 0x8A14 | 498 | #define PA_CL_ENHANCE 0x8A14 |
| @@ -688,6 +701,12 @@ · 202 unmodified lines | |||
| 688 | #define RLC_MC_CNTL 0xC344 | 701 | #define RLC_MC_CNTL 0xC344 |
| 689 | #define RLC_UCODE_CNTL 0xC348 | 702 | #define RLC_UCODE_CNTL 0xC348 |
| 690 | 703 | ||
| 704 | #define PA_SC_RASTER_CONFIG 0x28350 | ||
| 705 | # define RASTER_CONFIG_RB_MAP_0 0 | ||
| 706 | # define RASTER_CONFIG_RB_MAP_1 1 | ||
| 707 | # define RASTER_CONFIG_RB_MAP_2 2 | ||
| 708 | # define RASTER_CONFIG_RB_MAP_3 3 | ||
| 709 | |||
| 691 | #define VGT_EVENT_INITIATOR 0x28a90 | 710 | #define VGT_EVENT_INITIATOR 0x28a90 |
| 692 | # define SAMPLE_STREAMOUTSTATS1 (1 << 0) | 711 | # define SAMPLE_STREAMOUTSTATS1 (1 << 0) |
| 693 | # define SAMPLE_STREAMOUTSTATS2 (2 << 0) | 712 | # define SAMPLE_STREAMOUTSTATS2 (2 << 0) |
| @@ -181,6 +181,7 @@ · 180 unmodified lines | |||
| 181 | {0x1002, 0x6747, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ | 181 | {0x1002, 0x6747, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ |
| 182 | {0x1002, 0x6748, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ | 182 | {0x1002, 0x6748, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ |
| 183 | {0x1002, 0x6749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ | 183 | {0x1002, 0x6749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ |
| 184 | {0x1002, 0x674A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ | ||
| 184 | {0x1002, 0x6750, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ | 185 | {0x1002, 0x6750, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ |
| 185 | {0x1002, 0x6751, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ | 186 | {0x1002, 0x6751, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ |
| 186 | {0x1002, 0x6758, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ | 187 | {0x1002, 0x6758, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \ |
| @@ -198,6 +199,7 @@ · 11 unmodified lines | |||
| 198 | {0x1002, 0x6767, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ | 199 | {0x1002, 0x6767, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ |
| 199 | {0x1002, 0x6768, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ | 200 | {0x1002, 0x6768, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ |
| 200 | {0x1002, 0x6770, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ | 201 | {0x1002, 0x6770, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ |
| 202 | {0x1002, 0x6771, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ | ||
| 201 | {0x1002, 0x6772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ | 203 | {0x1002, 0x6772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ |
| 202 | {0x1002, 0x6778, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ | 204 | {0x1002, 0x6778, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ |
| 203 | {0x1002, 0x6779, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ | 205 | {0x1002, 0x6779, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \ |
| @@ -229,10 +231,11 @@ · 25 unmodified lines | |||
| 229 | {0x1002, 0x6827, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | 231 | {0x1002, 0x6827, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |
| 230 | {0x1002, 0x6828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ | 232 | {0x1002, 0x6828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ |
| 231 | {0x1002, 0x6829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ | 233 | {0x1002, 0x6829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ |
| 234 | {0x1002, 0x682B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | ||
| 232 | {0x1002, 0x682D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | 235 | {0x1002, 0x682D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |
| 233 | {0x1002, 0x682F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ | 236 | {0x1002, 0x682F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |
| 234 | {0x1002, 0x6830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ | 237 | {0x1002, 0x6830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |
| 235 | {0x1002, 0x6831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ | 238 | {0x1002, 0x6831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ |
| 236 | {0x1002, 0x6837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ | 239 | {0x1002, 0x6837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ |
| 237 | {0x1002, 0x6838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ | 240 | {0x1002, 0x6838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ |
| 238 | {0x1002, 0x6839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ | 241 | {0x1002, 0x6839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ |
| @@ -531,6 +534,7 @@ · 292 unmodified lines | |||
| 531 | {0x1002, 0x9645, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO2|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 534 | {0x1002, 0x9645, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO2|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 532 | {0x1002, 0x9647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ | 535 | {0x1002, 0x9647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ |
| 533 | {0x1002, 0x9648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ | 536 | {0x1002, 0x9648, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ |
| 537 | {0x1002, 0x9649, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\ | ||
| 534 | {0x1002, 0x964a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 538 | {0x1002, 0x964a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 535 | {0x1002, 0x964b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 539 | {0x1002, 0x964b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 536 | {0x1002, 0x964c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 540 | {0x1002, 0x964c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| @@ -550,6 +554,7 @@ · 13 unmodified lines | |||
| 550 | {0x1002, 0x9807, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 554 | {0x1002, 0x9807, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 551 | {0x1002, 0x9808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 555 | {0x1002, 0x9808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 552 | {0x1002, 0x9809, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 556 | {0x1002, 0x9809, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 557 | {0x1002, 0x980A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | ||
| 553 | {0x1002, 0x9900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 558 | {0x1002, 0x9900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 554 | {0x1002, 0x9901, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 559 | {0x1002, 0x9901, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 555 | {0x1002, 0x9903, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 560 | {0x1002, 0x9903, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| @@ -561,11 +566,19 @@ · 5 unmodified lines | |||
| 561 | {0x1002, 0x9909, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 566 | {0x1002, 0x9909, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 562 | {0x1002, 0x990A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 567 | {0x1002, 0x990A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 563 | {0x1002, 0x990F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 568 | {0x1002, 0x990F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 569 | {0x1002, 0x9910, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | ||
| 570 | {0x1002, 0x9913, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | ||
| 571 | {0x1002, 0x9917, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | ||
| 572 | {0x1002, 0x9918, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | ||
| 573 | {0x1002, 0x9919, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | ||
| 564 | {0x1002, 0x9990, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 574 | {0x1002, 0x9990, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 565 | {0x1002, 0x9991, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 575 | {0x1002, 0x9991, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 566 | {0x1002, 0x9992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 576 | {0x1002, 0x9992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 567 | {0x1002, 0x9993, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 577 | {0x1002, 0x9993, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 568 | {0x1002, 0x9994, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | 578 | {0x1002, 0x9994, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ |
| 579 | {0x1002, 0x99A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | ||
| 580 | {0x1002, 0x99A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | ||
| 581 | {0x1002, 0x99A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ | ||
| 569 | {0, 0, 0} | 582 | {0, 0, 0} |
| 570 | 583 | ||
| 571 | #define r128_PCI_IDS \ | 584 | #define r128_PCI_IDS \ |