From 8d2536da65b2126f1029a082958bd28b37debfbc Mon Sep 17 00:00:00 2001 From: Ilya Zlobintsev Date: Thu, 28 May 2026 09:11:27 +0300 Subject: [PATCH] chore: bump libdrm-amdgpu --- Cargo.lock | 4 ++-- flatpak/generated-sources.json | 12 ++++++------ lact-daemon/Cargo.toml | 2 +- lact-daemon/src/server/gpu_controller/amd.rs | 4 +--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 748b63c5..5d181ebb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1848,9 +1848,9 @@ dependencies = [ [[package]] name = "libdrm_amdgpu_sys" -version = "0.8.14" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b63f219bdee8484c65e0f54f81b6c671f1ab433f460e40c3174dea688abf31b" +checksum = "1e11704169b7b5a043ec5627aa0433019cf67d07f233002e1233edf67c2e662b" dependencies = [ "libc", "libloading", diff --git a/flatpak/generated-sources.json b/flatpak/generated-sources.json index 6ffe0a4f..13f3f9f6 100644 --- a/flatpak/generated-sources.json +++ b/flatpak/generated-sources.json @@ -2173,14 +2173,14 @@ { "type": "archive", "archive-type": "tar-gzip", - "url": "https://static.crates.io/crates/libdrm_amdgpu_sys/libdrm_amdgpu_sys-0.8.14.crate", - "sha256": "3b63f219bdee8484c65e0f54f81b6c671f1ab433f460e40c3174dea688abf31b", - "dest": "cargo/vendor/libdrm_amdgpu_sys-0.8.14" + "url": "https://static.crates.io/crates/libdrm_amdgpu_sys/libdrm_amdgpu_sys-0.8.16.crate", + "sha256": "1e11704169b7b5a043ec5627aa0433019cf67d07f233002e1233edf67c2e662b", + "dest": "cargo/vendor/libdrm_amdgpu_sys-0.8.16" }, { "type": "inline", - "contents": "{\"package\": \"3b63f219bdee8484c65e0f54f81b6c671f1ab433f460e40c3174dea688abf31b\", \"files\": {}}", - "dest": "cargo/vendor/libdrm_amdgpu_sys-0.8.14", + "contents": "{\"package\": \"1e11704169b7b5a043ec5627aa0433019cf67d07f233002e1233edf67c2e662b\", \"files\": {}}", + "dest": "cargo/vendor/libdrm_amdgpu_sys-0.8.16", "dest-filename": ".cargo-checksum.json" }, { @@ -5361,4 +5361,4 @@ "dest": "cargo", "dest-filename": "config" } -] +] \ No newline at end of file diff --git a/lact-daemon/Cargo.toml b/lact-daemon/Cargo.toml index 6055bb38..eee39fc7 100644 --- a/lact-daemon/Cargo.toml +++ b/lact-daemon/Cargo.toml @@ -37,7 +37,7 @@ nvml-wrapper = "0.12.1" bitflags = "2.11.1" pciid-parser = { version = "0.8", features = ["serde"] } zbus = { version = "5.14.0", default-features = false, features = ["tokio"] } -libdrm_amdgpu_sys = { version = "0.8.13", default-features = false, features = [ +libdrm_amdgpu_sys = { version = "0.8.16", default-features = false, features = [ "dynamic_loading", ] } tar = "0.4.45" diff --git a/lact-daemon/src/server/gpu_controller/amd.rs b/lact-daemon/src/server/gpu_controller/amd.rs index 8a6b1b68..f8912b5c 100644 --- a/lact-daemon/src/server/gpu_controller/amd.rs +++ b/lact-daemon/src/server/gpu_controller/amd.rs @@ -1427,8 +1427,6 @@ fn get_drm_handle( common: &CommonControllerInfo, libdrm_amdgpu: &LibDrmAmdgpu, ) -> anyhow::Result { - use std::os::unix::io::AsRawFd; - let path = common.get_drm_render()?; let drm_file = fs::OpenOptions::new() .read(true) @@ -1436,7 +1434,7 @@ fn get_drm_handle( .open(&path) .with_context(|| format!("Could not open drm file at {}", path.display()))?; let (handle, _, _) = libdrm_amdgpu - .init_device_handle(drm_file.as_raw_fd()) + .init_device_handle_with_fd(drm_file) .map_err(|err| anyhow!("Could not open drm handle, error code {err}"))?; Ok(handle) }