From 43312083f29b74c8f9ee9db3ada0c3566deb439c Mon Sep 17 00:00:00 2001 From: jsg Date: Tue, 24 Oct 2023 10:12:09 +0000 Subject: [PATCH] revert rev 1.19 'drm/radeon: Fix eDP for single-display iMac11,2' mglocker@ reports this caused the screen to stay black on iMac11,2 when radeondrm takes over --- sys/dev/pci/drm/radeon/atombios_encoders.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/drm/radeon/atombios_encoders.c b/sys/dev/pci/drm/radeon/atombios_encoders.c index 3e24fa11d4d..c841c273222 100644 --- a/sys/dev/pci/drm/radeon/atombios_encoders.c +++ b/sys/dev/pci/drm/radeon/atombios_encoders.c @@ -2122,12 +2122,11 @@ int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder, int fe_idx) /* * On DCE32 any encoder can drive any block so usually just use crtc id, - * but Apple thinks different at least on iMac10,1 and iMac11,2, so there use linkb, + * but Apple thinks different at least on iMac10,1, so there use linkb, * otherwise the internal eDP panel will stay dark. */ if (ASIC_IS_DCE32(rdev)) { - if (dmi_match(DMI_PRODUCT_NAME, "iMac10,1") || - dmi_match(DMI_PRODUCT_NAME, "iMac11,2")) + if (dmi_match(DMI_PRODUCT_NAME, "iMac10,1")) enc_idx = (dig->linkb) ? 1 : 0; else enc_idx = radeon_crtc->crtc_id; -- 2.20.1