Merge branch 'main' into sequoia-development

This commit is contained in:
Mykola Grymalyuk
2024-09-02 11:41:54 -06:00
7 changed files with 56 additions and 15 deletions

View File

@@ -142,11 +142,15 @@ class BuildGraphicsAudio:
iMac MXM dGPU Backlight DevicePath Detection
"""
if not self.constants.custom_model and self.computer.dgpu and self.computer.dgpu.pci_path:
if not self.constants.custom_model:
for i, device in enumerate(self.computer.gpus):
logging.info(f"- Found dGPU ({i + 1}): {utilities.friendly_hex(device.vendor_id)}:{utilities.friendly_hex(device.device_id)}")
self.config["#Revision"][f"Hardware-iMac-dGPU-{i + 1}"] = f"{utilities.friendly_hex(device.vendor_id)}:{utilities.friendly_hex(device.device_id)}"
# Work-around for AMD Navi MXM cards with PCIe bridge
if not self.computer.dgpu:
self.computer.dgpu=self.computer.gpus[i]
if device.pci_path != self.computer.dgpu.pci_path:
logging.info("- device path and GFX0 Device path are different")
self.gfx0_path = device.pci_path

View File

@@ -150,9 +150,10 @@ class BuildStorage:
# Restore S1X/S3X NVMe support removed in 14.0 Beta 2
# Apple's usage of the S1X and S3X is quite sporadic and inconsistent, so we'll try a catch all for units with NVMe drives
# Additionally expanded to cover all Mac models with the 12+16 pin SSD layout, for older machines with newer drives
if self.constants.custom_model and self.model in smbios_data.smbios_dictionary:
if "CPU Generation" in smbios_data.smbios_dictionary[self.model]:
if cpu_data.CPUGen.broadwell <= smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.kaby_lake:
if (cpu_data.CPUGen.haswell <= smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.kaby_lake) or self.model in [ "MacPro6,1" ]:
support.BuildSupport(self.model, self.constants, self.config).enable_kext("IOS3XeFamily.kext", self.constants.s3x_nvme_version, self.constants.s3x_nvme_path)
# Apple RAID Card check
@@ -193,4 +194,4 @@ class BuildStorage:
if self.constants.apfs_trim_timeout is False:
logging.info(f"- Disabling APFS TRIM timeout")
self.config["Kernel"]["Quirks"]["SetApfsTrimTimeout"] = 0
self.config["Kernel"]["Quirks"]["SetApfsTrimTimeout"] = 0