From: jsg <jsg@openbsd.org>
Date: Wed, 13 Sep 2023 02:22:44 +0000 (+0000)
Subject: use the eMac PowerMac4,4 connector table on eMac PowerMac6,4
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b9b205be9b1d9d0af91646d59511ad3f4e7ae9c7;p=openbsd

use the eMac PowerMac4,4 connector table on eMac PowerMac6,4
avoids black screen on boot

patch from Alex Deucher in
https://gitlab.freedesktop.org/drm/amd/-/issues/2844

reported and tested by Nuno Vasconcellos
---

diff --git a/sys/dev/pci/drm/radeon/radeon_combios.c b/sys/dev/pci/drm/radeon/radeon_combios.c
index 25146cc7cd1..379081f8049 100644
--- a/sys/dev/pci/drm/radeon/radeon_combios.c
+++ b/sys/dev/pci/drm/radeon/radeon_combios.c
@@ -1500,7 +1500,8 @@ bool radeon_get_legacy_connector_info_from_table(struct drm_device *dev)
 		} else if (of_machine_is_compatible("PowerMac3,5")) {
 			/* PowerMac G4 Silver radeon 7500 */
 			rdev->mode_info.connector_table = CT_MAC_G4_SILVER;
-		} else if (of_machine_is_compatible("PowerMac4,4")) {
+		} else if (of_machine_is_compatible("PowerMac4,4") ||
+			   of_machine_is_compatible("PowerMac6,4")) {
 			/* emac */
 			rdev->mode_info.connector_table = CT_EMAC;
 		} else if (of_machine_is_compatible("PowerMac10,1")) {