IntenseWebs/LACT
3
0
Fork 0
mirror of https://github.com/ilya-zlobintsev/LACT.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the parsing of gpu and memory clk/voltage table (#3)

Browse Source 
* Fix the parsing of gpu and memory clk/voltage table

* Fix error handling

* Remove debug println

Co-authored-by: ilyazzz <ilya.zl@protonmail.com>
This commit is contained in:
neon-sunset 2020-12-17 10:16:15 +02:00 committed by GitHub
parent d4ef64afae
commit 45ab06c661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
daemon/src/gpu_controller.rs
View File

@ -1,7 +1,7 @@
use crate::config::{GpuConfig, GpuIdentifier}; use crate::config::{GpuConfig, GpuIdentifier};
use crate::hw_mon::{HWMon, HWMonError}; use crate::hw_mon::{HWMon, HWMonError};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{path::{Path, PathBuf}}; use std::{num::ParseIntError, path::{Path, PathBuf}};
use std::{collections::BTreeMap, fs}; use std::{collections::BTreeMap, fs};
use vulkano::instance::{Instance, InstanceExtensions, PhysicalDevice}; use vulkano::instance::{Instance, InstanceExtensions, PhysicalDevice};
@ -23,6 +23,12 @@ impl From<std::io::Error> for GpuControllerError {
} }
} }
impl From<ParseIntError> for GpuControllerError {
fn from(_err: ParseIntError) -> GpuControllerError {
GpuControllerError::ParseError
}
}
#[derive(Serialize, Deserialize, Debug, Clone)] #[derive(Serialize, Deserialize, Debug, Clone)]
pub enum PowerProfile { pub enum PowerProfile {
Auto, Auto,
@ -455,10 +461,8 @@ impl GpuController {
"OD_SCLK:" => { "OD_SCLK:" => {
i += 1; i += 1;
while (lines[i].split_at(2).0 != "OD") && i < lines.len() { while (lines[i].split_at(2).0 != "OD") && i < lines.len() {
let split: Vec<&str> = lines[i].split_whitespace().collect(); let (num, clock, voltage) = GpuController::parse_clock_voltage_line(lines[i])?;
let num = split[0].chars().nth(0).unwrap().to_digit(10).unwrap();
let clock = split[1].replace("MHz", "").parse::<i32>().unwrap();
let voltage = split[2].replace("mV", "").parse::<i32>().unwrap();
clocks_table.gpu_power_levels.insert(num, (clock, voltage)); clocks_table.gpu_power_levels.insert(num, (clock, voltage));
log::trace!("Adding gpu power level {}MHz {}mv", clock, voltage); log::trace!("Adding gpu power level {}MHz {}mv", clock, voltage);
i += 1; i += 1;
@ -467,10 +471,8 @@ impl GpuController {
"OD_MCLK:" => { "OD_MCLK:" => {
i += 1; i += 1;
while (lines[i].split_at(2).0 != "OD") && i < lines.len() { while (lines[i].split_at(2).0 != "OD") && i < lines.len() {
let split: Vec<&str> = lines[i].split_whitespace().collect(); let (num, clock, voltage) = GpuController::parse_clock_voltage_line(lines[i])?;
let num = split[0].chars().nth(0).unwrap().to_digit(10).unwrap();
let clock = split[1].replace("MHz", "").parse::<i32>().unwrap();
let voltage = split[2].replace("mV", "").parse::<i32>().unwrap();
clocks_table.mem_power_levels.insert(num, (clock, voltage)); clocks_table.mem_power_levels.insert(num, (clock, voltage));
log::trace!("Adding vram power level {}MHz {}mv", clock, voltage); log::trace!("Adding vram power level {}MHz {}mv", clock, voltage);
i += 1; i += 1;
@ -592,6 +594,17 @@ impl GpuController {
} }
} }
fn parse_clock_voltage_line(line: &str) -> Result<(u32, i32, i32), GpuControllerError> {
let line = line.to_uppercase();
let line_parts: Vec<&str> = line.split_whitespace().collect();
let num: u32 = line_parts[0].chars().nth(0).unwrap().to_digit(10).unwrap();
let clock: i32 = line_parts[1].strip_suffix("MHZ").ok_or_else(|| GpuControllerError::ParseError)?.parse()?;
let voltage: i32 = line_parts[2].strip_suffix("MV").ok_or_else(|| GpuControllerError::ParseError)?.parse()?;
Ok((num, clock, voltage))
}
} }
@ -604,4 +617,4 @@ mod tests {
let mut c = GpuController::new(PathBuf::from("/sys/class/drm/card0/device"), GpuConfig::new()); let mut c = GpuController::new(PathBuf::from("/sys/class/drm/card0/device"), GpuConfig::new());
c.set_gpu_power_state(7, 1360, None) c.set_gpu_power_state(7, 1360, None)
} }
} }