From 6d129505ea03ba74ed93a8fea0388b3a90b10489 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Mon, 18 Oct 2021 21:53:31 -0600 Subject: [PATCH 1/6] Fix non-Metal acceleration crashing on 12.0.1 --- CHANGELOG.md | 2 ++ resources/constants.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fbe6521c..6294d7a06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ - Drop `CSR_ALLOW_EXECUTABLE_POLICY_OVERRIDE` requirement for root patching - Lowers default SIP Disabled value to 0xA03 - Remove legacy GMUX patch set for MacBookPro5,x machines due to instabilites +- Fix non-Metal acceleration crashing on 12.0.1 + - Yes Apple adding a notch broke our accel patches ## 0.3.0 - Fix Nvidia Tesla Acceleration in Monterey Beta 7+ diff --git a/resources/constants.py b/resources/constants.py index 9c5efd00b..4ecbe2d83 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -14,7 +14,7 @@ class Constants: def __init__(self): # Patcher Versioning self.patcher_version = "0.3.1" # OpenCore-Legacy-Patcher - self.patcher_support_pkg_version = "0.1.7" # PatcherSupportPkg + self.patcher_support_pkg_version = "0.1.8" # PatcherSupportPkg self.url_patcher_support_pkg = "https://github.com/dortania/PatcherSupportPkg/releases/download/" self.nightly_url_patcher_support_pkg = "https://nightly.link/dortania/PatcherSupportPkg/workflows/build/master/" From a63d1953b4ce6453177d25cdc072f559802cc3a1 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Tue, 19 Oct 2021 13:18:11 -0600 Subject: [PATCH 2/6] Fix non-Metal Control Center --- CHANGELOG.md | 1 + resources/constants.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6294d7a06..b84740582 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Remove legacy GMUX patch set for MacBookPro5,x machines due to instabilites - Fix non-Metal acceleration crashing on 12.0.1 - Yes Apple adding a notch broke our accel patches +- Fix non-Metal Control Center crashing on 12.0 Beta 10+ ## 0.3.0 - Fix Nvidia Tesla Acceleration in Monterey Beta 7+ diff --git a/resources/constants.py b/resources/constants.py index 4ecbe2d83..906167581 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -14,7 +14,7 @@ class Constants: def __init__(self): # Patcher Versioning self.patcher_version = "0.3.1" # OpenCore-Legacy-Patcher - self.patcher_support_pkg_version = "0.1.8" # PatcherSupportPkg + self.patcher_support_pkg_version = "0.1.9" # PatcherSupportPkg self.url_patcher_support_pkg = "https://github.com/dortania/PatcherSupportPkg/releases/download/" self.nightly_url_patcher_support_pkg = "https://nightly.link/dortania/PatcherSupportPkg/workflows/build/master/" From 8706959f650de38b4db1b03d135f3dc245e096e3 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Wed, 20 Oct 2021 14:25:40 -0600 Subject: [PATCH 3/6] Sync PatchSupportPkg --- resources/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/constants.py b/resources/constants.py index 906167581..572a2f4e6 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -14,7 +14,7 @@ class Constants: def __init__(self): # Patcher Versioning self.patcher_version = "0.3.1" # OpenCore-Legacy-Patcher - self.patcher_support_pkg_version = "0.1.9" # PatcherSupportPkg + self.patcher_support_pkg_version = "0.1.10" # PatcherSupportPkg self.url_patcher_support_pkg = "https://github.com/dortania/PatcherSupportPkg/releases/download/" self.nightly_url_patcher_support_pkg = "https://nightly.link/dortania/PatcherSupportPkg/workflows/build/master/" From 88696c70478854d7e5ea04ab7021275e4c082f1a Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Wed, 20 Oct 2021 14:27:21 -0600 Subject: [PATCH 4/6] Add MacBookPro18,x data set --- data/cpu_data.py | 3 ++- data/smbios_data.py | 49 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/data/cpu_data.py b/data/cpu_data.py index 641980694..ef2f2b745 100644 --- a/data/cpu_data.py +++ b/data/cpu_data.py @@ -19,4 +19,5 @@ class cpu_data(enum.IntEnum): apple_dtk = 112 # A12 apple_m1 = 114 # A14 - apple_m2 = 115 # A15 + apple_m1_pro = 115 + apple_m1_max = 116 diff --git a/data/smbios_data.py b/data/smbios_data.py index 14e13c433..3f7c35e2e 100644 --- a/data/smbios_data.py +++ b/data/smbios_data.py @@ -1171,6 +1171,55 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, + "Screen Size": 13, + "Ethernet Chipset": None, + "Stock GPUs": [], + }, + "MacBookPro18,1": { + "Board ID": None, + "FirmwareFeatures": None, + "SecureBootModel": "j316s", + "CPU Generation": cpu_data.cpu_data.apple_m1_pro.value, + "Max OS Supported": os_data.os_data.max_os, + "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, + "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, + "Screen Size": 16, + "Ethernet Chipset": None, + "Stock GPUs": [], + }, + "MacBookPro18,2": { + "Board ID": None, + "FirmwareFeatures": None, + "SecureBootModel": "j316c", + "CPU Generation": cpu_data.cpu_data.apple_m1_max.value, + "Max OS Supported": os_data.os_data.max_os, + "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, + "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, + "Screen Size": 16, + "Ethernet Chipset": None, + "Stock GPUs": [], + }, + "MacBookPro18,3": { + "Board ID": None, + "FirmwareFeatures": None, + "SecureBootModel": "j314s", + "CPU Generation": cpu_data.cpu_data.apple_m1_pro.value, + "Max OS Supported": os_data.os_data.max_os, + "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, + "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, + "Screen Size": 14, + "Ethernet Chipset": None, + "Stock GPUs": [], + }, + "MacBookPro18,4": { + "Board ID": None, + "FirmwareFeatures": None, + "SecureBootModel": "j314c", + "CPU Generation": cpu_data.cpu_data.apple_m1_max.value, + "Max OS Supported": os_data.os_data.max_os, + "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, + "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, + "Screen Size": 14, "Ethernet Chipset": None, "Stock GPUs": [], }, From 9669196a0763564c08a5e55c9c14083051ee3ceb Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Wed, 20 Oct 2021 20:44:40 -0600 Subject: [PATCH 5/6] Add ADP2,1 data set --- data/smbios_data.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/data/smbios_data.py b/data/smbios_data.py index 3f7c35e2e..c92db10d4 100644 --- a/data/smbios_data.py +++ b/data/smbios_data.py @@ -2177,6 +2177,18 @@ smbios_dictionary = { device_probe.NVIDIA.Archs.Tesla ], }, + "ADP2,1": { + "Board ID": None, + "FirmwareFeatures": None, + "SecureBootModel": None, + "CPU Generation": cpu_data.cpu_data.pentium_4.value, + "Max OS Supported": os_data.os_data.leopard, + "Wireless Model": None, + "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, + "Stock GPUs": [ + device_probe.Intel.Archs.GMA_950 + ], + }, "ADP3,2": { "Board ID": None, "FirmwareFeatures": None, From ca2fd695b39177dcb947ae75dbde9438f1f83c49 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Thu, 21 Oct 2021 11:34:46 -0600 Subject: [PATCH 6/6] Fix crashing on dict append Closes https://github.com/dortania/OpenCore-Legacy-Patcher/issues/597 --- resources/build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/build.py b/resources/build.py index ac24d46d0..3629284b5 100644 --- a/resources/build.py +++ b/resources/build.py @@ -447,6 +447,7 @@ class BuildOpenCore: self.enable_kext("IOFireWireSBP2.kext", self.constants.fw_kext, self.constants.fw_sbp2_path) self.enable_kext("IOFireWireSerialBusProtocolTransport.kext", self.constants.fw_kext, self.constants.fw_bus_path) self.get_kext_by_bundle_path("IOFireWireFamily.kext/Contents/PlugIns/AppleFWOHCI.kext")["Enabled"] = True + def backlight_path_detection(self): if not self.constants.custom_model and self.computer.dgpu and self.computer.dgpu.pci_path: @@ -522,13 +523,13 @@ class BuildOpenCore: if self.computer and self.computer.dgpu: if self.computer.dgpu.arch == device_probe.AMD.Archs.Legacy_GCN_7000: # Add Power Gate Patches - self.config["DeviceProperties"]["Add"][backlight_path] += { + self.config["DeviceProperties"]["Add"][backlight_path].update({ "rebuild-device-tree": 1, "CAIL,CAIL_DisableDrmdmaPowerGating": 1, "CAIL,CAIL_DisableGfxCGPowerGating": 1, "CAIL,CAIL_DisableUVDPowerGating": 1, "CAIL,CAIL_DisableVCEPowerGating": 1, - } + }) # Check GPU Vendor if self.constants.metal_build is True: