Resolve Nvidia Kepler for 12.5

Closes #1004
dortania · Aug 6, 2022 · cd12762 · cd12762
1 parent ba1ebeb
commit cd12762
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # OpenCore Legacy Patcher changelog
 
 ## 0.4.10
+- Resolve Nvidia Kepler support in macOS 12.5 Beta 3 and newer
+- Increment Binaries:
+  - PatcherSupportPkg 0.5.2 - release
 
 ## 0.4.9
 - Split Kepler userspace and kernel space patches

diff --git a/data/sys_patch_dict.py b/data/sys_patch_dict.py
@@ -277,7 +277,7 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                     },
                 },
             },
-            "Nvidia Kepler (Kernel Space)": {
+            "Nvidia Kepler": {
                 "Display Name": "Graphics: Nvidia Kepler",
                 "OS Support": {
                     "Minimum OS Support": {
@@ -297,36 +297,14 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                         "NVDAGK100Hal.kext":       "12.0 Beta 6",
                         "NVDAResman.kext":         "12.0 Beta 6",
                         "NVDAStartup.kext":        "12.0 Beta 6",
-                    },
-                },
-            },
-            # With macOS 12.5 Beta 3, Apple broke Metal rendering with Kepler
-            # Specifically, MPSImage/MPSCore stall out trying to render the desktop.
-            # This will eventually trigger the watchdog, and kick the user back to the login screen.
-            #
-            # Reference
-            # - https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1004
-            "Nvidia Kepler (Userspace)": {
-                "Display Name": "",
-                "OS Support": {
-                    "Minimum OS Support": {
-                        # 12.0 beta 7 (XNU 21.1)
-                        "OS Major": os_data.os_data.monterey,
-                        "OS Minor": 1
-                    },
-                    "Maximum OS Support": {
-                        # 12.5 (XNU 21.6)
-                        "OS Major": os_data.os_data.monterey,
-                        "OS Minor": 5
-                    },
-                },
-                "Install": {
-                    "/System/Library/Extensions": {
                         "GeForceAIRPlugin.bundle": "11.0 Beta 3",
                         "GeForceGLDriver.bundle":  "11.0 Beta 3",
                         "GeForceMTLDriver.bundle": "11.0 Beta 3",
                         "GeForceVADriver.bundle":  "12.0 Beta 6",
                     },
+                    "/System/Library/Frameworks": {
+                        "Metal.framework": "12.5 Beta 2",
+                    },
                 },
             },
             "Nvidia Web Drivers": {

diff --git a/resources/constants.py b/resources/constants.py
@@ -13,7 +13,7 @@ class Constants:
     def __init__(self):
         # Patcher Versioning
         self.patcher_version = "0.4.10"  # OpenCore-Legacy-Patcher
-        self.patcher_support_pkg_version = "0.5.1"  #  PatcherSupportPkg
+        self.patcher_support_pkg_version = "0.5.2"  #  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/"
         self.discord_link = "https://discord.gg/rqdPgH8xSN"

diff --git a/resources/sys_patch_detect.py b/resources/sys_patch_detect.py
@@ -362,8 +362,7 @@ def generate_patchset(self, hardware_details):
         if hardware_details["Graphics: Nvidia Kepler"] is True:
             required_patches.update({"Metal Common": all_hardware_patchset["Graphics"]["Metal Common"]})
             required_patches.update({"Modern GVA": all_hardware_patchset["Graphics"]["Modern GVA"]})
-            required_patches.update({"Nvidia Kepler (Kernel Space)": all_hardware_patchset["Graphics"]["Nvidia Kepler (Kernel Space)"]})
-            required_patches.update({"Nvidia Kepler (Userspace)": all_hardware_patchset["Graphics"]["Nvidia Kepler (Userspace)"]})
+            required_patches.update({"Nvidia Kepler": all_hardware_patchset["Graphics"]["Nvidia Kepler"]})
             for gpu in self.constants.computer.gpus:
                 # Handle mixed GPU situations (ie. MacBookPro11,3: Haswell iGPU + Kepler dGPU)
                 if gpu.arch == device_probe.Intel.Archs.Haswell: