Merge remote-tracking branch 'origin/main' into vmm

This commit is contained in:
Mykola Grymalyuk
2021-10-15 09:40:48 -06:00
9 changed files with 699 additions and 70 deletions
+13 -1
View File
@@ -558,6 +558,16 @@ class BuildOpenCore:
elif self.model == "iMac10,1":
if self.get_kext_by_bundle_path("AAAMouSSE.kext")["Enabled"] is False:
self.enable_kext("AAAMouSSE.kext", self.constants.mousse_version, self.constants.mousse_path)
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] += {
"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:
@@ -572,7 +582,9 @@ class BuildOpenCore:
elif not self.constants.custom_model and self.model in model_array.LegacyGPU and self.computer.dgpu:
print(f"- Detected dGPU: {utilities.friendly_hex(self.computer.dgpu.vendor_id)}:{utilities.friendly_hex(self.computer.dgpu.device_id)}")
if self.computer.dgpu.arch in [
device_probe.AMD.Archs.Legacy_GCN,
device_probe.AMD.Archs.Legacy_GCN_7000,
device_probe.AMD.Archs.Legacy_GCN_8000,
device_probe.AMD.Archs.Legacy_GCN_9000,
device_probe.AMD.Archs.Polaris,
device_probe.AMD.Archs.Vega,
device_probe.AMD.Archs.Navi,
+6 -3
View File
@@ -385,10 +385,13 @@ Q. Return to previous menu
elif change_menu == "2":
custom_smbios = input("Set new SMBIOS mode: ")
try:
test = self.constants.board_id[custom_smbios]
self.constants.override_smbios = custom_smbios
if smbios_data.smbios_dictionary[custom_smbios]["Board ID"] != None:
self.constants.override_smbios = custom_smbios
else:
print("Non-Intel SMBIOS, reverting to Default setting")
self.constants.override_smbios = "Default"
except KeyError:
print("Unsupported SMBIOS, defaulting to Default setting")
print("Unsupported SMBIOS, reverting to Default setting")
self.constants.override_smbios = "Default"
elif change_menu == "3":
print("Disabling SMBIOS spoof")
+1 -1
View File
@@ -14,7 +14,7 @@ class Constants:
def __init__(self):
# Patcher Versioning
self.patcher_version = "0.3.0" # OpenCore-Legacy-Patcher
self.patcher_support_pkg_version = "0.1.6" # PatcherSupportPkg
self.patcher_support_pkg_version = "0.1.7" # 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/"
+26 -5
View File
@@ -160,6 +160,7 @@ class NVIDIA(GPU):
class Archs(enum.Enum):
# pylint: disable=invalid-name
Curie = "Curie"
Fermi = "Fermi"
Tesla = "Tesla"
Kepler = "Kepler"
@@ -169,7 +170,9 @@ class NVIDIA(GPU):
def detect_arch(self):
# G80/G80GL
if self.device_id in pci_data.nvidia_ids.tesla_ids:
if self.device_id in pci_data.nvidia_ids.curie_ids:
self.arch = NVIDIA.Archs.Curie
elif self.device_id in pci_data.nvidia_ids.tesla_ids:
self.arch = NVIDIA.Archs.Tesla
elif self.device_id in pci_data.nvidia_ids.fermi_ids:
self.arch = NVIDIA.Archs.Fermi
@@ -185,9 +188,12 @@ class AMD(GPU):
class Archs(enum.Enum):
# pylint: disable=invalid-name
Legacy_GCN = "Legacy GCN"
R500 = "R500"
TeraScale_1 = "TeraScale 1"
TeraScale_2 = "TeraScale 2"
Legacy_GCN_7000 = "Legacy GCN v1"
Legacy_GCN_8000 = "Legacy GCN v2"
Legacy_GCN_9000 = "Legacy GCN v3"
Polaris = "Polaris"
Vega = "Vega"
Navi = "Navi"
@@ -196,8 +202,14 @@ class AMD(GPU):
arch: Archs = field(init=False)
def detect_arch(self):
if self.device_id in pci_data.amd_ids.legacy_gcn_ids:
self.arch = AMD.Archs.Legacy_GCN
if self.device_id in pci_data.amd_ids.r500_ids:
self.arch = AMD.Archs.R500
elif self.device_id in pci_data.amd_ids.gcn_7000_ids:
self.arch = AMD.Archs.Legacy_GCN_7000
elif self.device_id in pci_data.amd_ids.gcn_8000_ids:
self.arch = AMD.Archs.Legacy_GCN_8000
elif self.device_id in pci_data.amd_ids.gcn_9000_ids:
self.arch = AMD.Archs.Legacy_GCN_9000
elif self.device_id in pci_data.amd_ids.terascale_1_ids:
self.arch = AMD.Archs.TeraScale_1
elif self.device_id in pci_data.amd_ids.terascale_2_ids:
@@ -218,6 +230,8 @@ class Intel(GPU):
class Archs(enum.Enum):
# pylint: disable=invalid-name
GMA_950 = "GMA 950"
GMA_X3100 = "GMA X3100"
Iron_Lake = "Iron Lake"
Sandy_Bridge = "Sandy Bridge"
Ivy_Bridge = "Ivy Bridge"
@@ -226,13 +240,18 @@ class Intel(GPU):
Skylake = "Skylake"
Kaby_Lake = "Kaby Lake"
Coffee_Lake = "Coffee Lake"
Comet_Lake = "Comet Lake"
Ice_Lake = "Ice Lake"
Unknown = "Unknown"
arch: Archs = field(init=False)
def detect_arch(self):
if self.device_id in pci_data.intel_ids.iron_ids:
if self.device_id in pci_data.intel_ids.gma_950_ids:
self.arch = Intel.Archs.GMA_950
elif self.device_id in pci_data.intel_ids.gma_x3100_ids:
self.arch = Intel.Archs.GMA_X3100
elif self.device_id in pci_data.intel_ids.iron_ids:
self.arch = Intel.Archs.Iron_Lake
elif self.device_id in pci_data.intel_ids.sandy_ids:
self.arch = Intel.Archs.Sandy_Bridge
@@ -248,6 +267,8 @@ class Intel(GPU):
self.arch = Intel.Archs.Kaby_Lake
elif self.device_id in pci_data.intel_ids.coffee_lake_ids:
self.arch = Intel.Archs.Coffee_Lake
elif self.device_id in pci_data.intel_ids.comet_lake_ids:
self.arch = Intel.Archs.Comet_Lake
elif self.device_id in pci_data.intel_ids.ice_lake_ids:
self.arch = Intel.Archs.Ice_Lake
else: