Merge branch 'main' into vmm

CHANGELOG.md

@@ -9,6 +9,9 @@
 - 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
+- Fix non-Metal Control Center crashing on 12.0 Beta 10+
 
 ## 0.3.0
 - Fix Nvidia Tesla Acceleration in Monterey Beta 7+

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

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": [],
     },
@@ -2128,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,

resources/build.py

@@ -469,6 +469,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:
@@ -553,13 +554,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:

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.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/"