nfd: gpu: allow i915 and xe drivers both compiled-in and as modules

Signed-off-by: Tuomas Katila <[email protected]>
intel · Mar 8, 2024 · bcaff99 · bcaff99
1 parent 6b0a65f
commit bcaff99
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/deployments/nfd/overlays/node-feature-rules/node-feature-rules.yaml b/deployments/nfd/overlays/node-feature-rules/node-feature-rules.yaml
@@ -57,9 +57,23 @@ spec:
           matchExpressions:
             vendor: {op: In, value: ["8086"]}
             class: {op: In, value: ["0300", "0380"]}
-        - feature: kernel.loadedmodule
-          matchExpressions:
-            i915: {op: Exists}
+      matchAny:
+        - matchFeatures:
+          - feature: kernel.loadedmodule
+            matchExpressions:
+              i915: {op: Exists}
+        - matchFeatures:
+          - feature: kernel.enabledmodule
+            matchExpressions:
+              i915: {op: Exists}
+        - matchFeatures:
+          - feature: kernel.loadedmodule
+            matchExpressions:
+              xe: {op: Exists}
+        - matchFeatures:
+          - feature: kernel.enabledmodule
+            matchExpressions:
+              xe: {op: Exists}
 
     - name: "intel.iaa"
       labels: