From adec8ebd05253498f527071966b6830c160e03e2 Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <khronokernel@icloud.com>
Date: Thu, 9 Mar 2023 08:54:05 -0700
Subject: [PATCH] sys_patch.py: Add VA driver patch

---
 data/sys_patch_dict.py                  | 29 +++++++++++++++++++++++++
 resources/constants.py                  |  2 +-
 resources/sys_patch/sys_patch_detect.py |  3 +++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/data/sys_patch_dict.py b/data/sys_patch_dict.py
index 908411166..63090c6e3 100644
--- a/data/sys_patch_dict.py
+++ b/data/sys_patch_dict.py
@@ -296,6 +296,29 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                 },
             },
 
+            # Primarily for AMD GCN GPUs
+            "Revert GVA Downgrade": {
+                "Display Name": "",
+                "OS Support": {
+                    "Minimum OS Support": {
+                        "OS Major": os_data.os_data.ventura,
+                        "OS Minor": 0
+                    },
+                    "Maximum OS Support": {
+                        "OS Major": os_data.os_data.max_os,
+                        "OS Minor": 99
+                    },
+                },
+                "Remove": {
+                    "/System/Library/PrivateFrameworks/AppleGVA.framework/Versions/A/": [
+                        "AppleGVA",
+                    ],
+                    "/System/Library/PrivateFrameworks/AppleGVACore.framework/Versions/A/": [
+                        "AppleGVACore",
+                    ],
+                },
+            },
+
             # For GPUs last natively supported in Catalina/Big Sur
             # Restores DRM support
             "Catalina GVA": {
@@ -657,6 +680,8 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                         "AMDFramebuffer.kext":           "12.5",
                         "AMDSupport.kext":               "12.5",
 
+                        "AMDRadeonVADriver.bundle":      "12.5",
+                        "AMDRadeonVADriver2.bundle":     "12.5",
                         "AMDRadeonX4000GLDriver.bundle": "12.5",
                         "AMDMTLBronzeDriver.bundle":     "12.5",
                         "AMDShared.bundle":              "12.5",
@@ -680,7 +705,9 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                 "Install": {
                     "/System/Library/Extensions": {
                         "AMDRadeonX4000.kext":           "12.5",
+                        "AMDRadeonX4000HWServices.kext": "12.5",
 
+                        "AMDRadeonVADriver2.bundle":     "12.5",
                         "AMDRadeonX4000GLDriver.bundle": "12.5",
                         "AMDMTLBronzeDriver.bundle":     "12.5",
                         "AMDShared.bundle":              "12.5",
@@ -702,7 +729,9 @@ def SystemPatchDictionary(os_major, os_minor, non_metal_os_support):
                 "Install": {
                     "/System/Library/Extensions": {
                         "AMDRadeonX5000.kext":            "12.5",
+                        "AMDRadeonX5000HWServices.kext":  "12.5",
 
+                        "AMDRadeonVADriver2.bundle":      "12.5",
                         "AMDRadeonX5000GLDriver.bundle":  "12.5",
                         "AMDRadeonX5000MTLDriver.bundle": "12.5",
                         "AMDRadeonX5000Shared.bundle":    "12.5",
diff --git a/resources/constants.py b/resources/constants.py
index de11c79de..e74ffaca9 100644
--- a/resources/constants.py
+++ b/resources/constants.py
@@ -13,7 +13,7 @@ class Constants:
     def __init__(self):
         # Patcher Versioning
         self.patcher_version = "0.6.2"  # OpenCore-Legacy-Patcher
-        self.patcher_support_pkg_version = "0.8.4"  #  PatcherSupportPkg
+        self.patcher_support_pkg_version = "0.8.5"  #  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/sys_patch_detect.py b/resources/sys_patch/sys_patch_detect.py
index 4474a9360..fb150b10e 100644
--- a/resources/sys_patch/sys_patch_detect.py
+++ b/resources/sys_patch/sys_patch_detect.py
@@ -834,6 +834,7 @@ class DetectRootPatch:
                 required_patches.update({"AMD Legacy GCN": all_hardware_patchset["Graphics"]["AMD Legacy GCN"]})
             else:
                 required_patches.update({"AMD Legacy Polaris": all_hardware_patchset["Graphics"]["AMD Legacy Polaris"]})
+                required_patches.update({"Revert GVA Downgrade": all_hardware_patchset["Graphics"]["Revert GVA Downgrade"]})
             if "AVX2" not in self.constants.computer.cpu.leafs:
                 required_patches.update({"AMD OpenCL": all_hardware_patchset["Graphics"]["AMD OpenCL"]})
 
@@ -844,6 +845,8 @@ class DetectRootPatch:
             required_patches.update({"AMD OpenCL": all_hardware_patchset["Graphics"]["AMD OpenCL"]})
             if hardware_details["Graphics: AMD Legacy GCN"] is True:
                 required_patches.update({"AMD Legacy Vega Extended": all_hardware_patchset["Graphics"]["AMD Legacy Vega Extended"]})
+            else:
+                required_patches.update({"Revert GVA Downgrade": all_hardware_patchset["Graphics"]["Revert GVA Downgrade"]})
 
         if hardware_details["Brightness: Legacy Backlight Control"] is True:
             required_patches.update({"Legacy Backlight Control": all_hardware_patchset["Brightness"]["Legacy Backlight Control"]})