diff options
| author | Martin Pieuchot <mpieuchot@nolizard.org> | 2013-07-08 17:51:22 +0200 |
|---|---|---|
| committer | Jonathan Gray <jsg@jsg.id.au> | 2013-08-12 10:45:11 +1000 |
| commit | 04fe42506156d6238b47b7846b957a5a91c8cfde (patch) | |
| tree | 1636c51ea8243eabec47bfaff4faecca24d782f1 /sys | |
| parent | 18f1f94878fa3e63cf9bdc33821e320ecc20c7d2 (diff) | |
enable macppc-specific part of radeon_get_legacy_connector_info_from_table()
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_combios.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/pci/drm/radeon/radeon_combios.c b/sys/dev/pci/drm/radeon/radeon_combios.c index c22d1bc20e2..c2b3535b055 100644 --- a/sys/dev/pci/drm/radeon/radeon_combios.c +++ b/sys/dev/pci/drm/radeon/radeon_combios.c @@ -1525,7 +1525,7 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev) rdev->mode_info.connector_table = radeon_connector_table; if (rdev->mode_info.connector_table == CT_NONE) { -#ifdef CONFIG_PPC_PMAC +#ifdef __macppc__ if (of_machine_is_compatible("PowerBook3,3")) { /* powerbook with VGA */ rdev->mode_info.connector_table = CT_POWERBOOK_VGA; @@ -1573,25 +1573,25 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev) /* PowerMac8,1 ? */ /* imac g5 isight */ rdev->mode_info.connector_table = CT_IMAC_G5_ISIGHT; - } else if ((ddev->pci_device == 0x4a48) && - (ddev->pci_subvendor == 0x1002) && - (ddev->pci_subdevice == 0x4a48)) { + } else if ((rdev->ddev->pci_device == 0x4a48) && + (rdev->ddev->pci_subvendor == 0x1002) && + (rdev->ddev->pci_subdevice == 0x4a48)) { /* Mac X800 */ rdev->mode_info.connector_table = CT_MAC_X800; } else if ((of_machine_is_compatible("PowerMac7,2") || of_machine_is_compatible("PowerMac7,3")) && - (ddev->pci_device == 0x4150) && - (ddev->pci_subvendor == 0x1002) && - (ddev->pci_subdevice == 0x4150)) { + (rdev->ddev->pci_device == 0x4150) && + (rdev->ddev->pci_subvendor == 0x1002) && + (rdev->ddev->pci_subdevice == 0x4150)) { /* Mac G5 tower 9600 */ rdev->mode_info.connector_table = CT_MAC_G5_9600; - } else if ((ddev->pci_device == 0x4c66) && - (ddev->pci_subvendor == 0x1002) && - (ddev->pci_subdevice == 0x4c66)) { + } else if ((rdev->ddev->pci_device == 0x4c66) && + (rdev->ddev->pci_subvendor == 0x1002) && + (rdev->ddev->pci_subdevice == 0x4c66)) { /* SAM440ep RV250 embedded board */ rdev->mode_info.connector_table = CT_SAM440EP; } else -#endif /* CONFIG_PPC_PMAC */ +#endif /* __macppc__ */ #ifdef CONFIG_PPC64 if (ASIC_IS_RN50(rdev)) rdev->mode_info.connector_table = CT_RN50_POWER; |