Add 6900 XTXH device ID

Signed-off-by: Visual Ehrmanntraut <[email protected]>
ChefKissInc · Oct 4, 2023 · 24c9f8f · 24c9f8f
1 parent b2712f4
commit 24c9f8f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 29 deletions.
diff --git a/NootRX/Info.plist b/NootRX/Info.plist
@@ -31,7 +31,7 @@
 			<key>IOMatchCategory</key>
 			<string>IOFramebuffer</string>
 			<key>IOPCIMatch</key>
-			<string>0x73A21002 0x73A31002 0x73A41002 0x73A51002 0x73AB1002 0x73BF1002 0x73C31002 0x73C41002 0x73DF1002 0x73E01002 0x73E11002 0x73E31002 0x73EF1002 0x73FF1002</string>
+			<string>0x73A21002 0x73A31002 0x73A41002 0x73A51002 0x73AB1002 0x73AF1002 0x73BF1002 0x73C31002 0x73C41002 0x73DF1002 0x73E01002 0x73E11002 0x73E31002 0x73EF1002 0x73FF1002</string>
 			<key>IOPCITunnelCompatible</key>
 			<true/>
 			<key>IOProbeScore</key>
@@ -129,7 +129,7 @@
 			<key>IOMatchCategory</key>
 			<string>ATIFramebuffer</string>
 			<key>IOPCIMatch</key>
-			<string>0x73A21002 0x73A31002 0x73A41002 0x73A51002 0x73AB1002 0x73BF1002</string>
+			<string>0x73A21002 0x73A31002 0x73A41002 0x73A51002 0x73AB1002 0x73AF1002 0x73BF1002</string>
 			<key>IOPCITunnelCompatible</key>
 			<true/>
 			<key>IOPCIUseDeviceMapper</key>
@@ -310,7 +310,7 @@
 					<key>IOMatchCategory</key>
 					<string>AMDRadeonX6000HWServices</string>
 					<key>IOPCIMatch</key>
-					<string>0x73A21002 0x73A31002 0x73A41002 0x73A51002 0x73AB1002 0x73BF1002 0x73C31002 0x73C41002 0x73DF1002 0x73E01002 0x73E11002 0x73E31002 0x73EF1002 0x73FF1002</string>
+					<string>0x73A21002 0x73A31002 0x73A41002 0x73A51002 0x73AB1002 0x73AF1002 0x73BF1002 0x73C31002 0x73C41002 0x73DF1002 0x73E01002 0x73E11002 0x73E31002 0x73EF1002 0x73FF1002</string>
 					<key>IOPCITunnelCompatible</key>
 					<true/>
 					<key>IOProbeScore</key>
@@ -400,7 +400,7 @@
 					<key>IOMatchCategory</key>
 					<string>IOAccelerator</string>
 					<key>IOPCIMatch</key>
-					<string>0x73A21002 0x73A31002 0x73A41002 0x73A51002 0x73AB1002 0x73BF1002 </string>
+					<string>0x73A21002 0x73A31002 0x73A41002 0x73A51002 0x73AB1002 0x73AF1002 0x73BF1002 </string>
 					<key>IOPCITunnelCompatible</key>
 					<true/>
 					<key>IOPropertyMatch</key>

diff --git a/NootRX/NootRX.cpp b/NootRX/NootRX.cpp
@@ -80,51 +80,33 @@ void NootRXMain::processPatcher(KernelPatcher &patcher) {
         }
 
         switch (this->deviceId) {
-            case 0x73A2:
-                [[fallthrough]];
-            case 0x73A3:
-                [[fallthrough]];
-            case 0x73A4:
-                [[fallthrough]];
-            case 0x73A5:
+            case 0x73A2 ... 0x73A5:
                 [[fallthrough]];
             case 0x73AB:
                 [[fallthrough]];
+            case 0x73AF:
+                [[fallthrough]];
             case 0x73BF:
                 this->chipType = ChipType::Navi21;
                 this->enumRevision = 0x28;
                 break;
-            case 0x73C3:
-                [[fallthrough]];
-            case 0x73C4:
+            case 0x73C3 ... 0x73C4:
                 [[fallthrough]];
             case 0x73DF:
                 PANIC_COND(getKernelVersion() < KernelVersion::Monterey, "NootRX",
                     "Unsupported macOS version; Navi 22 requires macOS Monterey or newer");
                 this->chipType = ChipType::Navi22;
                 this->enumRevision = 0x32;
                 break;
-            case 0x73E0:
-                [[fallthrough]];
-            case 0x73E1:
-                [[fallthrough]];
-            case 0x73E4:
+            case 0x73E0 ... 0x73E4:
                 [[fallthrough]];
             case 0x73EF:
                 PANIC_COND(getKernelVersion() < KernelVersion::Monterey, "NootRX",
                     "Unsupported macOS version; Navi 23 requires macOS Monterey or newer");
                 this->chipType = ChipType::Navi23;
                 this->enumRevision = 0x3C;
                 break;
-            case 0x7420:
-                [[fallthrough]];
-            case 0x7421:
-                [[fallthrough]];
-            case 0x7422:
-                [[fallthrough]];
-            case 0x7423:
-                [[fallthrough]];
-            case 0x7424:
+            case 0x7420 ... 0x7424:
                 [[fallthrough]];
             case 0x743F:
                 PANIC_COND(getKernelVersion() < KernelVersion::Monterey, "NootRX",

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # NootRX ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/ChefKissInc/NootRX/main.yml?branch=master&logo=github&style=for-the-badge)
 
-Lilu plug-in for unsupported RDNA 2 dGPUs.
+Lilu plug-in for unsupported RDNA 2 dGPUs. Conflicts with WhateverGreen/NootedRed.
 
 Currently supports: