feat: bump amdgpu-sysfs with RDNA3 changes, change values to signed integers

This commit is contained in:
Ilya Zlobintsev 2023-09-15 23:10:45 +03:00
parent 8f6e1b2c77
commit d1a0690191
11 changed files with 42 additions and 42 deletions

20
Cargo.lock generated
View File

@ -40,9 +40,9 @@ dependencies = [
[[package]]
name = "amdgpu-sysfs"
version = "0.11.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1241e256a8f6c8cb1ef7c9dcece471f4f5392472a85448ade4ef7c53e367f9e3"
checksum = "df7c7abdd5331a208d6977a9ecd2ba168811add784f0e9c1943fc16711ba96e5"
dependencies = [
"enum_dispatch",
"serde",
@ -1120,6 +1120,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown 0.12.3",
"serde",
]
[[package]]
@ -1130,7 +1131,6 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
dependencies = [
"equivalent",
"hashbrown 0.14.0",
"serde",
]
[[package]]
@ -1161,7 +1161,7 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "lact"
version = "0.4.4"
version = "0.4.5"
dependencies = [
"anyhow",
"lact-cli",
@ -1172,7 +1172,7 @@ dependencies = [
[[package]]
name = "lact-cli"
version = "0.4.4"
version = "0.4.5"
dependencies = [
"anyhow",
"lact-client",
@ -1181,7 +1181,7 @@ dependencies = [
[[package]]
name = "lact-client"
version = "0.4.4"
version = "0.4.5"
dependencies = [
"anyhow",
"lact-schema",
@ -1193,7 +1193,7 @@ dependencies = [
[[package]]
name = "lact-daemon"
version = "0.4.4"
version = "0.4.5"
dependencies = [
"anyhow",
"bincode",
@ -1215,7 +1215,7 @@ dependencies = [
[[package]]
name = "lact-gui"
version = "0.4.4"
version = "0.4.5"
dependencies = [
"anyhow",
"gtk4",
@ -1229,11 +1229,11 @@ dependencies = [
[[package]]
name = "lact-schema"
version = "0.4.4"
version = "0.4.5"
dependencies = [
"amdgpu-sysfs",
"clap",
"indexmap 2.0.0",
"indexmap 1.9.3",
"serde",
"serde_json",
]

View File

@ -1,6 +1,6 @@
[package]
name = "lact-cli"
version = "0.4.4"
version = "0.4.5"
edition = "2021"
[dependencies]

View File

@ -1,6 +1,6 @@
[package]
name = "lact-client"
version = "0.4.4"
version = "0.4.5"
edition = "2021"
[dependencies]

View File

@ -1,6 +1,6 @@
[package]
name = "lact-daemon"
version = "0.4.4"
version = "0.4.5"
edition = "2021"
[features]

View File

@ -53,12 +53,12 @@ pub struct Gpu {
pub fan_control_settings: Option<FanControlSettings>,
pub power_cap: Option<f64>,
pub performance_level: Option<PerformanceLevel>,
pub min_core_clock: Option<u32>,
pub min_memory_clock: Option<u32>,
pub min_voltage: Option<u32>,
pub max_core_clock: Option<u32>,
pub max_memory_clock: Option<u32>,
pub max_voltage: Option<u32>,
pub min_core_clock: Option<i32>,
pub min_memory_clock: Option<i32>,
pub min_voltage: Option<i32>,
pub max_core_clock: Option<i32>,
pub max_memory_clock: Option<i32>,
pub max_voltage: Option<i32>,
pub voltage_offset: Option<i32>,
pub power_profile_mode_index: Option<u16>,
}

View File

@ -1,6 +1,6 @@
[package]
name = "lact-gui"
version = "0.4.4"
version = "0.4.5"
authors = ["Ilya Zlobintsev <ilya.zl@protonmail.com>"]
edition = "2021"

View File

@ -324,10 +324,10 @@ fn extract_value_and_range(
f: fn(
&ClocksTableGen,
) -> (
Option<u32>,
Option<i32>,
Option<amdgpu_sysfs::gpu_handle::overdrive::Range>,
),
) -> Option<(u32, u32, u32)> {
) -> Option<(i32, i32, i32)> {
let (maybe_value, maybe_range) = f(table);
let (value, range) = maybe_value.zip(maybe_range)?;
let (min, max) = range.try_into().ok()?;
@ -398,16 +398,16 @@ fn oc_adjustment(title: &'static str, grid: &Grid, row: i32) -> (Adjustment, Rc<
#[derive(Debug, Default)]
pub struct ClocksSettings {
pub min_core_clock: Option<u32>,
pub min_memory_clock: Option<u32>,
pub min_voltage: Option<u32>,
pub max_core_clock: Option<u32>,
pub max_memory_clock: Option<u32>,
pub max_voltage: Option<u32>,
pub min_core_clock: Option<i32>,
pub min_memory_clock: Option<i32>,
pub min_voltage: Option<i32>,
pub max_core_clock: Option<i32>,
pub max_memory_clock: Option<i32>,
pub max_voltage: Option<i32>,
pub voltage_offset: Option<i32>,
}
fn get_adjustment_value((adjustment, changed): &(Adjustment, Rc<AtomicBool>)) -> Option<u32> {
fn get_adjustment_value((adjustment, changed): &(Adjustment, Rc<AtomicBool>)) -> Option<i32> {
let changed = changed.load(Ordering::SeqCst);
if changed {
@ -415,7 +415,7 @@ fn get_adjustment_value((adjustment, changed): &(Adjustment, Rc<AtomicBool>)) ->
if value == 0.0 {
None
} else {
Some(value as u32)
Some(value as i32)
}
} else {
None

View File

@ -1,13 +1,13 @@
[package]
name = "lact-schema"
version = "0.4.4"
version = "0.4.5"
edition = "2021"
[features]
args = ["clap"]
[dependencies]
amdgpu-sysfs = { version = "0.11.0", features = ["serde"] }
amdgpu-sysfs = { version = "0.12.0", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] }
indexmap = { version = "*", features = ["serde"] }
clap = { version = "4.4.2", features = ["derive"], optional = true }

View File

@ -93,9 +93,9 @@ pub struct DrmMemoryInfo {
#[derive(Serialize, Deserialize, Default, Debug, Clone)]
pub struct ClocksInfo {
pub max_sclk: Option<u32>,
pub max_mclk: Option<u32>,
pub max_voltage: Option<u32>,
pub max_sclk: Option<i32>,
pub max_mclk: Option<i32>,
pub max_voltage: Option<i32>,
pub table: Option<ClocksTableGen>,
}

View File

@ -59,12 +59,12 @@ pub enum ConfirmCommand {
#[derive(Serialize, Deserialize, Debug, PartialEq)]
#[serde(tag = "type", content = "value", rename_all = "snake_case")]
pub enum SetClocksCommand {
MaxCoreClock(u32),
MaxMemoryClock(u32),
MaxVoltage(u32),
MinCoreClock(u32),
MinMemoryClock(u32),
MinVoltage(u32),
MaxCoreClock(i32),
MaxMemoryClock(i32),
MaxVoltage(i32),
MinCoreClock(i32),
MinMemoryClock(i32),
MinVoltage(i32),
VoltageOffset(i32),
Reset,
}

View File

@ -1,6 +1,6 @@
[package]
name = "lact"
version = "0.4.4"
version = "0.4.5"
edition = "2021"
[features]