refactor(cardwired): Huge improvement over gpu type detection

.github/workflows/cicd.yml

@@ -85,7 +85,7 @@ jobs:
         with:
           version: "1.21.1"
       - name: Install bpf-linker
-        run: cargo binstall bpf-linker
+        run: cargo binstall --version 0.11.0 --locked --no-confirm bpf-linker 
       - name: Clippy Workspace
         uses: auguwu/clippy-action@9817d076b82df0194935be9db6154c56ac07b317 # 1.5.0
         with:

Cargo.toml

@@ -35,8 +35,10 @@ anyhow = "1.0.102"
 env_logger = "0.11"
 toml = "1.0.3"
 vulkano = "0.35.2"
-khronos-egl = { version=  "6.0.0", features = ["dynamic", "1_5"] }
+khronos-egl = { version = "6.0.0", features = ["dynamic", "1_5"] }
 rusqlite = { version = "0.40.1", features = ["bundled"] }
+libdrm_amdgpu_sys = { version = "0.9.0", default-features = false, features = ["dynamic_loading"]}
+nvml-wrapper = "0.13.0"
 
 # EBPF
 aya = "0.14.0"

assets/cardwired.service

@@ -1,6 +1,10 @@
 [Unit]
 Description=Cardwire Daemon
-After=dbus.service
+Before=graphical.target display-manager.service
+# drm-module-load.target is from cachyos
+# <https://github.com/CachyOS/CachyOS-PKGBUILDS/pull/1695>
+After=drm-module-load.target
+Wants=drm-module-load.target
 
 
 [Service]

crates/cardwire-cli/src/dbus.rs

@@ -1,6 +1,6 @@
 use std::collections::BTreeMap;
 
-use zbus::{Proxy, connection::Connection};
+use zbus::{Proxy, connection::Connection, zvariant};
 
 use crate::display::PciDevice;
 
@@ -12,14 +12,24 @@ pub struct DbusGpuDevice {
     pub render: u32,
     pub card: u32,
     pub default: bool,
-    pub discrete: bool,
-    pub virtual_gpu: bool,
-    pub available: bool,
+    pub device_type: GpuType,
     pub vendor: String,
     pub driver: String,
-    pub nvidia: bool,
     pub nvidia_minor: String,
 }
+#[derive(
+    Clone, Debug, serde::Serialize, serde::Deserialize, Default, PartialEq, zvariant::Type,
+)]
+#[repr(u32)]
+pub enum GpuType {
+    Integrated = 0,
+    Discrete = 1,
+    Virtual = 2,
+    Other = 3,
+    Unavailable = 4,
+    #[default]
+    Unknown = 5,
+}
 
 pub struct DaemonClient<'a> {
     proxy: Proxy<'a>,

crates/cardwire-cli/src/display.rs

@@ -4,6 +4,8 @@
 use std::collections::BTreeMap;
 
 use anyhow::{Ok, Result};
+
+use crate::dbus::GpuType;
 // Define the struct here instead of importing from cardwire_core,
 // I want cardwire-cli to be independent of the rest of cardwire
 // This allow other dev to make their own client for cardwire
@@ -16,14 +18,11 @@ pub struct GpuDevice {
     pub render: u32,
     pub card: u32,
     pub default: bool,
-    pub discrete: bool,
-    pub virtual_gpu: bool,
-    pub available: bool,
+    pub device_type: GpuType,
     pub vendor: String,
     pub driver: String,
     pub blocked: bool,
     pub launchable: bool,
-    pub nvidia: bool,
     pub nvidia_minor: String,
 }
 #[derive(serde::Deserialize, serde::Serialize, zbus::zvariant::Type)]
@@ -119,7 +118,11 @@ fn pretty_print_gpu(gpu_list: BTreeMap<usize, GpuDevice>) {
             render_full,
             card_full,
             if gpu.default { "(*)" } else { "( )" },
-            if gpu.discrete { "(*)" } else { "( )" },
+            if gpu.device_type == GpuType::Discrete {
+                "(*)"
+            } else {
+                "( )"
+            },
             gpu.blocked,
             id_w = id_w,
             name_w = name_w,
@@ -144,9 +147,7 @@ mod tests {
         name: &str,
         pci: &str,
         default: bool,
-        discrete: bool,
-        virtual_gpu: bool,
-        available: bool,
+        device_type: GpuType,
         vendor: &str,
         driver: &str,
         blocked: bool,
@@ -158,14 +159,11 @@ mod tests {
             render: 128,
             card: 0,
             default,
-            discrete,
-            virtual_gpu,
-            available,
+            device_type: device_type.clone(),
             vendor: vendor.to_string(),
             driver: driver.to_string(),
             blocked,
-            launchable: !blocked && available,
-            nvidia: false,
+            launchable: !blocked && device_type != GpuType::Unavailable,
             nvidia_minor: String::new(),
         }
     }
@@ -180,9 +178,7 @@ mod tests {
                 "Intel UHD",
                 "0000:00:02.0",
                 true,
-                false,
-                false,
-                true,
+                GpuType::Integrated,
                 "Intel",
                 "xe",
                 false,
@@ -195,9 +191,7 @@ mod tests {
                 "RTX 4060",
                 "0000:01:00.0",
                 false,
-                true,
-                false,
-                true,
+                GpuType::Discrete,
                 "Nvidia",
                 "nouveau",
                 true,
@@ -226,9 +220,7 @@ mod tests {
             "RX 7900 XTX",
             "0000:03:00.0",
             false,
-            true,
-            false,
-            true,
+            GpuType::Discrete,
             "AMD",
             "amdgpu",
             false,
@@ -242,6 +234,6 @@ mod tests {
         assert_eq!(parsed.card, 0);
         assert!(!parsed.default);
         assert!(!parsed.blocked);
-        assert!(!parsed.nvidia);
+        assert!(parsed.vendor != "Nvidia");
     }
 }