From 6b00caf8834ed64fb8184d57a677361ad650b262 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Wed, 1 Nov 2023 07:27:01 -0600 Subject: [PATCH] firmware.py: Add handling for iMac18,2 4K display --- CHANGELOG.md | 1 + data/smbios_data.py | 24 +++++++++++++----------- resources/build/firmware.py | 4 ++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcb6e887c..9d8034994 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - `/Library/LaunchDaemons/com.dortania.opencore-legacy-patcher.macos-update.plist` - Load UI icons from local path - Resolves macOS downloader crash on slower machines +- Resolve iMac18,2 internal 4K display support - Remove News Widget removal from Control Centre - News Widget no longer crashes on 3802-based GPUs - Resolve i210 NIC support for macOS Sonoma diff --git a/data/smbios_data.py b/data/smbios_data.py index 0fa0feffc..78170dff2 100644 --- a/data/smbios_data.py +++ b/data/smbios_data.py @@ -2363,7 +2363,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", - "5K Display": True, + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Haswell, device_probe.AMD.Archs.Legacy_GCN_7000, @@ -2382,7 +2382,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", - "5K Display": True, + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Haswell, device_probe.AMD.Archs.Legacy_GCN_7000, @@ -2438,7 +2438,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", - "5K Display": True, + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Skylake, device_probe.AMD.Archs.Legacy_GCN_8000, @@ -2458,7 +2458,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", - "5K Display": True, + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Skylake, device_probe.AMD.Archs.Legacy_GCN_8000, @@ -2478,7 +2478,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", - "5K Display": True, + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Skylake, device_probe.AMD.Archs.Legacy_GCN_8000, @@ -2517,6 +2517,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703, "Ethernet Chipset": "Broadcom", + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Kaby_Lake, device_probe.AMD.Archs.Polaris, @@ -2536,7 +2537,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703, "Ethernet Chipset": "Broadcom", - "5K Display": True, + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Kaby_Lake, device_probe.AMD.Archs.Polaris, @@ -2556,7 +2557,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", - "5K Display": True, + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Coffee_Lake, device_probe.AMD.Archs.Polaris, @@ -2577,7 +2578,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", - "5K Display": True, + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Coffee_Lake, device_probe.AMD.Archs.Polaris, @@ -2598,6 +2599,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Coffee_Lake, device_probe.AMD.Archs.Polaris, @@ -2618,7 +2620,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", - "5K Display": True, + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Comet_Lake, device_probe.AMD.Archs.Navi, @@ -2637,7 +2639,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", - "5K Display": True, + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.Intel.Archs.Comet_Lake, device_probe.AMD.Archs.Navi, @@ -2684,7 +2686,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Aquantia", - "5K Display": True, + "Dual DisplayPort Display": True, "Stock GPUs": [ device_probe.AMD.Archs.Vega, ], diff --git a/resources/build/firmware.py b/resources/build/firmware.py index f944cbe12..75b5396c5 100644 --- a/resources/build/firmware.py +++ b/resources/build/firmware.py @@ -305,10 +305,10 @@ class BuildFirmware: whereas other drivers like ./qa_logger.efi is invoked via Device Path. """ - if "5K Display" not in smbios_data.smbios_dictionary[self.model]: + if "Dual DisplayPort Display" not in smbios_data.smbios_dictionary[self.model]: return - logging.info("- Adding 5K Display Patch") + logging.info("- Adding 4K/5K Display Patch") # Set LauncherPath to '/boot.efi' # This is to ensure that only the Mac's firmware presents the boot option, but not OpenCore # https://github.com/acidanthera/OpenCorePkg/blob/0.7.6/Library/OcAppleBootPolicyLib/OcAppleBootPolicyLib.c#L50-L73