chore: cleanup

lact-daemon/src/server/gpu_controller.rs

@@ -99,7 +99,9 @@ pub trait GpuController {
 
     fn process_list(&self) -> anyhow::Result<ProcessList>;
 
-    fn populate_displays_info(&self, info: &mut DisplaysInfo) -> anyhow::Result<()>;
+    fn populate_displays_info(&self, _info: &mut DisplaysInfo) -> anyhow::Result<()> {
+        Ok(())
+    }
 }
 
 #[derive(Clone, Debug)]

lact-daemon/src/server/gpu_controller/amd.rs

@@ -1425,15 +1425,15 @@ impl GpuController for AmdGpuController {
         let debugfs = self.debugfs_path().context("Could not get debugfs")?;
 
         for (connector, info) in &mut info.displays {
-            let link_settings_path = debugfs.join(connector).join("link_settings");
-            let link_settings = fs::read_to_string(link_settings_path)?;
-
             if let DisplayConnector::DisplayPort {
                 lanes,
                 bandwidth,
                 embedded: _,
             } = &mut info.connector_type
             {
+                let link_settings_path = debugfs.join(connector).join("link_settings");
+                let link_settings = fs::read_to_string(link_settings_path)?;
+
                 let mut parts = link_settings.split_ascii_whitespace().skip(1);
 
                 *lanes = parts

lact-daemon/src/server/gpu_controller/intel.rs

@@ -812,10 +812,6 @@ impl GpuController for IntelGpuController {
             &mut last_total_time_map,
         )
     }
-
-    fn populate_displays_info(&self, _info: &mut DisplaysInfo) -> anyhow::Result<()> {
-        Ok(())
-    }
 }
 
 #[derive(Clone, Copy)]

lact-daemon/src/server/gpu_controller/nvidia/driver.rs

@@ -7,15 +7,15 @@ use std::{
 
 use crate::bindings::nvidia::{
     DRM_COMMAND_BASE, DRM_IOCTL_BASE, DRM_NVIDIA_GET_DPY_ID_FOR_CONNECTOR_ID, NV_ESC_REGISTER_FD,
-    NV_ESC_RM_ALLOC, NV_ESC_RM_CONTROL, NV_ESC_RM_FREE, NV_IOCTL_MAGIC, NV01_DEVICE_0,
+    NV_ESC_RM_ALLOC, NV_ESC_RM_CONTROL, NV_IOCTL_MAGIC, NV01_DEVICE_0, NV04_DISPLAY_COMMON,
-    NV04_DISPLAY_COMMON, NV20_SUBDEVICE_0, NV0073_CTRL_CMD_DP_GET_LINK_CONFIG,
+    NV20_SUBDEVICE_0, NV0073_CTRL_CMD_DP_GET_LINK_CONFIG, NV0073_CTRL_DP_GET_LINK_CONFIG_PARAMS,
-    NV0073_CTRL_DP_GET_LINK_CONFIG_PARAMS, NV0080_ALLOC_PARAMETERS, NV2080_ALLOC_PARAMETERS,
+    NV0080_ALLOC_PARAMETERS, NV2080_ALLOC_PARAMETERS, NV2080_CTRL_CMD_FB_GET_INFO,
-    NV2080_CTRL_CMD_FB_GET_INFO, NV2080_CTRL_CMD_GR_GET_GLOBAL_SM_ORDER,
+    NV2080_CTRL_CMD_GR_GET_GLOBAL_SM_ORDER, NV2080_CTRL_CMD_GR_GET_ROP_INFO,
-    NV2080_CTRL_CMD_GR_GET_ROP_INFO, NV2080_CTRL_FB_GET_INFO_PARAMS, NV2080_CTRL_FB_INFO,
+    NV2080_CTRL_FB_GET_INFO_PARAMS, NV2080_CTRL_FB_INFO, NV2080_CTRL_FB_INFO_INDEX_BUS_WIDTH,
-    NV2080_CTRL_FB_INFO_INDEX_BUS_WIDTH, NV2080_CTRL_FB_INFO_INDEX_L2CACHE_SIZE,
+    NV2080_CTRL_FB_INFO_INDEX_L2CACHE_SIZE, NV2080_CTRL_FB_INFO_INDEX_MEMORYINFO_VENDOR_ID,
-    NV2080_CTRL_FB_INFO_INDEX_MEMORYINFO_VENDOR_ID, NV2080_CTRL_FB_INFO_INDEX_RAM_TYPE,
+    NV2080_CTRL_FB_INFO_INDEX_RAM_TYPE, NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_ELPIDA,
-    NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_ELPIDA, NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_ESMT,
+    NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_ESMT, NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_ETRON,
-    NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_ETRON, NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_HYNIX,
+    NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_HYNIX,
     NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_MICRON,
     NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_MOSEL, NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_NANYA,
     NV2080_CTRL_FB_INFO_MEMORYINFO_VENDOR_ID_QIMONDA,
@@ -32,8 +32,8 @@ use crate::bindings::nvidia::{
     NV2080_CTRL_FB_INFO_RAM_TYPE_LPDDR4, NV2080_CTRL_FB_INFO_RAM_TYPE_LPDDR5,
     NV2080_CTRL_FB_INFO_RAM_TYPE_SDDR4, NV2080_CTRL_FB_INFO_RAM_TYPE_SDRAM,
     NV2080_CTRL_FB_INFO_RAM_TYPE_UNKNOWN, NV2080_CTRL_GR_GET_GLOBAL_SM_ORDER_PARAMS,
-    NV2080_CTRL_GR_GET_ROP_INFO_PARAMS, NVOS00_PARAMETERS, NVOS21_PARAMETERS, NVOS54_PARAMETERS,
+    NV2080_CTRL_GR_GET_ROP_INFO_PARAMS, NVOS21_PARAMETERS, NVOS54_PARAMETERS, NVOS64_PARAMETERS,
-    NVOS64_PARAMETERS, NvHandle, NvU32, drm_nvidia_get_dpy_id_for_connector_id_params,
+    NvHandle, NvU32, drm_nvidia_get_dpy_id_for_connector_id_params,
 };
 use anyhow::{Context, bail};
 use lact_schema::RopInfo;
@@ -306,8 +306,7 @@ unsafe fn alloc_object<T>(
         hObjectParent: parent,
         hObjectNew: 0,
         hClass: class,
-        pAllocParms: alloc_params
+        pAllocParms: alloc_params.map_or(ptr::null_mut(), |params| ptr::from_mut(params).cast()),
-            .map_or(ptr::null_mut(), |params| ptr::from_mut(params).cast()),
         pRightsRequested: ptr::null_mut(),
         paramsSize: 0,
         flags: 0,
@@ -340,8 +339,6 @@ ioctl_readwrite!(
     NVOS64_PARAMETERS
 );
 
-ioctl_readwrite!(rm_free, NV_IOCTL_MAGIC, NV_ESC_RM_FREE, NVOS00_PARAMETERS);
-
 ioctl_readwrite!(register_fd, NV_IOCTL_MAGIC, NV_ESC_REGISTER_FD, RawFd);
 
 ioctl_readwrite!(

lact-daemon/src/server/handler.rs

@@ -468,9 +468,9 @@ impl<'a> Handler {
         let common = controller.controller_info();
 
         let mut info = display::get_base_displays_info(&common.sysfs_path)?;
-        controller
+        if let Err(err) = controller.populate_displays_info(&mut info) {
-            .populate_displays_info(&mut info)
+            warn!("failed to populate displays info: {err:#}");
-            .context("Failed to populate info")?;
+        }
 
         Ok(info)
     }