aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2011-06-06 12:53:30 -0400
committerDave Airlie <airlied@redhat.com>2011-06-13 20:05:09 -0400
commitab21e60beaa96f2c55604f633dfe74076c531df7 (patch)
treee6e4ef08e3969502a1ae5257f801b9b12494c499 /drivers
parent7ad35cf288fd63a19bf50e490440a992de808b2b (diff)
drm/radeon/kms: fix mac g5 quirk
Apple uses the same subsystem pci ids for lots of hardware much of which is wired up differently. In this case, the G5 imac and the G5 tower. Only apply the quirk configuration to G5 towers. Reported-by: Joachim Henke <j-o@users.sourceforge.net> Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Cc: Joachim Henke <j-o@users.sourceforge.net> Cc: Michel Dänzer <michel@daenzer.net> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/radeon_combios.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index d1b95b70af61..797c8bcbb6a4 100644
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -1553,9 +1553,8 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev)
1553 (rdev->pdev->subsystem_device == 0x4a48)) { 1553 (rdev->pdev->subsystem_device == 0x4a48)) {
1554 /* Mac X800 */ 1554 /* Mac X800 */
1555 rdev->mode_info.connector_table = CT_MAC_X800; 1555 rdev->mode_info.connector_table = CT_MAC_X800;
1556 } else if ((rdev->pdev->device == 0x4150) && 1556 } else if (of_machine_is_compatible("PowerMac7,2") ||
1557 (rdev->pdev->subsystem_vendor == 0x1002) && 1557 of_machine_is_compatible("PowerMac7,3")) {
1558 (rdev->pdev->subsystem_device == 0x4150)) {
1559 /* Mac G5 9600 */ 1558 /* Mac G5 9600 */
1560 rdev->mode_info.connector_table = CT_MAC_G5_9600; 1559 rdev->mode_info.connector_table = CT_MAC_G5_9600;
1561 } else 1560 } else