Added support for modern AMD device scanning by @AlGreyy, closes #49

acidanthera · Jan 27, 2019 · 5f147cf · 5f147cf
1 parent 2782cc9
commit 5f147cf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,7 @@
 Lilu Changelog
 ==============
+#### v1.3.3
+- Added support for modern AMD device scanning by @AlGreyy
 
 #### v1.3.2
 - Extended supported firmware vendor list

diff --git a/Lilu.xcodeproj/project.pbxproj b/Lilu.xcodeproj/project.pbxproj
@@ -907,7 +907,7 @@
 				MODULE_NAME = as.vit9696.Lilu;
 				MODULE_START = kern_start;
 				MODULE_STOP = kern_stop;
-				MODULE_VERSION = 1.3.2;
+				MODULE_VERSION = 1.3.3;
 				OTHER_CFLAGS = (
 					"-mmmx",
 					"-msse",
@@ -970,7 +970,7 @@
 				MODULE_NAME = as.vit9696.Lilu;
 				MODULE_START = kern_start;
 				MODULE_STOP = kern_stop;
-				MODULE_VERSION = 1.3.2;
+				MODULE_VERSION = 1.3.3;
 				OTHER_CFLAGS = (
 					"-mmmx",
 					"-msse",
@@ -1082,7 +1082,7 @@
 				MODULE_NAME = as.vit9696.Lilu;
 				MODULE_START = kern_start;
 				MODULE_STOP = kern_stop;
-				MODULE_VERSION = 1.3.2;
+				MODULE_VERSION = 1.3.3;
 				OTHER_CFLAGS = (
 					"-mmmx",
 					"-msse",

diff --git a/Lilu/Headers/kern_iokit.hpp b/Lilu/Headers/kern_iokit.hpp
@@ -138,6 +138,7 @@ namespace WIOKit {
 	struct VendorID {
 		enum : uint16_t {
 			ATIAMD = 0x1002,
+			AMDZEN = 0x1022,
 			NVIDIA = 0x10de,
 			Intel = 0x8086
 		};

diff --git a/Lilu/Sources/kern_devinfo.cpp b/Lilu/Sources/kern_devinfo.cpp
@@ -231,7 +231,7 @@ void DeviceInfo::grabDevicesFromPciRoot(IORegistryEntry *pciRoot) {
 			// Strip interface, as we only care about class and subclass
 			code &= WIOKit::ClassCode::PCISubclassMask;
 
-			if (!gotVendor || !gotClass || (vendor != WIOKit::VendorID::Intel && vendor != WIOKit::VendorID::ATIAMD))
+			if (!gotVendor || !gotClass || (vendor != WIOKit::VendorID::Intel && vendor != WIOKit::VendorID::ATIAMD && vendor != WIOKit::VendorID::AMDZEN))
 				continue;
 
 			if (vendor == WIOKit::VendorID::Intel && (code == WIOKit::ClassCode::DisplayController || code == WIOKit::ClassCode::VGAController)) {
@@ -272,10 +272,16 @@ void DeviceInfo::grabDevicesFromPciRoot(IORegistryEntry *pciRoot) {
 									   safeString(pciobj->getName()), safeString(name),  pcivendor);
 								v.video = pciobj;
 								v.vendor = pcivendor;
-							} else if (pcicode == WIOKit::ClassCode::HDADevice) {
+							} else if (pcicode == WIOKit::ClassCode::HDADevice && pcivendor != WIOKit::VendorID::AMDZEN) {
 								DBGLOG("dev", "found HDAU device %s at %s by %04X",
 									   safeString(pciobj->getName()), safeString(name), pcivendor);
 								v.audio = pciobj;
+							} else if (pcicode == WIOKit::ClassCode::HDADevice) {
+								// On modern AMD platforms built-in audio devices sits on a PCI bridge just any other device.
+								// Luckily it has a distinct device-id for the time being.
+								DBGLOG("dev", "found AMD HDEF device %s at %s by %04X",
+									   safeString(pciobj->getName()), safeString(name), pcivendor);
+								audioBuiltinAnalog = pciobj;
 							}
 						}
 					}