diff --git a/Cargo.lock b/Cargo.lock index cc515ec..2725963 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", ] diff --git a/lact-cli/Cargo.toml b/lact-cli/Cargo.toml index d003d51..376a0e3 100644 --- a/lact-cli/Cargo.toml +++ b/lact-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lact-cli" -version = "0.4.4" +version = "0.4.5" edition = "2021" [dependencies] diff --git a/lact-client/Cargo.toml b/lact-client/Cargo.toml index a2cd0aa..420718b 100644 --- a/lact-client/Cargo.toml +++ b/lact-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lact-client" -version = "0.4.4" +version = "0.4.5" edition = "2021" [dependencies] diff --git a/lact-daemon/Cargo.toml b/lact-daemon/Cargo.toml index cfbafa4..f44ae55 100644 --- a/lact-daemon/Cargo.toml +++ b/lact-daemon/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lact-daemon" -version = "0.4.4" +version = "0.4.5" edition = "2021" [features] diff --git a/lact-daemon/src/config.rs b/lact-daemon/src/config.rs index 18f0766..d8419ca 100644 --- a/lact-daemon/src/config.rs +++ b/lact-daemon/src/config.rs @@ -53,12 +53,12 @@ pub struct Gpu { pub fan_control_settings: Option, pub power_cap: Option, pub performance_level: Option, - pub min_core_clock: Option, - pub min_memory_clock: Option, - pub min_voltage: Option, - pub max_core_clock: Option, - pub max_memory_clock: Option, - pub max_voltage: Option, + pub min_core_clock: Option, + pub min_memory_clock: Option, + pub min_voltage: Option, + pub max_core_clock: Option, + pub max_memory_clock: Option, + pub max_voltage: Option, pub voltage_offset: Option, pub power_profile_mode_index: Option, } diff --git a/lact-gui/Cargo.toml b/lact-gui/Cargo.toml index e79f330..0195788 100644 --- a/lact-gui/Cargo.toml +++ b/lact-gui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lact-gui" -version = "0.4.4" +version = "0.4.5" authors = ["Ilya Zlobintsev "] edition = "2021" diff --git a/lact-gui/src/app/root_stack/oc_page/clocks_frame.rs b/lact-gui/src/app/root_stack/oc_page/clocks_frame.rs index 1d787a1..43362c0 100644 --- a/lact-gui/src/app/root_stack/oc_page/clocks_frame.rs +++ b/lact-gui/src/app/root_stack/oc_page/clocks_frame.rs @@ -324,10 +324,10 @@ fn extract_value_and_range( f: fn( &ClocksTableGen, ) -> ( - Option, + Option, Option, ), -) -> 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, - pub min_memory_clock: Option, - pub min_voltage: Option, - pub max_core_clock: Option, - pub max_memory_clock: Option, - pub max_voltage: Option, + pub min_core_clock: Option, + pub min_memory_clock: Option, + pub min_voltage: Option, + pub max_core_clock: Option, + pub max_memory_clock: Option, + pub max_voltage: Option, pub voltage_offset: Option, } -fn get_adjustment_value((adjustment, changed): &(Adjustment, Rc)) -> Option { +fn get_adjustment_value((adjustment, changed): &(Adjustment, Rc)) -> Option { let changed = changed.load(Ordering::SeqCst); if changed { @@ -415,7 +415,7 @@ fn get_adjustment_value((adjustment, changed): &(Adjustment, Rc)) -> if value == 0.0 { None } else { - Some(value as u32) + Some(value as i32) } } else { None diff --git a/lact-schema/Cargo.toml b/lact-schema/Cargo.toml index e1bde7c..40ec0b1 100644 --- a/lact-schema/Cargo.toml +++ b/lact-schema/Cargo.toml @@ -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 } diff --git a/lact-schema/src/lib.rs b/lact-schema/src/lib.rs index 40e1aac..d15c9d6 100644 --- a/lact-schema/src/lib.rs +++ b/lact-schema/src/lib.rs @@ -93,9 +93,9 @@ pub struct DrmMemoryInfo { #[derive(Serialize, Deserialize, Default, Debug, Clone)] pub struct ClocksInfo { - pub max_sclk: Option, - pub max_mclk: Option, - pub max_voltage: Option, + pub max_sclk: Option, + pub max_mclk: Option, + pub max_voltage: Option, pub table: Option, } diff --git a/lact-schema/src/request.rs b/lact-schema/src/request.rs index 3c9bb80..a88bcaa 100644 --- a/lact-schema/src/request.rs +++ b/lact-schema/src/request.rs @@ -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, } diff --git a/lact/Cargo.toml b/lact/Cargo.toml index 4da7206..6f2632d 100644 --- a/lact/Cargo.toml +++ b/lact/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lact" -version = "0.4.4" +version = "0.4.5" edition = "2021" [features]