History

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

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

Linus Torvalds committed 14 years ago

Commit f80c43e2 parents fffaee3 7aaa61b13 files · +255 −368Browse files

Unified · Split

13 files
  1. drivers/gpu/drm/radeon/ni.c +17 −4
  2. drivers/gpu/drm/radeon/r600.c +6 −9
  3. drivers/gpu/drm/radeon/r600_audio.c +3 −2
  4. drivers/gpu/drm/radeon/r600_hdmi.c +0 −1
  5. drivers/gpu/drm/radeon/radeon.h +2 −3
  6. drivers/gpu/drm/radeon/radeon_gart.c +12 −7
  7. drivers/gpu/drm/radeon/radeon_kms.c +1 −1
  8. drivers/gpu/drm/radeon/rs600.c +6 −6
  9. drivers/gpu/drm/radeon/rs690.c +6 −6
  10. drivers/gpu/drm/radeon/rv770.c +6 −12
  11. drivers/gpu/drm/radeon/si.c +162 −315
  12. drivers/gpu/drm/radeon/sid.h +19 −0
  13. include/drm/drm_pciids.h +15 −2
drivers/gpu/drm/radeon/ni.c+17−4
@@ -460,15 +460,28 @@ static void cayman_gpu_init(struct radeon_device *rdev) · 459 unmodified lines
460460 rdev->config.cayman.max_pipes_per_simd = 4;
461461 rdev->config.cayman.max_tile_pipes = 2;
462462 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)) {
464471 rdev->config.cayman.max_simds_per_se = 6;
465472 rdev->config.cayman.max_backends_per_se = 2;
466473 } 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)) {
468478 rdev->config.cayman.max_simds_per_se = 4;
469479 rdev->config.cayman.max_backends_per_se = 2;
470− } else if ((rdev->pdev->device == 0x9990) ||
471− (rdev->pdev->device == 0x9991)) {
480+ } else if ((rdev->pdev->device == 0x9919) ||
481+ (rdev->pdev->device == 0x9990) ||
482+ (rdev->pdev->device == 0x9991) ||
483+ (rdev->pdev->device == 0x9994) ||
484+ (rdev->pdev->device == 0x99A0)) {
472485 rdev->config.cayman.max_simds_per_se = 3;
473486 rdev->config.cayman.max_backends_per_se = 1;
474487 } else {
drivers/gpu/drm/radeon/r600.c+6−9
@@ -2426,6 +2426,12 @@ int r600_startup(struct radeon_device *rdev) · 2425 unmodified lines
24262426 if (r)
24272427 return r;
24282428
2429+ r = r600_audio_init(rdev);
2430+ if (r) {
2431+ DRM_ERROR("radeon: audio init failed\n");
2432+ return r;
2433+ }
2434+
24292435 return 0;
24302436 }
24312437
@@ -2462,12 +2468,6 @@ int r600_resume(struct radeon_device *rdev) · 30 unmodified lines
24622468 return r;
24632469 }
24642470
2465− r = r600_audio_init(rdev);
2466− if (r) {
2467− DRM_ERROR("radeon: audio resume failed\n");
2468− return r;
2469− }
2470−
24712471 return r;
24722472 }
24732473
@@ -2577,9 +2577,6 @@ int r600_init(struct radeon_device *rdev) · 103 unmodified lines
25772577 rdev->accel_working = false;
25782578 }
25792579
2580− r = r600_audio_init(rdev);
2581− if (r)
2582− return r; /* TODO error handling */
25832580 return 0;
25842581 }
25852582
drivers/gpu/drm/radeon/r600_audio.c+3−2
@@ -192,6 +192,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) · 191 unmodified lines
192192 struct radeon_device *rdev = dev->dev_private;
193193 struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
194194 struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
195+ struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
195196 int base_rate = 48000;
196197
197198 switch (radeon_encoder->encoder_id) {
@@ -217,8 +218,8 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) · 19 unmodified lines
217218 WREG32(EVERGREEN_AUDIO_PLL1_DIV, clock * 10);
218219 WREG32(EVERGREEN_AUDIO_PLL1_UNK, 0x00000071);
219220
220− /* Some magic trigger or src sel? */
221− WREG32_P(0x5ac, 0x01, ~0x77);
221+ /* Select DTO source */
222+ WREG32(0x5ac, radeon_crtc->crtc_id);
222223 } else {
223224 switch (dig->dig_encoder) {
224225 case 0:
drivers/gpu/drm/radeon/r600_hdmi.c+0−1
@@ -348,7 +348,6 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod · 347 unmodified lines
348348 WREG32(HDMI0_AUDIO_PACKET_CONTROL + offset,
349349 HDMI0_AUDIO_SAMPLE_SEND | /* send audio packets */
350350 HDMI0_AUDIO_DELAY_EN(1) | /* default audio delay */
351− HDMI0_AUDIO_SEND_MAX_PACKETS | /* send NULL packets if no audio is available */
352351 HDMI0_AUDIO_PACKETS_PER_LINE(3) | /* should be suffient for all audio modes and small enough for all hblanks */
353352 HDMI0_60958_CS_UPDATE); /* allow 60958 channel status fields to be updated */
354353 }
drivers/gpu/drm/radeon/radeon.h+2−3
@@ -1374,9 +1374,9 @@ struct cayman_asic { · 1373 unmodified lines
13741374
13751375 struct si_asic {
13761376 unsigned max_shader_engines;
1377− unsigned max_pipes_per_simd;
13781377 unsigned max_tile_pipes;
1379− unsigned max_simds_per_se;
1378+ unsigned max_cu_per_sh;
1379+ unsigned max_sh_per_se;
13801380 unsigned max_backends_per_se;
13811381 unsigned max_texture_channel_caches;
13821382 unsigned max_gprs;
@@ -1387,7 +1387,6 @@ struct si_asic { · 4 unmodified lines
13871387 unsigned sc_hiz_tile_fifo_size;
13881388 unsigned sc_earlyz_tile_fifo_size;
13891389
1390− unsigned num_shader_engines;
13911390 unsigned num_tile_pipes;
13921391 unsigned num_backends_per_se;
13931392 unsigned backend_disable_mask_per_asic;
drivers/gpu/drm/radeon/radeon_gart.c+12−7
@@ -476,12 +476,18 @@ int radeon_vm_bo_add(struct radeon_device *rdev, · 475 unmodified lines
476476
477477 mutex_lock(&vm->mutex);
478478 if (last_pfn > vm->last_pfn) {
479− /* grow va space 32M by 32M */
480− unsigned align = ((32 << 20) >> 12) - 1;
479+ /* release mutex and lock in right order */
480+ mutex_unlock(&vm->mutex);
481481 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+ }
483490 radeon_mutex_unlock(&rdev->cs_mutex);
484− vm->last_pfn = (last_pfn + align) & ~align;
485491 }
486492 head = &vm->va;
487493 last_offset = 0;
@@ -595,8 +601,8 @@ int radeon_vm_bo_rmv(struct radeon_device *rdev, · 107 unmodified lines
595601 if (bo_va == NULL)
596602 return 0;
597603
598− mutex_lock(&vm->mutex);
599604 radeon_mutex_lock(&rdev->cs_mutex);
605+ mutex_lock(&vm->mutex);
600606 radeon_vm_bo_update_pte(rdev, vm, bo, NULL);
601607 radeon_mutex_unlock(&rdev->cs_mutex);
602608 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
641647 struct radeon_bo_va *bo_va, *tmp;
642648 int r;
643649
644− mutex_lock(&vm->mutex);
645−
646650 radeon_mutex_lock(&rdev->cs_mutex);
651+ mutex_lock(&vm->mutex);
647652 radeon_vm_unbind_locked(rdev, vm);
648653 radeon_mutex_unlock(&rdev->cs_mutex);
649654
drivers/gpu/drm/radeon/radeon_kms.c+1−1
@@ -273,7 +273,7 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) · 272 unmodified lines
273273 break;
274274 case RADEON_INFO_MAX_PIPES:
275275 if (rdev->family >= CHIP_TAHITI)
276− value = rdev->config.si.max_pipes_per_simd;
276+ value = rdev->config.si.max_cu_per_sh;
277277 else if (rdev->family >= CHIP_CAYMAN)
278278 value = rdev->config.cayman.max_pipes_per_simd;
279279 else if (rdev->family >= CHIP_CEDAR)
drivers/gpu/drm/radeon/rs600.c+6−6
@@ -908,12 +908,6 @@ static int rs600_startup(struct radeon_device *rdev) · 907 unmodified lines
908908 return r;
909909 }
910910
911− r = r600_audio_init(rdev);
912− if (r) {
913− dev_err(rdev->dev, "failed initializing audio\n");
914− return r;
915− }
916−
917911 r = radeon_ib_pool_start(rdev);
918912 if (r)
919913 return r;
@@ -922,6 +916,12 @@ static int rs600_startup(struct radeon_device *rdev) · 2 unmodified lines
922916 if (r)
923917 return r;
924918
919+ r = r600_audio_init(rdev);
920+ if (r) {
921+ dev_err(rdev->dev, "failed initializing audio\n");
922+ return r;
923+ }
924+
925925 return 0;
926926 }
927927
drivers/gpu/drm/radeon/rs690.c+6−6
@@ -637,12 +637,6 @@ static int rs690_startup(struct radeon_device *rdev) · 636 unmodified lines
637637 return r;
638638 }
639639
640− r = r600_audio_init(rdev);
641− if (r) {
642− dev_err(rdev->dev, "failed initializing audio\n");
643− return r;
644− }
645−
646640 r = radeon_ib_pool_start(rdev);
647641 if (r)
648642 return r;
@@ -651,6 +645,12 @@ static int rs690_startup(struct radeon_device *rdev) · 2 unmodified lines
651645 if (r)
652646 return r;
653647
648+ r = r600_audio_init(rdev);
649+ if (r) {
650+ dev_err(rdev->dev, "failed initializing audio\n");
651+ return r;
652+ }
653+
654654 return 0;
655655 }
656656
drivers/gpu/drm/radeon/rv770.c+6−12
@@ -956,6 +956,12 @@ static int rv770_startup(struct radeon_device *rdev) · 955 unmodified lines
956956 if (r)
957957 return r;
958958
959+ r = r600_audio_init(rdev);
960+ if (r) {
961+ DRM_ERROR("radeon: audio init failed\n");
962+ return r;
963+ }
964+
959965 return 0;
960966 }
961967
@@ -978,12 +984,6 @@ int rv770_resume(struct radeon_device *rdev) · 16 unmodified lines
978984 return r;
979985 }
980986
981− r = r600_audio_init(rdev);
982− if (r) {
983− dev_err(rdev->dev, "radeon: audio init failed\n");
984− return r;
985− }
986−
987987 return r;
988988
989989 }
@@ -1092,12 +1092,6 @@ int rv770_init(struct radeon_device *rdev) · 102 unmodified lines
10921092 rdev->accel_working = false;
10931093 }
10941094
1095− r = r600_audio_init(rdev);
1096− if (r) {
1097− dev_err(rdev->dev, "radeon: audio init failed\n");
1098− return r;
1099− }
1100−
11011095 return 0;
11021096 }
11031097
drivers/gpu/drm/radeon/si.c+162−315
@@ -867,200 +867,6 @@ void dce6_bandwidth_update(struct radeon_device *rdev) · 866 unmodified lines
867867 /*
868868 * Core functions
869869 */
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−
1064870 static void si_tiling_mode_table_init(struct radeon_device *rdev)
1065871 {
1066872 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
15621368 DRM_ERROR("unknown asic: 0x%x\n", rdev->family);
15631369 }
15641370
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+
15651511 static void si_gpu_init(struct radeon_device *rdev)
15661512 {
1567− u32 cc_rb_backend_disable = 0;
1568− u32 cc_gc_shader_array_config;
15691513 u32 gb_addr_config = 0;
15701514 u32 mc_shared_chmap, mc_arb_ramcfg;
1571− u32 gb_backend_map;
1572− u32 cgts_tcc_disable;
15731515 u32 sx_debug_1;
1574− u32 gc_user_shader_array_config;
1575− u32 gc_user_rb_backend_disable;
1576− u32 cgts_user_tcc_disable;
15771516 u32 hdp_host_path_cntl;
15781517 u32 tmp;
15791518 int i, j;
@@ -1581,9 +1520,9 @@ static void si_gpu_init(struct radeon_device *rdev) · 1 unmodified line
15811520 switch (rdev->family) {
15821521 case CHIP_TAHITI:
15831522 rdev->config.si.max_shader_engines = 2;
1584− rdev->config.si.max_pipes_per_simd = 4;
15851523 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;
15871526 rdev->config.si.max_backends_per_se = 4;
15881527 rdev->config.si.max_texture_channel_caches = 12;
15891528 rdev->config.si.max_gprs = 256;
@@ -1594,12 +1533,13 @@ static void si_gpu_init(struct radeon_device *rdev) · 4 unmodified lines
15941533 rdev->config.si.sc_prim_fifo_size_backend = 0x100;
15951534 rdev->config.si.sc_hiz_tile_fifo_size = 0x30;
15961535 rdev->config.si.sc_earlyz_tile_fifo_size = 0x130;
1536+ gb_addr_config = TAHITI_GB_ADDR_CONFIG_GOLDEN;
15971537 break;
15981538 case CHIP_PITCAIRN:
15991539 rdev->config.si.max_shader_engines = 2;
1600− rdev->config.si.max_pipes_per_simd = 4;
16011540 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;
16031543 rdev->config.si.max_backends_per_se = 4;
16041544 rdev->config.si.max_texture_channel_caches = 8;
16051545 rdev->config.si.max_gprs = 256;
@@ -1610,13 +1550,14 @@ static void si_gpu_init(struct radeon_device *rdev) · 4 unmodified lines
16101550 rdev->config.si.sc_prim_fifo_size_backend = 0x100;
16111551 rdev->config.si.sc_hiz_tile_fifo_size = 0x30;
16121552 rdev->config.si.sc_earlyz_tile_fifo_size = 0x130;
1553+ gb_addr_config = TAHITI_GB_ADDR_CONFIG_GOLDEN;
16131554 break;
16141555 case CHIP_VERDE:
16151556 default:
16161557 rdev->config.si.max_shader_engines = 1;
1617− rdev->config.si.max_pipes_per_simd = 4;
16181558 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;
16201561 rdev->config.si.max_backends_per_se = 4;
16211562 rdev->config.si.max_texture_channel_caches = 4;
16221563 rdev->config.si.max_gprs = 256;
@@ -1627,6 +1568,7 @@ static void si_gpu_init(struct radeon_device *rdev) · 4 unmodified lines
16271568 rdev->config.si.sc_prim_fifo_size_backend = 0x40;
16281569 rdev->config.si.sc_hiz_tile_fifo_size = 0x30;
16291570 rdev->config.si.sc_earlyz_tile_fifo_size = 0x130;
1571+ gb_addr_config = VERDE_GB_ADDR_CONFIG_GOLDEN;
16301572 break;
16311573 }
16321574
@@ -1648,31 +1590,7 @@ static void si_gpu_init(struct radeon_device *rdev) · 15 unmodified lines
16481590 mc_shared_chmap = RREG32(MC_SHARED_CHMAP);
16491591 mc_arb_ramcfg = RREG32(MC_ARB_RAMCFG);
16501592
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;
16611593 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);
16761594 rdev->config.si.mem_max_burst_length_bytes = 256;
16771595 tmp = (mc_arb_ramcfg & NOOFCOLS_MASK) >> NOOFCOLS_SHIFT;
16781596 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
16831601 rdev->config.si.num_gpus = 1;
16841602 rdev->config.si.multi_gpu_tile_size = 64;
16851603
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;
17351606 switch (rdev->config.si.mem_row_size_in_kb) {
17361607 case 1:
17371608 default:
@@ -1745,26 +1616,6 @@ static void si_gpu_init(struct radeon_device *rdev) · 7 unmodified lines
17451616 break;
17461617 }
17471618
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−
17681619 /* setup tiling info dword. gb_addr_config is not adequate since it does
17691620 * not have bank info, so create a custom tiling dword.
17701621 * bits 3:0 num_pipes
@@ -1789,33 +1640,29 @@ static void si_gpu_init(struct radeon_device *rdev) · 18 unmodified lines
17891640 rdev->config.si.tile_config |= (3 << 0);
17901641 break;
17911642 }
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;
17941647 rdev->config.si.tile_config |=
17951648 ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8;
17961649 rdev->config.si.tile_config |=
17971650 ((gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT) << 12;
17981651
1799− rdev->config.si.backend_map = gb_backend_map;
18001652 WREG32(GB_ADDR_CONFIG, gb_addr_config);
18011653 WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
18021654 WREG32(HDP_ADDR_CONFIG, gb_addr_config);
18031655
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);
18101657
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);
18151661
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);
18171665
1818− si_tiling_mode_table_init(rdev);
18191666
18201667 /* set HW defaults for 3D engine */
18211668 WREG32(CP_QUEUE_THRESHOLDS, (ROQ_IB1_START(0x16) |
drivers/gpu/drm/radeon/sid.h+19−0
@@ -24,6 +24,11 @@ · 23 unmodified lines
2424 #ifndef SI_H
2525 #define SI_H
2626
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+
2732 #define CG_MULT_THERMAL_STATUS 0x714
2833 #define ASIC_MAX_TEMP(x) ((x) << 0)
2934 #define ASIC_MAX_TEMP_MASK 0x000001ff
@@ -408,6 +413,12 @@ · 378 unmodified lines
408413 #define SOFT_RESET_IA (1 << 15)
409414
410415 #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)
411422
412423 #define GRBM_INT_CNTL 0x8060
413424 # define RDERR_INT_ENABLE (1 << 0)
@@ -480,6 +491,8 @@ · 66 unmodified lines
480491 #define VGT_TF_MEMORY_BASE 0x89B8
481492
482493 #define CC_GC_SHADER_ARRAY_CONFIG 0x89bc
494+#define INACTIVE_CUS_MASK 0xFFFF0000
495+#define INACTIVE_CUS_SHIFT 16
483496 #define GC_USER_SHADER_ARRAY_CONFIG 0x89c0
484497
485498 #define PA_CL_ENHANCE 0x8A14
@@ -688,6 +701,12 @@ · 202 unmodified lines
688701 #define RLC_MC_CNTL 0xC344
689702 #define RLC_UCODE_CNTL 0xC348
690703
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+
691710 #define VGT_EVENT_INITIATOR 0x28a90
692711 # define SAMPLE_STREAMOUTSTATS1 (1 << 0)
693712 # define SAMPLE_STREAMOUTSTATS2 (2 << 0)
include/drm/drm_pciids.h+15−2
@@ -181,6 +181,7 @@ · 180 unmodified lines
181181 {0x1002, 0x6747, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
182182 {0x1002, 0x6748, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
183183 {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}, \
184185 {0x1002, 0x6750, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
185186 {0x1002, 0x6751, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
186187 {0x1002, 0x6758, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TURKS|RADEON_NEW_MEMMAP}, \
@@ -198,6 +199,7 @@ · 11 unmodified lines
198199 {0x1002, 0x6767, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
199200 {0x1002, 0x6768, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
200201 {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}, \
201203 {0x1002, 0x6772, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
202204 {0x1002, 0x6778, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
203205 {0x1002, 0x6779, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_CAICOS|RADEON_NEW_MEMMAP}, \
@@ -229,10 +231,11 @@ · 25 unmodified lines
229231 {0x1002, 0x6827, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
230232 {0x1002, 0x6828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
231233 {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}, \
232235 {0x1002, 0x682D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
233236 {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}, \
235− {0x1002, 0x6831, 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}, \
238+ {0x1002, 0x6831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
236239 {0x1002, 0x6837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
237240 {0x1002, 0x6838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
238241 {0x1002, 0x6839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
@@ -531,6 +534,7 @@ · 292 unmodified lines
531534 {0x1002, 0x9645, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO2|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
532535 {0x1002, 0x9647, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP},\
533536 {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},\
534538 {0x1002, 0x964a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
535539 {0x1002, 0x964b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_SUMO|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
536540 {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
550554 {0x1002, 0x9807, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
551555 {0x1002, 0x9808, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PALM|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
552556 {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}, \
553558 {0x1002, 0x9900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
554559 {0x1002, 0x9901, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
555560 {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
561566 {0x1002, 0x9909, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
562567 {0x1002, 0x990A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
563568 {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}, \
564574 {0x1002, 0x9990, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
565575 {0x1002, 0x9991, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
566576 {0x1002, 0x9992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
567577 {0x1002, 0x9993, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
568578 {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}, \
569582 {0, 0, 0}
570583
571584 #define r128_PCI_IDS \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t