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 <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Cc: Joachim Henke <[email protected]>
Cc: Michel Dänzer <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>

diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
index d1b95b70af6178990b052029926b6d78ef14956b..797c8bcbb6a4335924a8a3fe10abce4b8cb9f45f 100644 (file)
--- 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)
                           (rdev->pdev->subsystem_device == 0x4a48)) {
                        /* Mac X800 */
                        rdev->mode_info.connector_table = CT_MAC_X800;
-               } else if ((rdev->pdev->device == 0x4150) &&
-                          (rdev->pdev->subsystem_vendor == 0x1002) &&
-                          (rdev->pdev->subsystem_device == 0x4150)) {
+               } else if (of_machine_is_compatible("PowerMac7,2") ||
+                          of_machine_is_compatible("PowerMac7,3")) {
                        /* Mac G5 9600 */
                        rdev->mode_info.connector_table = CT_MAC_G5_9600;
                } else