diff --git a/CHANGELOG.md b/CHANGELOG.md index c4879af5f..e02de4f2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ - Add Legacy GMUX patchsets - Applicable for dual GPU MacBookPro5,x and demuxed MacBookPro8,x - Increment Binaries: - - PatcherSupportPkg 0.1.6 release + - PatcherSupportPkg 0.1.7 release - RestrictEvents 1.0.5 rolling (2430ed0) - Limit MacBookPro6,2 G State - Works around crashing when switching GPUs @@ -45,6 +45,10 @@ - Implement software demux patch set for 2011 15/17" MacBook Pros - Alternative to hardware demux - Adds [AMDGPUWakeHandler](https://github.com/blackgate/AMDGPUWakeHandler) +- Add Legacy GCN support for iMac11,x and iMac12,x with upgraded GPUs + - Note: iMac12,x with legacy GCN will fail to wake +- Fix Beta 10 Bluetooth + - Works around new Broadcom/CSR vendor checks in `bluetoothd` ## 0.2.5 diff --git a/data/pci_data.py b/data/pci_data.py index 62a2504dd..67cc3c972 100644 --- a/data/pci_data.py +++ b/data/pci_data.py @@ -3,6 +3,18 @@ class nvidia_ids: # Courteous of envytools as well as Macrumors: # https://envytools.readthedocs.io/en/latest/hw/pciid.html # https://forums.macrumors.com/threads/2011-imac-graphics-card-upgrade.1596614/ + curie_ids = [ + 0x0040, + 0x00f0, + 0x0220, + 0x0140, + 0x0160, + 0x0090, + 0x01d0, + 0x0390, + 0x0290, + ] + tesla_ids = [ # G80 0x0190, # G80 [GeForce 8800 GTS / 8800 GTX] @@ -513,61 +525,79 @@ class nvidia_ids: class amd_ids: - legacy_gcn_ids = [ - # AMDRadeonX4000 - # AMDBonaireGraphicsAccelerator - 0x6640, - 0x6641, - 0x6646, - 0x6647, - 0x6650, - 0x6651, - 0x665C, - 0x665D, - # AMDFijiGraphicsAccelerator - 0x7300, - 0x730F, - # AMDHawaiiGraphicsAccelerator - 0x67B0, - # AMDPitcairnGraphicsAccelerator - 0x6800, - 0x6801, - 0x6806, - 0x6808, - 0x6810, - 0x6818, - 0x6819, - # AMDTahitiGraphicsAccelerator - 0x6790, - 0x6798, - 0x679A, - 0x679E, - 0x6780, - # AMDTongaGraphicsAccelerator - 0x6920, - 0x6921, - 0x6930, - 0x6938, - 0x6939, - # AMDVerdeGraphicsAccelerator - 0x6820, - 0x6821, - 0x6823, - 0x6825, - 0x6827, - 0x682B, - 0x682D, - 0x682F, - 0x6835, - 0x6839, - 0x683B, - 0x683D, - 0x683F, + + gcn_7000_ids = [ + # GCN v1 + # AMDPitcairnGraphicsAccelerator - AMD7000Controller + 0x6800, # HD 7970M + 0x6801, # HD 8970M + 0x6806, # Unknown + 0x6808, # W7000 + 0x6810, # R7 370 / R9 270X/370X + 0x6818, # HD 7870 + 0x6819, # HD 7850 / R7 265 / R9 270 1024SP + # AMDPitcairnGraphicsAccelerator - AMD7000Controller + 0x6800, # HD 7970M + 0x6801, # HD 8970M + 0x6806, # Unknown + 0x6808, # W7000 + 0x6810, # R7 370 / R9 270X/370X + 0x6818, # HD 7870 + 0x6819, # HD 7850 / R7 265 / R9 270 1024SP + # AMDTahitiGraphicsAccelerator - AMD7000Controller + 0x6790, # Unknown + 0x6798, # HD 7970/8970 OEM / R9 280X / D700 + 0x679A, # HD 7950/8950 OEM / R9 280 + 0x679E, # HD 7870 XT + 0x6780, # W9000 + # AMDVerdeGraphicsAccelerator - AMD7000Controller + 0x6820, # HD 8890M / R9 M275X/M375X / M5100 + 0x6821, # HD 8870M / R9 M270X/M370X + 0x6823, # HD 8850M / R9 M265X + 0x6825, # HD 7870M + 0x6827, # HD 7850M/8850M + 0x682B, # HD 8830M / R7 250 / R7 M465X + 0x682D, # M4000 + 0x682F, # HD 7730M + 0x6835, # R9 255 + 0x6839, # Unknown + 0x683B, # Unknown + 0x683D, # HD 7770/8760 / R7 250X + 0x683F, # HD 7750/8740 / R7 250E + ] + + gcn_8000_ids = [ + # GCN v2 + # AMDBonaireGraphicsAccelerator - AMD8000Controller + 0x6640, # M6100 + 0x6641, # HD 8930M + 0x6646, # R9 M280X / W6170M + 0x6647, # R9 M270X/M280X + 0x6650, # Unknown + 0x6651, # Unknown + 0x665C, # HD 7790/8770 / R7 360 / R9 260/360 + 0x665D, # R7 200 + # AMDHawaiiGraphicsAccelerator - AMD8000Controller + 0x67B0, # R9 290X/390X + ] + + gcn_9000_ids = [ + # GCN v3 + # AMDFijiGraphicsAccelerator - AMD9000Controller + 0x7300, # R9 FURY / NANO + 0x730F, # Unknown + # AMDTongaGraphicsAccelerator - AMD9000Controller + 0x6920, # R9 M395/ M395X + 0x6921, # R9 M295X / M390X + 0x6930, # Unknown + 0x6938, # R9 380X / R9 M295X + 0x6939, # R9 285/380 ] polaris_ids = [ + # GCN v4 # AMDRadeonX4000 - # AMDBaffinGraphicsAccelerator + # AMDBaffinGraphicsAccelerator - AMD9500Controller 0x67E0, 0x67E3, 0x67E8, @@ -577,7 +607,7 @@ class amd_ids: 0x67E1, 0x67E7, 0x67E9, - # AMDEllesmereGraphicsAccelerator + # AMDEllesmereGraphicsAccelerator - AMD9500Controller 0x67C0, 0x67C1, 0x67C2, @@ -593,8 +623,9 @@ class amd_ids: ] vega_ids = [ + # GCN v5 # AMDRadeonX5000 - # AMDVega10GraphicsAccelerator + # AMDVega10GraphicsAccelerator - AMD10000Controller 0x6860, 0x6861, 0x6862, @@ -610,13 +641,13 @@ class amd_ids: 0x686E, 0x686F, 0x687F, - # AMDVega12GraphicsAccelerator + # AMDVega12GraphicsAccelerator - AMD10000Controller 0x69A0, 0x69A1, 0x69A2, 0x69A3, 0x69AF, - # AMDVega20GraphicsAccelerator + # AMDVega20GraphicsAccelerator - AMD10000Controller 0x66A0, 0x66A1, 0x66A2, @@ -636,7 +667,7 @@ class amd_ids: 0x731B, 0x731F, # AMDNavi12GraphicsAccelerator - 0x7360, + 0x7360, # 5600M # AMDNavi14GraphicsAccelerator 0x7340, 0x7341, @@ -648,6 +679,14 @@ class amd_ids: 0x73AB, 0x73BF, ] + + r500_ids = [ + 0x7187, # X1300/X1550 + 0x7146, # X1300/X1550 + 0x71c5, # Mobile X1600 + 0x7249, # X1900 XT + ] + terascale_1_ids = [ 0x9400, 0x9401, @@ -719,6 +758,17 @@ class amd_ids: class intel_ids: + gma_950_ids = [ + 0x2582, + 0x2592, + 0x2772, + 0x27A2, + ] + + gma_x3100_ids = [ + 0x2a02, + ] + iron_ids = [ # AppleIntelHDGraphics IDs 0x0044, @@ -805,6 +855,12 @@ class intel_ids: 0x3E98, ] + comet_lake_ids = [ + 0x9BC8, + 0x9BC5, + 0x9BC4, + ] + ice_lake_ids = [ # AppleIntelICLLPGraphicsFramebuffer IDs 0xFF05, diff --git a/data/smbios_data.py b/data/smbios_data.py index 60be589c0..14e13c433 100644 --- a/data/smbios_data.py +++ b/data/smbios_data.py @@ -12,6 +12,7 @@ # Ethernet Chipset: Vendor of the ethernet chipset (if multiple unique chipset within Vendor, chipset name is used) # nForce Chipset: If model uses nForce chipset # Switchable GPUs: If model uses a GMUX +# Stock GPUs: GPUs variations shipped from resources import device_probe from data import cpu_data, os_data, bluetooth_data @@ -28,6 +29,9 @@ smbios_dictionary = { "Screen Size": 13, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.Intel.Archs.GMA_950 + ], }, "MacBook2,1": { "Board ID": "Mac-F4208CA9", @@ -40,6 +44,9 @@ smbios_dictionary = { "Screen Size": 13, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.Intel.Archs.GMA_950 + ], }, "MacBook3,1": { "Board ID": "Mac-F22788C8", @@ -52,6 +59,9 @@ smbios_dictionary = { "Screen Size": 13, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.Intel.Archs.GMA_X3100 + ], }, "MacBook4,1": { "Board ID": "Mac-F22788A9", @@ -64,6 +74,9 @@ smbios_dictionary = { "Screen Size": 13, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.Intel.Archs.GMA_X3100 + ], }, "MacBook5,1": { "Board ID": "Mac-F42D89C8", @@ -76,6 +89,9 @@ smbios_dictionary = { "Screen Size": 13, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBook5,1_v2": { "Board ID": "Mac-F42D89A9", @@ -88,6 +104,9 @@ smbios_dictionary = { "Screen Size": 13, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBook5,2": { "Board ID": "Mac-F22788AA", @@ -100,6 +119,9 @@ smbios_dictionary = { "Screen Size": 13, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBook6,1": { "Board ID": "Mac-F22C8AC8", @@ -112,6 +134,9 @@ smbios_dictionary = { "Screen Size": 13, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBook7,1": { "Board ID": "Mac-F22C89C8", @@ -124,6 +149,9 @@ smbios_dictionary = { "Screen Size": 13, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBook8,1": { "Board ID": "Mac-BE0E8AC46FE800CC", @@ -135,6 +163,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 12, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Broadwell + ], }, "MacBook8,1_v2": { "Board ID": "Mac-F305150B0C7DEEEF", @@ -146,6 +177,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 12, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Broadwell + ], }, "MacBook9,1": { "Board ID": "Mac-9AE82516C7C6B903", @@ -157,6 +191,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 12, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Skylake + ], }, "MacBook10,1": { "Board ID": "Mac-EE2EBD4B90B839A8", @@ -168,6 +205,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 12, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Kaby_Lake + ], }, "MacBookAir1,1": { "Board ID": "Mac-F42C8CC8", @@ -179,6 +219,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.GMA_X3100 + ], }, "MacBookAir2,1": { "Board ID": "Mac-F42D88C8", @@ -191,6 +234,9 @@ smbios_dictionary = { "Screen Size": 13, "nForce Chipset": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookAir3,1": { "Board ID": "Mac-942452F5819B1C1B", @@ -203,6 +249,9 @@ smbios_dictionary = { "Screen Size": 11, "nForce Chipset": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookAir3,2": { "Board ID": "Mac-942C5DF58193131B", @@ -215,6 +264,9 @@ smbios_dictionary = { "Screen Size": 13, "nForce Chipset": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookAir4,1": { "Board ID": "Mac-C08A6BB70A942AC2", @@ -226,6 +278,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 11, "Ethernet Chipset": "Broadcom", # Set for Apple Thunderbolt Adapter + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge + ], }, "MacBookAir4,2": { "Board ID": "Mac-742912EFDBEE19B3", @@ -237,6 +292,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 13, "Ethernet Chipset": "Broadcom", # Set for Apple Thunderbolt Adapter + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge + ], }, "MacBookAir5,1": { "Board ID": "Mac-66F35F19FE2A0D05", @@ -248,6 +306,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Screen Size": 11, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Ivy_Bridge + ], }, "MacBookAir5,2": { "Board ID": "Mac-2E6FAB96566FE58C", @@ -259,6 +320,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Ivy_Bridge + ], }, "MacBookAir6,1": { "Board ID": "Mac-35C1E88140C3E6CF", @@ -270,6 +334,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 11, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell + ], }, "MacBookAir6,2": { "Board ID": "Mac-7DF21CB3ED6977E5", @@ -281,6 +348,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell + ], }, "MacBookAir7,1": { "Board ID": "Mac-9F18E312C5C2BF0B", @@ -292,6 +362,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 11, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Broadwell + ], }, "MacBookAir7,2": { "Board ID": "Mac-937CB26E2E02BB01", @@ -303,6 +376,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Broadwell + ], }, "MacBookAir8,1": { "Board ID": "Mac-827FAC58A8FDFA22", @@ -314,6 +390,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake + ], }, "MacBookAir8,1_v2": { "Board ID": "Mac-112818653D3AABFC", @@ -325,6 +404,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake + ], }, "AAPL_MacBookAir8,1": { # AppleInternal MacBookAir8,1 @@ -338,6 +420,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake + ], }, "MacBookAir8,2": { "Board ID": "Mac-226CB3C6A851A671", @@ -349,6 +434,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake + ], }, "MacBookAir9,1": { "Board ID": "Mac-0CFF9C7C2B63DF8D", @@ -360,6 +448,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Ice_Lake + ], }, "AAPL_MacBookAir9,1": { # AppleInternal MacBookAir9,1 @@ -373,6 +464,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Ice_Lake + ], }, "MacBookAir10,1": { "Board ID": None, @@ -383,6 +477,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, "Ethernet Chipset": None, + "Stock GPUs": [], # TODO: Add Apple Silicon GPU }, "MacBookPro1,1": { "Board ID": "Mac-F425BEC8", @@ -395,6 +490,9 @@ smbios_dictionary = { "Screen Size": 15, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.AMD.Archs.R500 + ], }, "MacBookPro1,2": { "Board ID": "Mac-F42DBEC8", @@ -407,6 +505,9 @@ smbios_dictionary = { "Screen Size": 17, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.AMD.Archs.R500 + ], }, "MacBookPro2,1": { "Board ID": "Mac-F42189C8", @@ -419,6 +520,9 @@ smbios_dictionary = { "Screen Size": 17, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.AMD.Archs.R500 + ], }, "MacBookPro2,2": { "Board ID": "Mac-F42187C8", @@ -431,6 +535,9 @@ smbios_dictionary = { "Screen Size": 15, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.AMD.Archs.R500 + ], }, "MacBookPro3,1": { "Board ID": "Mac-F4238BC8", @@ -443,6 +550,9 @@ smbios_dictionary = { "Screen Size": 15, # Shipped with 17 as well "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro3,1_v2": { "Board ID": "Mac-F42388C8", @@ -455,6 +565,9 @@ smbios_dictionary = { "Screen Size": 15, # Shipped with 17 as well "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro4,1": { "Board ID": "Mac-F42C89C8", @@ -468,6 +581,9 @@ smbios_dictionary = { "Switchable GPUs": True, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro4,1_v2": { "Board ID": "Mac-F42C86C8", @@ -481,6 +597,9 @@ smbios_dictionary = { "Switchable GPUs": True, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro5,1": { "Board ID": "Mac-F42D86C8", @@ -494,6 +613,9 @@ smbios_dictionary = { "Switchable GPUs": True, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro5,1_v2": { "Board ID": "Mac-F42D86A9", @@ -507,6 +629,9 @@ smbios_dictionary = { "Switchable GPUs": True, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro5,2": { "Board ID": "Mac-F2268EC8", @@ -520,6 +645,9 @@ smbios_dictionary = { "Switchable GPUs": True, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro5,3": { "Board ID": "Mac-F22587C8", @@ -533,6 +661,9 @@ smbios_dictionary = { "Switchable GPUs": True, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro5,4": { "Board ID": "Mac-F22587A1", @@ -546,6 +677,9 @@ smbios_dictionary = { "Switchable GPUs": True, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro5,5": { "Board ID": "Mac-F2268AC8", @@ -558,6 +692,9 @@ smbios_dictionary = { "Screen Size": 13, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro6,1": { "Board ID": "Mac-F22589C8", @@ -570,6 +707,10 @@ smbios_dictionary = { "Screen Size": 17, "Switchable GPUs": True, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Iron_Lake, + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro6,2": { "Board ID": "Mac-F22586C8", @@ -582,6 +723,10 @@ smbios_dictionary = { "Screen Size": 15, "Switchable GPUs": True, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Iron_Lake, + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro7,1": { "Board ID": "Mac-F222BEC8", @@ -594,6 +739,9 @@ smbios_dictionary = { "Screen Size": 13, "Ethernet Chipset": "Broadcom", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacBookPro8,1": { "Board ID": "Mac-94245B3640C91C81", @@ -605,6 +753,10 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 13, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge, + device_probe.AMD.Archs.TeraScale_2 + ], }, "MacBookPro8,2": { "Board ID": "Mac-94245A3940C91C80", @@ -617,6 +769,10 @@ smbios_dictionary = { "Screen Size": 15, "Switchable GPUs": True, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge, + device_probe.AMD.Archs.TeraScale_2 + ], }, "MacBookPro8,3": { "Board ID": "Mac-942459F5819B171B", @@ -629,6 +785,10 @@ smbios_dictionary = { "Screen Size": 17, "Switchable GPUs": True, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge, + device_probe.AMD.Archs.TeraScale_2 + ], }, "AAPL_MacBookPro8,3": { # AppleInternal MacBookPro8,3 @@ -643,6 +803,10 @@ smbios_dictionary = { "Screen Size": 17, "Switchable GPUs": True, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge, + device_probe.AMD.Archs.TeraScale_2 + ], }, "MacBookPro9,1": { "Board ID": "Mac-4B7AC7E43945597E", @@ -655,6 +819,10 @@ smbios_dictionary = { "Screen Size": 15, "Switchable GPUs": True, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Ivy_Bridge, + device_probe.NVIDIA.Archs.Kepler + ], }, "MacBookPro9,2": { "Board ID": "Mac-6F01561E16C75D06", @@ -666,6 +834,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Screen Size": 13, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Kepler + ], }, "MacBookPro10,1": { "Board ID": "Mac-C3EC7CD22292981F", @@ -678,6 +849,10 @@ smbios_dictionary = { "Screen Size": 15, "Switchable GPUs": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Ivy_Bridge, + device_probe.NVIDIA.Archs.Kepler + ], }, "MacBookPro10,2": { "Board ID": "Mac-AFD8A9D944EA4843", @@ -689,6 +864,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Kepler + ], }, "MacBookPro11,1": { "Board ID": "Mac-189A3D4F975D5FFC", @@ -700,6 +878,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + ], }, "MacBookPro11,2": { "Board ID": "Mac-3CBD00234E554E41", @@ -711,6 +892,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 15, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + ], }, "MacBookPro11,3": { "Board ID": "Mac-2BD1B31983FE1663", @@ -723,6 +907,9 @@ smbios_dictionary = { "Screen Size": 15, "Switchable GPUs": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + ], }, "MacBookPro11,4": { "Board ID": "Mac-06F11FD93F0323C5", @@ -734,6 +921,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 15, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + ], }, "MacBookPro11,5": { "Board ID": "Mac-06F11F11946D27C5", @@ -746,6 +936,10 @@ smbios_dictionary = { "Screen Size": 15, "Switchable GPUs": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + device_probe.AMD.Archs.Legacy_GCN_7000 + ], }, "MacBookPro12,1": { "Board ID": "Mac-E43C1C25D4880AD6", @@ -757,6 +951,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Broadwell, + ], }, "MacBookPro13,1": { "Board ID": "Mac-473D31EABEB93F9B", @@ -768,6 +965,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Skylake, + ], }, "MacBookPro13,2": { "Board ID": "Mac-66E35819EE2D0D05", @@ -779,6 +979,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Skylake, + ], }, "MacBookPro13,3": { "Board ID": "Mac-A5C67F76ED83108C", @@ -791,6 +994,10 @@ smbios_dictionary = { "Screen Size": 15, "Switchable GPUs": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Skylake, + device_probe.AMD.Archs.Polaris + ], }, "MacBookPro14,1": { "Board ID": "Mac-B4831CEBD52A0C4C", @@ -802,6 +1009,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Kaby_Lake, + ], }, "MacBookPro14,2": { "Board ID": "Mac-CAD6701F7CEA0921", @@ -813,6 +1023,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Kaby_Lake, + ], }, "MacBookPro14,3": { "Board ID": "Mac-551B86E5744E2388", @@ -825,6 +1038,10 @@ smbios_dictionary = { "Screen Size": 15, "Switchable GPUs": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Kaby_Lake, + device_probe.AMD.Archs.Polaris + ], }, "MacBookPro15,1": { "Board ID": "Mac-937A206F2EE63C01", @@ -837,6 +1054,10 @@ smbios_dictionary = { "Screen Size": 15, "Switchable GPUs": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake, + device_probe.AMD.Archs.Polaris + ], }, "MacBookPro15,2": { "Board ID": "Mac-827FB448E656EC26", @@ -848,6 +1069,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake, + ], }, "MacBookPro15,3": { "Board ID": "Mac-1E7E29AD0135F9BC", @@ -860,6 +1084,10 @@ smbios_dictionary = { "Screen Size": 15, "Switchable GPUs": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake, + device_probe.AMD.Archs.Vega + ], }, "MacBookPro15,4": { "Board ID": "Mac-53FDB3D8DB8CA971", @@ -871,6 +1099,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake, + ], }, "MacBookPro16,1": { "Board ID": "Mac-E1008331FDC96864", @@ -883,17 +1114,24 @@ smbios_dictionary = { "Screen Size": 16, "Switchable GPUs": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake, + device_probe.AMD.Archs.Navi + ], }, "MacBookPro16,2": { "Board ID": "Mac-5F9802EFE386AA28", "FirmwareFeatures": "0xFFAFF06E", "SecureBootModel": "j214k", - "CPU Generation": cpu_data.cpu_data.coffee_lake.value, + "CPU Generation": cpu_data.cpu_data.ice_lake.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Ice_Lake, + ], }, "MacBookPro16,3": { "Board ID": "Mac-E7203C0F68AA0004", @@ -905,6 +1143,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake, + ], }, "MacBookPro16,4": { "Board ID": "Mac-A61BADE1FDAD7B05", @@ -917,6 +1158,10 @@ smbios_dictionary = { "Screen Size": 16, "Switchable GPUs": True, "Ethernet Chipset": None, + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake, + device_probe.AMD.Archs.Navi + ], }, "MacBookPro17,1": { "Board ID": None, @@ -927,6 +1172,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, "Ethernet Chipset": None, + "Stock GPUs": [], }, "Macmini1,1": { "Board ID": "Mac-F4208EC8", @@ -937,6 +1183,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.Intel.Archs.GMA_950 + ], }, "Macmini2,1": { "Board ID": "Mac-F4208EAA", @@ -947,6 +1196,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.Intel.Archs.GMA_950 + ], }, "Macmini3,1": { "Board ID": "Mac-F22C86C8", @@ -958,6 +1210,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "Macmini4,1": { "Board ID": "Mac-F2208EC8", @@ -968,6 +1223,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "Macmini5,1": { "Board ID": "Mac-8ED6AF5B48C039E1", @@ -978,6 +1236,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge + ], }, "Macmini5,2": { "Board ID": "Mac-4BC72D62AD45599E", @@ -988,6 +1249,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge, + device_probe.AMD.Archs.TeraScale_2 + ], }, "Macmini5,3": { "Board ID": "Mac-7BA5B2794B2CDB12", @@ -998,6 +1263,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge, + ], }, "Macmini6,1": { "Board ID": "Mac-031AEE4D24BFF0B1", @@ -1008,6 +1276,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Ivy_Bridge, + ], }, "Macmini6,2": { "Board ID": "Mac-F65AE981FFA204ED", @@ -1018,6 +1289,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Ivy_Bridge, + ], }, "Macmini7,1": { "Board ID": "Mac-35C5E08120C7EEAF", @@ -1028,6 +1302,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + ], }, "Macmini8,1": { "Board ID": "Mac-7BA5B2DFE22DDD8C", @@ -1038,6 +1315,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake, + ], }, "Macmini9,1": { "Board ID": None, @@ -1048,6 +1328,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [], }, "iMac4,1": { "Board ID": "Mac-F42786C8", @@ -1059,6 +1340,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.AMD.Archs.R500, + ], }, "iMac4,2": { "Board ID": "Mac-F4218EC8", @@ -1070,6 +1354,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.Intel.Archs.GMA_950, + ], }, "iMac5,1": { "Board ID": "Mac-F4228EC8", @@ -1081,6 +1368,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.AMD.Archs.R500, + ], }, "iMac5,2": { "Board ID": "Mac-F4218EC8", @@ -1092,6 +1382,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.Intel.Archs.GMA_950, + ], }, "iMac6,1": { "Board ID": "Mac-F4218FC8", @@ -1103,6 +1396,10 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.AMD.Archs.R500, + device_probe.NVIDIA.Archs.Curie + ], }, "iMac7,1": { "Board ID": "Mac-F42386C8", @@ -1114,6 +1411,10 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.AMD.Archs.TeraScale_1, + device_probe.NVIDIA.Archs.Tesla, + ], }, "iMac7,1_v2": { "Board ID": "Mac-F4238CC8", @@ -1125,6 +1426,10 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.AMD.Archs.TeraScale_1, + device_probe.NVIDIA.Archs.Tesla, + ], }, "iMac8,1": { "Board ID": "Mac-F227BEC8", @@ -1136,6 +1441,10 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.AMD.Archs.TeraScale_1, + device_probe.NVIDIA.Archs.Tesla, + ], }, "iMac8,1_v2": { "Board ID": "Mac-F226BEC8", @@ -1147,6 +1456,10 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, "Ethernet Chipset": "Marvell", + "Stock GPUs": [ + device_probe.AMD.Archs.TeraScale_1, + device_probe.NVIDIA.Archs.Tesla, + ], }, "iMac9,1": { "Board ID": "Mac-F2218FA9", @@ -1158,6 +1471,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla, + ], }, "iMac9,1_v2": { "Board ID": "Mac-F2218EA9", @@ -1169,6 +1485,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla, + ], }, "iMac9,1_v3": { "Board ID": "Mac-F2218EC8", @@ -1180,6 +1499,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla, + ], }, "iMac9,1_v4": { "Board ID": "Mac-F2218FC8", @@ -1191,6 +1513,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla, + ], }, "iMac10,1": { "Board ID": "Mac-F221DCC8", @@ -1203,6 +1528,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla, + ], }, "iMac10,1_v2": { "Board ID": "Mac-F2268CC8", @@ -1214,6 +1542,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla, + ], }, "iMac10,1_v3": { "Board ID": "Mac-F2268DC8", @@ -1225,6 +1556,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Nvidia", "nForce Chipset": True, + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla, + ], }, "iMac11,1": { "Board ID": "Mac-F2268DAE", @@ -1235,6 +1569,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.AMD.Archs.TeraScale_1, + ], }, "iMac11,2": { "Board ID": "Mac-F2238AC8", @@ -1245,6 +1582,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.AMD.Archs.TeraScale_1, + device_probe.AMD.Archs.TeraScale_2, + ], }, "iMac11,3": { "Board ID": "Mac-F2238BAE", @@ -1255,6 +1596,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.AMD.Archs.TeraScale_1, + device_probe.AMD.Archs.TeraScale_2, + ], }, "iMac12,1": { "Board ID": "Mac-942B5BF58194151B", @@ -1265,6 +1610,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge, + device_probe.AMD.Archs.TeraScale_2, + ], }, "iMac12,2": { "Board ID": "Mac-942B59F58194171B", @@ -1275,6 +1624,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge, + device_probe.AMD.Archs.TeraScale_2, + ], }, "AAPL_iMac12,2": { # AppleInternal iMac12,2 @@ -1287,6 +1640,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Sandy_Bridge, + device_probe.AMD.Archs.TeraScale_2, + ], }, "iMac13,1": { "Board ID": "Mac-00BE6ED71E35EB86", @@ -1297,6 +1654,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Ivy_Bridge, + device_probe.NVIDIA.Archs.Kepler, + ], }, "iMac13,2": { "Board ID": "Mac-FC02E91DDD3FA6A4", @@ -1307,6 +1668,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Ivy_Bridge, + device_probe.NVIDIA.Archs.Kepler, + ], }, "iMac13,3": { "Board ID": "Mac-7DF2A3B5E5D671ED", @@ -1317,6 +1682,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Ivy_Bridge, + device_probe.NVIDIA.Archs.Kepler, + ], }, "iMac14,1": { "Board ID": "Mac-031B6874CF7F642A", @@ -1327,6 +1696,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + device_probe.NVIDIA.Archs.Kepler, + ], }, "iMac14,2": { "Board ID": "Mac-27ADBB7B4CEE8E61", @@ -1337,6 +1710,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + device_probe.NVIDIA.Archs.Kepler, + ], }, "iMac14,3": { "Board ID": "Mac-77EB7D7DAF985301", @@ -1347,6 +1724,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + device_probe.NVIDIA.Archs.Kepler, + ], }, "iMac14,4": { "Board ID": "Mac-81E3E92DD6088272", @@ -1357,6 +1738,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + ], }, "iMac15,1": { "Board ID": "Mac-42FD25EABCABB274", @@ -1367,6 +1751,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + device_probe.AMD.Archs.Legacy_GCN_7000, + ], }, "iMac15,1_v2": { "Board ID": "Mac-FA842E06C61E91C5", @@ -1377,6 +1765,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + device_probe.AMD.Archs.Legacy_GCN_7000, + ], }, "iMac16,1": { "Board ID": "Mac-A369DDC4E67F1C45", @@ -1387,6 +1779,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Broadwell, + ], }, "iMac16,2": { "Board ID": "Mac-FFE5EF870D7BA81A", @@ -1397,6 +1792,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Broadwell, + ], }, "iMac17,1": { "Board ID": "Mac-DB15BD556843C820", @@ -1409,6 +1807,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Skylake, + device_probe.AMD.Archs.Legacy_GCN_9000, + ], }, "iMac17,1_v2": { "Board ID": "Mac-65CE76090165799A", @@ -1420,6 +1822,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Skylake, + device_probe.AMD.Archs.Legacy_GCN_9000, + ], }, "iMac17,1_v3": { "Board ID": "Mac-B809C3757DA9BB8D", @@ -1430,6 +1836,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Skylake, + device_probe.AMD.Archs.Legacy_GCN_9000, + ], }, "iMac18,1": { "Board ID": "Mac-4B682C642B45593E", @@ -1440,6 +1850,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Kaby_Lake, + ], }, "iMac18,2": { "Board ID": "Mac-77F17D7DA9285301", @@ -1450,6 +1863,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Kaby_Lake, + device_probe.AMD.Archs.Polaris, + ], }, "iMac18,3": { "Board ID": "Mac-BE088AF8C5EB4FA2", @@ -1460,6 +1877,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Kaby_Lake, + device_probe.AMD.Archs.Polaris, + ], }, "iMac19,1": { "Board ID": "Mac-AA95B1DDAB278B95", @@ -1470,6 +1891,11 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake, + device_probe.AMD.Archs.Polaris, + device_probe.AMD.Archs.Vega, + ], }, "AAPL_iMac19,1": { # AppleInternal iMac19,1 unit @@ -1481,6 +1907,11 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake, + device_probe.AMD.Archs.Polaris, + device_probe.AMD.Archs.Vega, + ], }, "iMac19,2": { "Board ID": "Mac-63001698E7A34814", @@ -1491,6 +1922,11 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Coffee_Lake, + device_probe.AMD.Archs.Polaris, + device_probe.AMD.Archs.Vega, + ], }, "iMac20,1": { "Board ID": "Mac-CFF7D910A743CAAF", @@ -1501,6 +1937,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Comet_Lake, + device_probe.AMD.Archs.Navi, + ], }, "iMac20,2": { "Board ID": "Mac-AF89B6D9451A490B", @@ -1511,6 +1951,10 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.Intel.Archs.Comet_Lake, + device_probe.AMD.Archs.Navi, + ], }, "iMac21,1": { "Board ID": None, @@ -1521,6 +1965,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [], }, "iMac21,2": { "Board ID": None, @@ -1531,6 +1976,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [], }, "iMacPro1,1": { "Board ID": "Mac-7BA5B2D9E42DDD94", @@ -1541,6 +1987,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.AMD.Archs.Vega, + ], }, "MacPro1,1": { "Board ID": "Mac-F4208DC8", @@ -1552,6 +2001,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "UGA Graphics": True, "Ethernet Chipset": "Intel 80003ES2LAN", + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Curie + ], }, "MacPro2,1": { "Board ID": "Mac-F4208DA9", @@ -1563,6 +2015,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "UGA Graphics": True, "Ethernet Chipset": "Intel 80003ES2LAN", + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Curie + ], }, "MacPro3,1": { "Board ID": "Mac-F42C88C8", @@ -1574,6 +2029,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "UGA Graphics": True, "Ethernet Chipset": "Intel 80003ES2LAN", + "Stock GPUs": [ + device_probe.AMD.Archs.TeraScale_1 + ], }, "MacPro4,1": { "Board ID": "Mac-F221BEC8", @@ -1584,6 +2042,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Intel 82574L", + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "MacPro5,1": { "Board ID": "Mac-F221BEC8", @@ -1594,6 +2055,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Ethernet Chipset": "Intel 82574L", + "Stock GPUs": [ + device_probe.AMD.Archs.TeraScale_2 + ], }, "MacPro6,1": { "Board ID": "Mac-F60DEB81FF30ACF6", @@ -1604,6 +2068,9 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.AMD.Archs.Legacy_GCN_7000 + ], }, "MacPro7,1": { "Board ID": "Mac-27AD2F918AE68F61", @@ -1614,6 +2081,11 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [ + device_probe.AMD.Archs.Polaris, + device_probe.AMD.Archs.Vega, + device_probe.AMD.Archs.Navi + ], }, "Xserve1,1": { "Board ID": "Mac-F4208AC8", @@ -1625,6 +2097,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, "UGA Graphics": True, "Ethernet Chipset": "Intel 80003ES2LAN", + "Stock GPUs": [ + device_probe.AMD.Archs.R500 + ], }, "Xserve2,1": { "Board ID": "Mac-F42289C8", @@ -1636,6 +2111,9 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, "UGA Graphics": True, "Ethernet Chipset": "Intel 80003ES2LAN", + "Stock GPUs": [ + device_probe.AMD.Archs.R500 + ], }, "Xserve3,1": { "Board ID": "Mac-F223BEC8", @@ -1646,16 +2124,20 @@ smbios_dictionary = { "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, "Ethernet Chipset": "Intel 82574L", + "Stock GPUs": [ + device_probe.NVIDIA.Archs.Tesla + ], }, "ADP3,2": { "Board ID": None, "FirmwareFeatures": None, - "SecureBootModel": "j293", + "SecureBootModel": "j273a", "CPU Generation": cpu_data.cpu_data.apple_dtk.value, "Max OS Supported": os_data.os_data.max_os, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe, "Ethernet Chipset": "Broadcom", + "Stock GPUs": [], }, "AAPLJ53,1": { # AppleInternal MacBookPro11,4 @@ -1666,6 +2148,10 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.mavericks, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, + "Stock GPUs": [ + device_probe.Intel.Archs.Haswell, + ], + }, "Intel Virtual Machine": { "Board ID": "VMM-x86_64", @@ -1675,6 +2161,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.max_os, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, + "Stock GPUs": [], }, "VirtualMac1,1": { # Apple Silicon Virtual Machine @@ -1685,6 +2172,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.max_os, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, + "Stock GPUs": [], }, "VirtualMac2,1": { # Apple Silicon Virtual Machine @@ -1695,6 +2183,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.max_os, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, + "Stock GPUs": [], }, "iBridge2,11": { # Unknown ID, Intel based, present in Monterey @@ -1705,6 +2194,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.max_os, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, + "Stock GPUs": [], }, "iBridge2,13": { # Unknown ID, Intel based, present in Monterey @@ -1715,5 +2205,6 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.max_os, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, + "Stock GPUs": [], }, } diff --git a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1.zip b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1.zip index 718c32283..a86d49f6a 100644 Binary files a/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1.zip and b/payloads/Kexts/Acidanthera/BlueToolFixup-v2.6.1.zip differ diff --git a/payloads/Kexts/Acidanthera/BlueToolFixup.patch b/payloads/Kexts/Acidanthera/BlueToolFixup.patch index 1f1fa890a..438fc46ae 100644 --- a/payloads/Kexts/Acidanthera/BlueToolFixup.patch +++ b/payloads/Kexts/Acidanthera/BlueToolFixup.patch @@ -1,5 +1,5 @@ diff --git a/BrcmPatchRAM/BlueToolFixup.cpp b/BrcmPatchRAM/BlueToolFixup.cpp -index 0fa891a..b64b780 100644 +index 0fa891a..4cebff4 100644 --- a/BrcmPatchRAM/BlueToolFixup.cpp +++ b/BrcmPatchRAM/BlueToolFixup.cpp @@ -37,8 +37,10 @@ bool BlueToolFixup::start(IOService *provider) { @@ -13,3 +13,45 @@ index 0fa891a..b64b780 100644 registerService(); return true; +@@ -50,7 +52,22 @@ bool BlueToolFixup::start(IOService *provider) { + static const uint8_t kSkipUpdateFilePathOriginal[] = "/etc/bluetool/SkipBluetoothAutomaticFirmwareUpdate"; + static const uint8_t kSkipUpdateFilePathPatched[] = "/System/Library/CoreServices/boot.efi"; + ++static const uint8_t kVendorCheckOriginal[] = ++ { ++ 0x74, 0x08, // jz short 08 ++ 0x81, 0xFA, // cmp edx ++ 0x12, 0x0A, 0x00, 0x00 // Vendor CSR ++ }; ++ ++ static const uint8_t kVendorCheckPatched[] = ++ { ++ 0xEB, 0x08, // jmp short 08 ++ 0x81, 0xFA, // cmp edx ++ 0x12, 0x0A, 0x00, 0x00 // Vendor CSR ++ }; ++ + static const char *blueToolPath = "/usr/sbin/BlueTool"; ++static const char *bluetoothdPath = "/usr/sbin/bluetoothd"; + + static mach_vm_address_t orig_cs_validate {}; + +@@ -70,10 +87,14 @@ static inline void searchAndPatch(const void *haystack, size_t haystackSize, con + static void patched_cs_validate_page(vnode_t vp, memory_object_t pager, memory_object_offset_t page_offset, const void *data, int *validated_p, int *tainted_p, int *nx_p) { + char path[PATH_MAX]; + int pathlen = PATH_MAX; +- FunctionCast(patched_cs_validate_page, orig_cs_validate)(vp, pager, page_offset, data, validated_p, tainted_p, nx_p); +- if (vn_getpath(vp, path, &pathlen) == 0 && UNLIKELY(strcmp(path, blueToolPath) == 0)) { +- searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched); +- } ++ if (vn_getpath(vp, path, &pathlen) == 0) { ++ if (UNLIKELY(strcmp(path, blueToolPath) == 0)) { ++ searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched); ++ } ++ if (UNLIKELY(strcmp(path, bluetoothdPath) == 0)) { ++ searchAndPatch(data, PAGE_SIZE, path, kVendorCheckOriginal, kVendorCheckPatched); ++ } ++ } + } + + diff --git a/resources/build.py b/resources/build.py index dbb029d06..1b42988ab 100644 --- a/resources/build.py +++ b/resources/build.py @@ -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, diff --git a/resources/cli_menu.py b/resources/cli_menu.py index 6e1aae6dc..eec13bae3 100644 --- a/resources/cli_menu.py +++ b/resources/cli_menu.py @@ -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") diff --git a/resources/constants.py b/resources/constants.py index c80b8fc5f..0bb72dba4 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -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/" diff --git a/resources/device_probe.py b/resources/device_probe.py index a360392d0..111424c39 100644 --- a/resources/device_probe.py +++ b/resources/device_probe.py @@ -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: