diff options
author | Dave Airlie <airlied@redhat.com> | 2010-03-31 00:55:14 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-03-31 00:55:14 -0400 |
commit | 3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch) | |
tree | 15671ed8bd3597d2efe13aa57b755c66014acb57 /drivers/gpu/drm/radeon | |
parent | c414a117c6094c3f86b533f97beaf45ef9075f03 (diff) | |
parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) |
Merge branch 'v2.6.34-rc2' into drm-linus
Diffstat (limited to 'drivers/gpu/drm/radeon')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_combios.c | 44 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_state.c | 2 |
2 files changed, 23 insertions, 23 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 6d87e70a505..2becdeda68a 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c | |||
@@ -1353,47 +1353,47 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev) | |||
1353 | rdev->mode_info.connector_table = radeon_connector_table; | 1353 | rdev->mode_info.connector_table = radeon_connector_table; |
1354 | if (rdev->mode_info.connector_table == CT_NONE) { | 1354 | if (rdev->mode_info.connector_table == CT_NONE) { |
1355 | #ifdef CONFIG_PPC_PMAC | 1355 | #ifdef CONFIG_PPC_PMAC |
1356 | if (machine_is_compatible("PowerBook3,3")) { | 1356 | if (of_machine_is_compatible("PowerBook3,3")) { |
1357 | /* powerbook with VGA */ | 1357 | /* powerbook with VGA */ |
1358 | rdev->mode_info.connector_table = CT_POWERBOOK_VGA; | 1358 | rdev->mode_info.connector_table = CT_POWERBOOK_VGA; |
1359 | } else if (machine_is_compatible("PowerBook3,4") || | 1359 | } else if (of_machine_is_compatible("PowerBook3,4") || |
1360 | machine_is_compatible("PowerBook3,5")) { | 1360 | of_machine_is_compatible("PowerBook3,5")) { |
1361 | /* powerbook with internal tmds */ | 1361 | /* powerbook with internal tmds */ |
1362 | rdev->mode_info.connector_table = CT_POWERBOOK_INTERNAL; | 1362 | rdev->mode_info.connector_table = CT_POWERBOOK_INTERNAL; |
1363 | } else if (machine_is_compatible("PowerBook5,1") || | 1363 | } else if (of_machine_is_compatible("PowerBook5,1") || |
1364 | machine_is_compatible("PowerBook5,2") || | 1364 | of_machine_is_compatible("PowerBook5,2") || |
1365 | machine_is_compatible("PowerBook5,3") || | 1365 | of_machine_is_compatible("PowerBook5,3") || |
1366 | machine_is_compatible("PowerBook5,4") || | 1366 | of_machine_is_compatible("PowerBook5,4") || |
1367 | machine_is_compatible("PowerBook5,5")) { | 1367 | of_machine_is_compatible("PowerBook5,5")) { |
1368 | /* powerbook with external single link tmds (sil164) */ | 1368 | /* powerbook with external single link tmds (sil164) */ |
1369 | rdev->mode_info.connector_table = CT_POWERBOOK_EXTERNAL; | 1369 | rdev->mode_info.connector_table = CT_POWERBOOK_EXTERNAL; |
1370 | } else if (machine_is_compatible("PowerBook5,6")) { | 1370 | } else if (of_machine_is_compatible("PowerBook5,6")) { |
1371 | /* powerbook with external dual or single link tmds */ | 1371 | /* powerbook with external dual or single link tmds */ |
1372 | rdev->mode_info.connector_table = CT_POWERBOOK_EXTERNAL; | 1372 | rdev->mode_info.connector_table = CT_POWERBOOK_EXTERNAL; |
1373 | } else if (machine_is_compatible("PowerBook5,7") || | 1373 | } else if (of_machine_is_compatible("PowerBook5,7") || |
1374 | machine_is_compatible("PowerBook5,8") || | 1374 | of_machine_is_compatible("PowerBook5,8") || |
1375 | machine_is_compatible("PowerBook5,9")) { | 1375 | of_machine_is_compatible("PowerBook5,9")) { |
1376 | /* PowerBook6,2 ? */ | 1376 | /* PowerBook6,2 ? */ |
1377 | /* powerbook with external dual link tmds (sil1178?) */ | 1377 | /* powerbook with external dual link tmds (sil1178?) */ |
1378 | rdev->mode_info.connector_table = CT_POWERBOOK_EXTERNAL; | 1378 | rdev->mode_info.connector_table = CT_POWERBOOK_EXTERNAL; |
1379 | } else if (machine_is_compatible("PowerBook4,1") || | 1379 | } else if (of_machine_is_compatible("PowerBook4,1") || |
1380 | machine_is_compatible("PowerBook4,2") || | 1380 | of_machine_is_compatible("PowerBook4,2") || |
1381 | machine_is_compatible("PowerBook4,3") || | 1381 | of_machine_is_compatible("PowerBook4,3") || |
1382 | machine_is_compatible("PowerBook6,3") || | 1382 | of_machine_is_compatible("PowerBook6,3") || |
1383 | machine_is_compatible("PowerBook6,5") || | 1383 | of_machine_is_compatible("PowerBook6,5") || |
1384 | machine_is_compatible("PowerBook6,7")) { | 1384 | of_machine_is_compatible("PowerBook6,7")) { |
1385 | /* ibook */ | 1385 | /* ibook */ |
1386 | rdev->mode_info.connector_table = CT_IBOOK; | 1386 | rdev->mode_info.connector_table = CT_IBOOK; |
1387 | } else if (machine_is_compatible("PowerMac4,4")) { | 1387 | } else if (of_machine_is_compatible("PowerMac4,4")) { |
1388 | /* emac */ | 1388 | /* emac */ |
1389 | rdev->mode_info.connector_table = CT_EMAC; | 1389 | rdev->mode_info.connector_table = CT_EMAC; |
1390 | } else if (machine_is_compatible("PowerMac10,1")) { | 1390 | } else if (of_machine_is_compatible("PowerMac10,1")) { |
1391 | /* mini with internal tmds */ | 1391 | /* mini with internal tmds */ |
1392 | rdev->mode_info.connector_table = CT_MINI_INTERNAL; | 1392 | rdev->mode_info.connector_table = CT_MINI_INTERNAL; |
1393 | } else if (machine_is_compatible("PowerMac10,2")) { | 1393 | } else if (of_machine_is_compatible("PowerMac10,2")) { |
1394 | /* mini with external tmds */ | 1394 | /* mini with external tmds */ |
1395 | rdev->mode_info.connector_table = CT_MINI_EXTERNAL; | 1395 | rdev->mode_info.connector_table = CT_MINI_EXTERNAL; |
1396 | } else if (machine_is_compatible("PowerMac12,1")) { | 1396 | } else if (of_machine_is_compatible("PowerMac12,1")) { |
1397 | /* PowerMac8,1 ? */ | 1397 | /* PowerMac8,1 ? */ |
1398 | /* imac g5 isight */ | 1398 | /* imac g5 isight */ |
1399 | rdev->mode_info.connector_table = CT_IMAC_G5_ISIGHT; | 1399 | rdev->mode_info.connector_table = CT_IMAC_G5_ISIGHT; |
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c index 3c32f840dcd..40ab6d9c373 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c | |||
@@ -1093,7 +1093,7 @@ static void radeon_cp_dispatch_clear(struct drm_device * dev, | |||
1093 | /* judging by the first tile offset needed, could possibly | 1093 | /* judging by the first tile offset needed, could possibly |
1094 | directly address/clear 4x4 tiles instead of 8x2 * 4x4 | 1094 | directly address/clear 4x4 tiles instead of 8x2 * 4x4 |
1095 | macro tiles, though would still need clear mask for | 1095 | macro tiles, though would still need clear mask for |
1096 | right/bottom if truely 4x4 granularity is desired ? */ | 1096 | right/bottom if truly 4x4 granularity is desired ? */ |
1097 | OUT_RING(tileoffset * 16); | 1097 | OUT_RING(tileoffset * 16); |
1098 | /* the number of tiles to clear */ | 1098 | /* the number of tiles to clear */ |
1099 | OUT_RING(nrtilesx + 1); | 1099 | OUT_RING(nrtilesx + 1); |