Fixed AMD Verde CAIL injection logic

acidanthera · Dec 21, 2018 · d35ea6d · d35ea6d
1 parent 2f37366
commit d35ea6d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,7 @@ WhateverGreen Changelog
 =======================
 #### v1.2.6
 - Added `-applbkloff` boot argument to termporarily disable `AppleBacklight` patching code
+- Fixed AMD Verde CAIL injection logic
 
 #### v1.2.5
 - Added support for specifying `agpmod` in external GPU properties

diff --git a/WhateverGreen/kern_rad.cpp b/WhateverGreen/kern_rad.cpp
@@ -707,21 +707,18 @@ OSObject *RAD::wrapGetProperty(IORegistryEntry *that, const char *aKey) {
 					prefix = "CFG,";
 				else if (!strcmp(aKey, "aty_properties"))
 					prefix = "PP,";
+			} else if (aKey[0] == 'c' && !strcmp(aKey, "cail_properties")) {
+				prefix = "CAIL,";
 			}
-		} else if (aKey[0] == 'c' && !strcmp(aKey, "cail_properties")) {
-			provider = OSDynamicCast(IOService, that->getParentEntry(gIOServicePlane));
-			DBGLOG("rad", "GetProperty got cail_properties %d, merging from %s", provider != nullptr,
-				   provider ? safeString(provider->getName()) : "(null provider)");
-			if (provider) prefix = "CAIL,";
-		}
 
-		if (prefix && provider) {
-			DBGLOG("rad", "GetProperty discovered property merge request for %s", aKey);
-			auto newProps = OSDynamicCast(OSDictionary, props->copyCollection());
-			callbackRAD->mergeProperties(newProps, prefix, provider);
-			that->setProperty(aKey, newProps);
-			newProps->release();
-			obj = newProps;
+			if (prefix) {
+				DBGLOG("rad", "GetProperty discovered property merge request for %s", aKey);
+				auto newProps = OSDynamicCast(OSDictionary, props->copyCollection());
+				callbackRAD->mergeProperties(newProps, prefix, provider);
+				that->setProperty(aKey, newProps);
+				newProps->release();
+				obj = newProps;
+			}
 		}
 	}