Add dev driver
This commit is contained in:
parent
3e8a263f4e
commit
0ee30eebe6
12 changed files with 701 additions and 2 deletions
|
@ -16,6 +16,30 @@ impl Default for Base {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Base {
|
Base {
|
||||||
configs: vec![
|
configs: vec![
|
||||||
|
super::Config {
|
||||||
|
name: "Devs mode best mode".to_owned(),
|
||||||
|
conditions: super::Conditions {
|
||||||
|
dmi: None,
|
||||||
|
cpuinfo: None,
|
||||||
|
os: None,
|
||||||
|
command: None,
|
||||||
|
file_exists: Some("/etc/powertools_dev_mode".into()),
|
||||||
|
},
|
||||||
|
limits: super::Limits {
|
||||||
|
cpu: super::Limit {
|
||||||
|
provider: super::CpuLimitType::DevMode,
|
||||||
|
limits: super::GenericCpusLimit::default_for(super::CpuLimitType::DevMode),
|
||||||
|
},
|
||||||
|
gpu: super::Limit {
|
||||||
|
provider: super::GpuLimitType::DevMode,
|
||||||
|
limits: super::GenericGpuLimit::default_for(super::GpuLimitType::DevMode),
|
||||||
|
},
|
||||||
|
battery: super::Limit {
|
||||||
|
provider: super::BatteryLimitType::DevMode,
|
||||||
|
limits: super::GenericBatteryLimit::default_for(super::BatteryLimitType::DevMode),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
super::Config {
|
super::Config {
|
||||||
name: "Steam Deck".to_owned(),
|
name: "Steam Deck".to_owned(),
|
||||||
conditions: super::Conditions {
|
conditions: super::Conditions {
|
||||||
|
@ -83,8 +107,10 @@ impl Default for Base {
|
||||||
clock_max: Some(super::RangeLimit { min: Some(1000), max: Some(3700) }),
|
clock_max: Some(super::RangeLimit { min: Some(1000), max: Some(3700) }),
|
||||||
clock_step: Some(100),
|
clock_step: Some(100),
|
||||||
skip_resume_reclock: false,
|
skip_resume_reclock: false,
|
||||||
|
..Default::default()
|
||||||
}; 4],
|
}; 4],
|
||||||
global_governors: true,
|
global_governors: true,
|
||||||
|
experiments: false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
gpu: super::GpuLimit {
|
gpu: super::GpuLimit {
|
||||||
|
@ -125,8 +151,10 @@ impl Default for Base {
|
||||||
clock_max: Some(super::RangeLimit { min: Some(1000), max: Some(4000) }),
|
clock_max: Some(super::RangeLimit { min: Some(1000), max: Some(4000) }),
|
||||||
clock_step: Some(100),
|
clock_step: Some(100),
|
||||||
skip_resume_reclock: false,
|
skip_resume_reclock: false,
|
||||||
|
..Default::default()
|
||||||
}; 12], // 6 cores with SMTx2
|
}; 12], // 6 cores with SMTx2
|
||||||
global_governors: true,
|
global_governors: true,
|
||||||
|
experiments: false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
gpu: super::GpuLimit {
|
gpu: super::GpuLimit {
|
||||||
|
@ -167,8 +195,10 @@ impl Default for Base {
|
||||||
clock_max: Some(super::RangeLimit { min: Some(1000), max: Some(4500) }),
|
clock_max: Some(super::RangeLimit { min: Some(1000), max: Some(4500) }),
|
||||||
clock_step: Some(100),
|
clock_step: Some(100),
|
||||||
skip_resume_reclock: false,
|
skip_resume_reclock: false,
|
||||||
|
..Default::default()
|
||||||
}; 16], // 8 cores with SMTx2
|
}; 16], // 8 cores with SMTx2
|
||||||
global_governors: true,
|
global_governors: true,
|
||||||
|
experiments: false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
gpu: super::GpuLimit {
|
gpu: super::GpuLimit {
|
||||||
|
@ -209,8 +239,10 @@ impl Default for Base {
|
||||||
clock_max: Some(super::RangeLimit { min: Some(1000), max: Some(4700) }),
|
clock_max: Some(super::RangeLimit { min: Some(1000), max: Some(4700) }),
|
||||||
clock_step: Some(100),
|
clock_step: Some(100),
|
||||||
skip_resume_reclock: false,
|
skip_resume_reclock: false,
|
||||||
|
..Default::default()
|
||||||
}; 16], // 8 cores with SMTx2
|
}; 16], // 8 cores with SMTx2
|
||||||
global_governors: true,
|
global_governors: true,
|
||||||
|
experiments: false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
gpu: super::GpuLimit {
|
gpu: super::GpuLimit {
|
||||||
|
@ -251,8 +283,10 @@ impl Default for Base {
|
||||||
clock_max: Some(super::RangeLimit { min: Some(400), max: Some(5100) }),
|
clock_max: Some(super::RangeLimit { min: Some(400), max: Some(5100) }),
|
||||||
clock_step: Some(100),
|
clock_step: Some(100),
|
||||||
skip_resume_reclock: false,
|
skip_resume_reclock: false,
|
||||||
|
..Default::default()
|
||||||
}; 16], // 8 cores with SMTx2
|
}; 16], // 8 cores with SMTx2
|
||||||
global_governors: true,
|
global_governors: true,
|
||||||
|
experiments: false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
gpu: super::GpuLimit {
|
gpu: super::GpuLimit {
|
||||||
|
|
|
@ -10,6 +10,7 @@ pub enum BatteryLimitType {
|
||||||
SteamDeckAdvance,
|
SteamDeckAdvance,
|
||||||
Generic,
|
Generic,
|
||||||
Unknown,
|
Unknown,
|
||||||
|
DevMode,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug, Clone, Default)]
|
#[derive(Serialize, Deserialize, Debug, Clone, Default)]
|
||||||
|
@ -18,12 +19,14 @@ pub struct GenericBatteryLimit {
|
||||||
pub charge_modes: Vec<String>,
|
pub charge_modes: Vec<String>,
|
||||||
pub charge_limit: Option<RangeLimit<f64>>, // battery charge %
|
pub charge_limit: Option<RangeLimit<f64>>, // battery charge %
|
||||||
pub extra_readouts: bool,
|
pub extra_readouts: bool,
|
||||||
|
pub experiments: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl GenericBatteryLimit {
|
impl GenericBatteryLimit {
|
||||||
pub fn default_for(t: BatteryLimitType) -> Self {
|
pub fn default_for(t: BatteryLimitType) -> Self {
|
||||||
match t {
|
match t {
|
||||||
BatteryLimitType::SteamDeck | BatteryLimitType::SteamDeckAdvance => Self::default_steam_deck(),
|
BatteryLimitType::SteamDeck | BatteryLimitType::SteamDeckAdvance => Self::default_steam_deck(),
|
||||||
|
BatteryLimitType::DevMode => Self::default_dev_mode(),
|
||||||
_t => Self::default(),
|
_t => Self::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -44,6 +47,27 @@ impl GenericBatteryLimit {
|
||||||
max: Some(90.0),
|
max: Some(90.0),
|
||||||
}),
|
}),
|
||||||
extra_readouts: false,
|
extra_readouts: false,
|
||||||
|
experiments: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn default_dev_mode() -> Self {
|
||||||
|
Self {
|
||||||
|
charge_rate: Some(RangeLimit {
|
||||||
|
min: Some(0),
|
||||||
|
max: Some(1_000),
|
||||||
|
}),
|
||||||
|
charge_modes: vec![
|
||||||
|
"normal".to_owned(),
|
||||||
|
"discharge".to_owned(),
|
||||||
|
"idle".to_owned(),
|
||||||
|
],
|
||||||
|
charge_limit: Some(RangeLimit {
|
||||||
|
min: Some(1.0),
|
||||||
|
max: Some(99.0),
|
||||||
|
}),
|
||||||
|
extra_readouts: true,
|
||||||
|
experiments: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -67,5 +91,6 @@ impl GenericBatteryLimit {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
self.extra_readouts = limit_override.extra_readouts;
|
self.extra_readouts = limit_override.extra_readouts;
|
||||||
|
self.experiments = limit_override.experiments;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,12 +12,14 @@ pub enum CpuLimitType {
|
||||||
Generic,
|
Generic,
|
||||||
GenericAMD,
|
GenericAMD,
|
||||||
Unknown,
|
Unknown,
|
||||||
|
DevMode,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug, Clone, Default)]
|
#[derive(Serialize, Deserialize, Debug, Clone, Default)]
|
||||||
pub struct GenericCpusLimit {
|
pub struct GenericCpusLimit {
|
||||||
pub cpus: Vec<GenericCpuLimit>,
|
pub cpus: Vec<GenericCpuLimit>,
|
||||||
pub global_governors: bool,
|
pub global_governors: bool,
|
||||||
|
pub experiments: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl GenericCpusLimit {
|
impl GenericCpusLimit {
|
||||||
|
@ -27,6 +29,14 @@ impl GenericCpusLimit {
|
||||||
Self {
|
Self {
|
||||||
cpus: [(); 8].iter().enumerate().map(|(i, _)| GenericCpuLimit::default_for(&t, i)).collect(),
|
cpus: [(); 8].iter().enumerate().map(|(i, _)| GenericCpuLimit::default_for(&t, i)).collect(),
|
||||||
global_governors: true,
|
global_governors: true,
|
||||||
|
experiments: false,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
CpuLimitType::DevMode => {
|
||||||
|
Self {
|
||||||
|
cpus: [(); 11].iter().enumerate().map(|(i, _)| GenericCpuLimit::default_for(&t, i)).collect(),
|
||||||
|
global_governors: true,
|
||||||
|
experiments: true,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
t => {
|
t => {
|
||||||
|
@ -38,6 +48,7 @@ impl GenericCpusLimit {
|
||||||
Self {
|
Self {
|
||||||
cpus,
|
cpus,
|
||||||
global_governors: true,
|
global_governors: true,
|
||||||
|
experiments: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -65,6 +76,7 @@ impl GenericCpusLimit {
|
||||||
.for_each(|(cpu, limit_override)| cpu.apply_override(limit_override));
|
.for_each(|(cpu, limit_override)| cpu.apply_override(limit_override));
|
||||||
}
|
}
|
||||||
self.global_governors = limit_override.global_governors;
|
self.global_governors = limit_override.global_governors;
|
||||||
|
self.experiments = limit_override.experiments;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,18 +85,39 @@ pub struct GenericCpuLimit {
|
||||||
pub clock_min: Option<RangeLimit<u64>>,
|
pub clock_min: Option<RangeLimit<u64>>,
|
||||||
pub clock_max: Option<RangeLimit<u64>>,
|
pub clock_max: Option<RangeLimit<u64>>,
|
||||||
pub clock_step: Option<u64>,
|
pub clock_step: Option<u64>,
|
||||||
|
pub tdp: Option<RangeLimit<u64>>,
|
||||||
|
pub tdp_boost: Option<RangeLimit<u64>>,
|
||||||
|
pub tdp_divisor: Option<u64>,
|
||||||
|
pub tdp_step: Option<u64>,
|
||||||
pub skip_resume_reclock: bool,
|
pub skip_resume_reclock: bool,
|
||||||
|
pub experiments: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl GenericCpuLimit {
|
impl GenericCpuLimit {
|
||||||
pub fn default_for(t: &CpuLimitType, _index: usize) -> Self {
|
pub fn default_for(t: &CpuLimitType, _index: usize) -> Self {
|
||||||
match t {
|
match t {
|
||||||
CpuLimitType::SteamDeck | CpuLimitType::SteamDeckAdvance => Self::default_steam_deck(),
|
CpuLimitType::SteamDeck | CpuLimitType::SteamDeckAdvance => Self::default_steam_deck(),
|
||||||
|
CpuLimitType::DevMode => Self {
|
||||||
|
clock_min: Some(RangeLimit { min: Some(100), max: Some(5000) }),
|
||||||
|
clock_max: Some(RangeLimit { min: Some(100), max: Some(4800) }),
|
||||||
|
clock_step: Some(100),
|
||||||
|
tdp: Some(RangeLimit { min: Some(1_000_000), max: Some(100_000_000) }),
|
||||||
|
tdp_boost: Some(RangeLimit { min: Some(1_000_000), max: Some(110_000_000) }),
|
||||||
|
tdp_divisor: Some(1_000_000),
|
||||||
|
tdp_step: Some(1),
|
||||||
|
skip_resume_reclock: false,
|
||||||
|
experiments: true,
|
||||||
|
},
|
||||||
_ => Self {
|
_ => Self {
|
||||||
clock_min: None,
|
clock_min: None,
|
||||||
clock_max: None,
|
clock_max: None,
|
||||||
clock_step: Some(100),
|
clock_step: Some(100),
|
||||||
|
tdp: None,
|
||||||
|
tdp_boost: None,
|
||||||
|
tdp_divisor: None,
|
||||||
|
tdp_step: None,
|
||||||
skip_resume_reclock: false,
|
skip_resume_reclock: false,
|
||||||
|
experiments: false,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -100,7 +133,12 @@ impl GenericCpuLimit {
|
||||||
max: Some(3500),
|
max: Some(3500),
|
||||||
}),
|
}),
|
||||||
clock_step: Some(100),
|
clock_step: Some(100),
|
||||||
|
tdp: None,
|
||||||
|
tdp_boost: None,
|
||||||
|
tdp_divisor: None,
|
||||||
|
tdp_step: None,
|
||||||
skip_resume_reclock: false,
|
skip_resume_reclock: false,
|
||||||
|
experiments: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -124,5 +162,6 @@ impl GenericCpuLimit {
|
||||||
}
|
}
|
||||||
self.clock_step = limit_override.clock_step;
|
self.clock_step = limit_override.clock_step;
|
||||||
self.skip_resume_reclock = limit_override.skip_resume_reclock;
|
self.skip_resume_reclock = limit_override.skip_resume_reclock;
|
||||||
|
self.experiments = limit_override.experiments;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,11 +8,12 @@ pub enum GpuLimitType {
|
||||||
SteamDeck,
|
SteamDeck,
|
||||||
#[serde(rename = "GabeBoyAdvance", alias = "SteamDeckAdvance")]
|
#[serde(rename = "GabeBoyAdvance", alias = "SteamDeckAdvance")]
|
||||||
SteamDeckAdvance,
|
SteamDeckAdvance,
|
||||||
#[serde(rename = "GabeBoy101", alias = "SteamDeckOLED")]
|
#[serde(rename = "GabeBoySP", alias = "SteamDeckOLED")]
|
||||||
SteamDeckOLED,
|
SteamDeckOLED,
|
||||||
Generic,
|
Generic,
|
||||||
GenericAMD,
|
GenericAMD,
|
||||||
Unknown,
|
Unknown,
|
||||||
|
DevMode,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize, Debug, Clone, Default)]
|
#[derive(Serialize, Deserialize, Debug, Clone, Default)]
|
||||||
|
@ -25,6 +26,7 @@ pub struct GenericGpuLimit {
|
||||||
pub ppt_step: Option<u64>,
|
pub ppt_step: Option<u64>,
|
||||||
pub tdp: Option<RangeLimit<u64>>,
|
pub tdp: Option<RangeLimit<u64>>,
|
||||||
pub tdp_boost: Option<RangeLimit<u64>>,
|
pub tdp_boost: Option<RangeLimit<u64>>,
|
||||||
|
pub tdp_divisor: Option<u64>,
|
||||||
pub tdp_step: Option<u64>,
|
pub tdp_step: Option<u64>,
|
||||||
pub clock_min: Option<RangeLimit<u64>>,
|
pub clock_min: Option<RangeLimit<u64>>,
|
||||||
pub clock_max: Option<RangeLimit<u64>>,
|
pub clock_max: Option<RangeLimit<u64>>,
|
||||||
|
@ -32,6 +34,7 @@ pub struct GenericGpuLimit {
|
||||||
pub memory_clock: Option<RangeLimit<u64>>,
|
pub memory_clock: Option<RangeLimit<u64>>,
|
||||||
pub memory_clock_step: Option<u64>,
|
pub memory_clock_step: Option<u64>,
|
||||||
pub skip_resume_reclock: bool,
|
pub skip_resume_reclock: bool,
|
||||||
|
pub experiments: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl GenericGpuLimit {
|
impl GenericGpuLimit {
|
||||||
|
@ -39,6 +42,7 @@ impl GenericGpuLimit {
|
||||||
match t {
|
match t {
|
||||||
GpuLimitType::SteamDeck | GpuLimitType::SteamDeckAdvance => Self::default_steam_deck(),
|
GpuLimitType::SteamDeck | GpuLimitType::SteamDeckAdvance => Self::default_steam_deck(),
|
||||||
GpuLimitType::SteamDeckOLED => Self::default_steam_deck_oled(),
|
GpuLimitType::SteamDeckOLED => Self::default_steam_deck_oled(),
|
||||||
|
GpuLimitType::DevMode => Self::default_dev_mode(),
|
||||||
_t => Self::default(),
|
_t => Self::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -59,6 +63,7 @@ impl GenericGpuLimit {
|
||||||
ppt_step: Some(1),
|
ppt_step: Some(1),
|
||||||
tdp: None,
|
tdp: None,
|
||||||
tdp_boost: None,
|
tdp_boost: None,
|
||||||
|
tdp_divisor: None,
|
||||||
tdp_step: None,
|
tdp_step: None,
|
||||||
clock_min: Some(RangeLimit {
|
clock_min: Some(RangeLimit {
|
||||||
min: Some(400),
|
min: Some(400),
|
||||||
|
@ -78,6 +83,7 @@ impl GenericGpuLimit {
|
||||||
memory_clock: None,
|
memory_clock: None,
|
||||||
memory_clock_step: None,
|
memory_clock_step: None,
|
||||||
skip_resume_reclock: false,
|
skip_resume_reclock: false,
|
||||||
|
experiments: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,6 +93,43 @@ impl GenericGpuLimit {
|
||||||
sd
|
sd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn default_dev_mode() -> Self {
|
||||||
|
Self {
|
||||||
|
fast_ppt: Some(RangeLimit {
|
||||||
|
min: Some(3_000_000),
|
||||||
|
max: Some(11_000_000),
|
||||||
|
}),
|
||||||
|
fast_ppt_default: Some(10_000_000),
|
||||||
|
slow_ppt: Some(RangeLimit {
|
||||||
|
min: Some(7_000_000),
|
||||||
|
max: Some(11_000_000),
|
||||||
|
}),
|
||||||
|
slow_ppt_default: Some(10_000_000),
|
||||||
|
ppt_divisor: Some(1_000_000),
|
||||||
|
ppt_step: Some(1),
|
||||||
|
tdp: Some(RangeLimit { min: Some(1_000_000), max: Some(100_000_000) }),
|
||||||
|
tdp_boost: Some(RangeLimit { min: Some(1_000_000), max: Some(110_000_000) }),
|
||||||
|
tdp_divisor: Some(1_000_000),
|
||||||
|
tdp_step: Some(1),
|
||||||
|
clock_min: Some(RangeLimit {
|
||||||
|
min: Some(100),
|
||||||
|
max: Some(1000),
|
||||||
|
}),
|
||||||
|
clock_max: Some(RangeLimit {
|
||||||
|
min: Some(100),
|
||||||
|
max: Some(1100),
|
||||||
|
}),
|
||||||
|
clock_step: Some(100),
|
||||||
|
memory_clock: Some(RangeLimit {
|
||||||
|
min: Some(100),
|
||||||
|
max: Some(1100),
|
||||||
|
}),
|
||||||
|
memory_clock_step: Some(100),
|
||||||
|
skip_resume_reclock: false,
|
||||||
|
experiments: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn apply_override(&mut self, limit_override: Self) {
|
pub fn apply_override(&mut self, limit_override: Self) {
|
||||||
if let Some(range) = limit_override.fast_ppt {
|
if let Some(range) = limit_override.fast_ppt {
|
||||||
if range.min.is_none() && range.max.is_none() {
|
if range.min.is_none() && range.max.is_none() {
|
||||||
|
@ -149,5 +192,6 @@ impl GenericGpuLimit {
|
||||||
self.clock_step = Some(val);
|
self.clock_step = Some(val);
|
||||||
}
|
}
|
||||||
self.skip_resume_reclock = limit_override.skip_resume_reclock;
|
self.skip_resume_reclock = limit_override.skip_resume_reclock;
|
||||||
|
self.experiments = limit_override.experiments;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,4 +17,6 @@ pub enum DriverJson {
|
||||||
#[default]
|
#[default]
|
||||||
#[serde(rename = "auto")]
|
#[serde(rename = "auto")]
|
||||||
AutoDetect,
|
AutoDetect,
|
||||||
|
#[serde(rename = "indev")]
|
||||||
|
DevMode,
|
||||||
}
|
}
|
||||||
|
|
|
@ -185,6 +185,13 @@ pub fn auto_detect0(
|
||||||
settings.version,
|
settings.version,
|
||||||
relevant_limits.cpu.limits,
|
relevant_limits.cpu.limits,
|
||||||
))
|
))
|
||||||
|
},
|
||||||
|
CpuLimitType::DevMode => {
|
||||||
|
Box::new(crate::settings::dev_mode::Cpus::from_json_and_limits(
|
||||||
|
settings.cpus.clone(),
|
||||||
|
settings.version,
|
||||||
|
relevant_limits.cpu.limits,
|
||||||
|
))
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -230,6 +237,13 @@ pub fn auto_detect0(
|
||||||
settings.version,
|
settings.version,
|
||||||
relevant_limits.gpu.limits,
|
relevant_limits.gpu.limits,
|
||||||
))
|
))
|
||||||
|
},
|
||||||
|
GpuLimitType::DevMode => {
|
||||||
|
Box::new(crate::settings::dev_mode::Gpu::from_json_and_limits(
|
||||||
|
settings.gpu.clone(),
|
||||||
|
settings.version,
|
||||||
|
relevant_limits.gpu.limits,
|
||||||
|
))
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let battery_driver: Box<dyn TBattery> = match relevant_limits.battery.provider {
|
let battery_driver: Box<dyn TBattery> = match relevant_limits.battery.provider {
|
||||||
|
@ -260,6 +274,13 @@ pub fn auto_detect0(
|
||||||
settings.version,
|
settings.version,
|
||||||
relevant_limits.battery.limits,
|
relevant_limits.battery.limits,
|
||||||
))
|
))
|
||||||
|
},
|
||||||
|
BatteryLimitType::DevMode => {
|
||||||
|
Box::new(crate::settings::dev_mode::Battery::from_json_and_limits(
|
||||||
|
settings.battery.clone(),
|
||||||
|
settings.version,
|
||||||
|
relevant_limits.battery.limits,
|
||||||
|
))
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -288,6 +309,9 @@ pub fn auto_detect0(
|
||||||
CpuLimitType::Unknown => {
|
CpuLimitType::Unknown => {
|
||||||
Box::new(crate::settings::unknown::Cpus::from_limits(relevant_limits.cpu.limits))
|
Box::new(crate::settings::unknown::Cpus::from_limits(relevant_limits.cpu.limits))
|
||||||
}
|
}
|
||||||
|
CpuLimitType::DevMode => {
|
||||||
|
Box::new(crate::settings::dev_mode::Cpus::from_limits(relevant_limits.cpu.limits))
|
||||||
|
}
|
||||||
};
|
};
|
||||||
let gpu_driver: Box<dyn TGpu> = match relevant_limits.gpu.provider {
|
let gpu_driver: Box<dyn TGpu> = match relevant_limits.gpu.provider {
|
||||||
GpuLimitType::SteamDeck => {
|
GpuLimitType::SteamDeck => {
|
||||||
|
@ -308,6 +332,9 @@ pub fn auto_detect0(
|
||||||
GpuLimitType::Unknown => {
|
GpuLimitType::Unknown => {
|
||||||
Box::new(crate::settings::unknown::Gpu::from_limits(relevant_limits.gpu.limits))
|
Box::new(crate::settings::unknown::Gpu::from_limits(relevant_limits.gpu.limits))
|
||||||
}
|
}
|
||||||
|
GpuLimitType::DevMode => {
|
||||||
|
Box::new(crate::settings::dev_mode::Gpu::from_limits(relevant_limits.gpu.limits))
|
||||||
|
}
|
||||||
};
|
};
|
||||||
let battery_driver: Box<dyn TBattery> = match relevant_limits.battery.provider {
|
let battery_driver: Box<dyn TBattery> = match relevant_limits.battery.provider {
|
||||||
BatteryLimitType::SteamDeck => {
|
BatteryLimitType::SteamDeck => {
|
||||||
|
@ -322,6 +349,9 @@ pub fn auto_detect0(
|
||||||
BatteryLimitType::Unknown => {
|
BatteryLimitType::Unknown => {
|
||||||
Box::new(crate::settings::unknown::Battery::from_limits(relevant_limits.battery.limits))
|
Box::new(crate::settings::unknown::Battery::from_limits(relevant_limits.battery.limits))
|
||||||
}
|
}
|
||||||
|
BatteryLimitType::DevMode => {
|
||||||
|
Box::new(crate::settings::dev_mode::Battery::from_limits(relevant_limits.battery.limits))
|
||||||
|
}
|
||||||
};
|
};
|
||||||
return Driver {
|
return Driver {
|
||||||
general: general_driver,
|
general: general_driver,
|
||||||
|
|
146
backend/src/settings/dev_mode/battery.rs
Normal file
146
backend/src/settings/dev_mode/battery.rs
Normal file
|
@ -0,0 +1,146 @@
|
||||||
|
use std::convert::Into;
|
||||||
|
|
||||||
|
use limits_core::json_v2::GenericBatteryLimit;
|
||||||
|
|
||||||
|
use crate::persist::BatteryJson;
|
||||||
|
use crate::settings::{TBattery, ProviderBuilder};
|
||||||
|
use crate::settings::{OnResume, OnSet, SettingError};
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Battery {
|
||||||
|
persist: BatteryJson,
|
||||||
|
version: u64,
|
||||||
|
limits: GenericBatteryLimit,
|
||||||
|
charge_limit: Option<f64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::fmt::Debug for Battery {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
f.debug_struct("dev_mode_Battery")
|
||||||
|
//.field("persist", &self.persist)
|
||||||
|
.field("version", &self.version)
|
||||||
|
.field("limits", &self.limits)
|
||||||
|
.finish_non_exhaustive()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Into<BatteryJson> for Battery {
|
||||||
|
#[inline]
|
||||||
|
fn into(self) -> BatteryJson {
|
||||||
|
self.persist
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ProviderBuilder<BatteryJson, GenericBatteryLimit> for Battery {
|
||||||
|
fn from_json_and_limits(persist: BatteryJson, version: u64, limits: GenericBatteryLimit) -> Self {
|
||||||
|
Battery {
|
||||||
|
persist,
|
||||||
|
version,
|
||||||
|
limits,
|
||||||
|
charge_limit: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn from_limits(limits: GenericBatteryLimit) -> Self {
|
||||||
|
Battery {
|
||||||
|
persist: BatteryJson { charge_rate: None, charge_mode: None, events: vec![], root: None },
|
||||||
|
version: 0,
|
||||||
|
limits,
|
||||||
|
charge_limit: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl OnSet for Battery {
|
||||||
|
fn on_set(&mut self) -> Result<(), Vec<SettingError>> {
|
||||||
|
log::debug!("dev_mode_Battery::on_set(self)");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl OnResume for Battery {
|
||||||
|
fn on_resume(&self) -> Result<(), Vec<SettingError>> {
|
||||||
|
log::debug!("dev_mode_Battery::on_resume(self)");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl crate::settings::OnPowerEvent for Battery {}
|
||||||
|
|
||||||
|
impl TBattery for Battery {
|
||||||
|
fn limits(&self) -> crate::api::BatteryLimits {
|
||||||
|
log::debug!("dev_mode_Battery::limits(self) -> {{...}}");
|
||||||
|
crate::api::BatteryLimits {
|
||||||
|
charge_current: self.limits.charge_rate.map(|lim| crate::api::RangeLimit { min: lim.min.unwrap_or(11), max: lim.max.unwrap_or(1111) }),
|
||||||
|
charge_current_step: 10,
|
||||||
|
charge_modes: self.limits.charge_modes.clone(),
|
||||||
|
charge_limit: self.limits.charge_limit.map(|lim| crate::api::RangeLimit { min: lim.min.unwrap_or(2.0), max: lim.max.unwrap_or(98.0) }),
|
||||||
|
charge_limit_step: 1.0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn json(&self) -> crate::persist::BatteryJson {
|
||||||
|
log::debug!("dev_mode_Battery::json(self) -> {{...}}");
|
||||||
|
self.clone().into()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn charge_rate(&mut self, rate: Option<u64>) {
|
||||||
|
log::debug!("dev_mode_Battery::charge_rate(self, {:?})", rate);
|
||||||
|
self.persist.charge_rate = rate;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_charge_rate(&self) -> Option<u64> {
|
||||||
|
log::debug!("dev_mode_Battery::get_charge_rate(self) -> {:?}", self.persist.charge_rate);
|
||||||
|
self.persist.charge_rate
|
||||||
|
}
|
||||||
|
|
||||||
|
fn charge_mode(&mut self, rate: Option<String>) {
|
||||||
|
log::debug!("dev_mode_Battery::charge_mode(self, {:?})", rate);
|
||||||
|
self.persist.charge_mode = rate;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_charge_mode(&self) -> Option<String> {
|
||||||
|
log::debug!("dev_mode_Battery::get_charge_mode(self) -> {:?}", self.persist.charge_mode);
|
||||||
|
self.persist.charge_mode.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_charge_full(&self) -> Option<f64> {
|
||||||
|
log::debug!("dev_mode_Battery::read_charge_full(self) -> None");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_charge_now(&self) -> Option<f64> {
|
||||||
|
log::debug!("dev_mode_Battery::read_charge_now(self) -> None");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_charge_design(&self) -> Option<f64> {
|
||||||
|
log::debug!("dev_mode_Battery::read_charge_design(self) -> None");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_current_now(&self) -> Option<f64> {
|
||||||
|
log::debug!("dev_mode_Battery::read_current_now(self) -> None");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_charge_power(&self) -> Option<f64> {
|
||||||
|
log::debug!("dev_mode_Battery::read_charge_power(self) -> None");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
fn charge_limit(&mut self, limit: Option<f64>) {
|
||||||
|
log::debug!("dev_mode_Battery::charge_limit(self, {:?})", limit);
|
||||||
|
self.charge_limit = limit;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_charge_limit(&self) -> Option<f64> {
|
||||||
|
log::debug!("dev_mode_Battery::get_charge_limit(self) -> {:?}", self.charge_limit);
|
||||||
|
self.charge_limit
|
||||||
|
}
|
||||||
|
|
||||||
|
fn provider(&self) -> crate::persist::DriverJson {
|
||||||
|
log::debug!("dev_mode_Battery::provider(self) -> DevMode");
|
||||||
|
crate::persist::DriverJson::DevMode
|
||||||
|
}
|
||||||
|
}
|
221
backend/src/settings/dev_mode/cpu.rs
Normal file
221
backend/src/settings/dev_mode/cpu.rs
Normal file
|
@ -0,0 +1,221 @@
|
||||||
|
use std::convert::Into;
|
||||||
|
|
||||||
|
use limits_core::json_v2::{GenericCpusLimit, GenericCpuLimit};
|
||||||
|
|
||||||
|
use crate::persist::CpuJson;
|
||||||
|
use crate::settings::MinMax;
|
||||||
|
use crate::settings::{OnResume, OnSet, SettingError};
|
||||||
|
use crate::settings::{TCpu, TCpus, ProviderBuilder};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct Cpus {
|
||||||
|
cpus: Vec<Cpu>,
|
||||||
|
#[allow(dead_code)]
|
||||||
|
version: u64,
|
||||||
|
smt_enabled: bool,
|
||||||
|
#[allow(dead_code)]
|
||||||
|
limits: GenericCpusLimit,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl OnSet for Cpus {
|
||||||
|
fn on_set(&mut self) -> Result<(), Vec<SettingError>> {
|
||||||
|
log::debug!("dev_mode_Cpus::on_set(self)");
|
||||||
|
for cpu in self.cpus.iter_mut() {
|
||||||
|
cpu.on_set()?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl OnResume for Cpus {
|
||||||
|
fn on_resume(&self) -> Result<(), Vec<SettingError>> {
|
||||||
|
log::debug!("dev_mode_Cpus::on_resume(self)");
|
||||||
|
for cpu in self.cpus.iter() {
|
||||||
|
cpu.on_resume()?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl crate::settings::OnPowerEvent for Cpus {}
|
||||||
|
|
||||||
|
impl ProviderBuilder<Vec<CpuJson>, GenericCpusLimit> for Cpus {
|
||||||
|
fn from_json_and_limits(persistent: Vec<CpuJson>, version: u64, limits: GenericCpusLimit) -> Self {
|
||||||
|
let mut cpus = Vec::with_capacity(persistent.len());
|
||||||
|
for (i, cpu) in persistent.iter().enumerate() {
|
||||||
|
cpus.push(Cpu::from_json_and_limits(cpu.to_owned(), version, i, limits.cpus.get(i).map(|x| x.to_owned()).unwrap_or_else(|| {
|
||||||
|
log::warn!("No cpu limit for index {}, using default", i);
|
||||||
|
Default::default()
|
||||||
|
})));
|
||||||
|
}
|
||||||
|
let smt_guess = crate::settings::util::guess_smt(&persistent);
|
||||||
|
Self {
|
||||||
|
cpus,
|
||||||
|
version,
|
||||||
|
smt_enabled: smt_guess,
|
||||||
|
limits,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn from_limits(limits: GenericCpusLimit) -> Self {
|
||||||
|
let mut cpus = Vec::with_capacity(limits.cpus.len());
|
||||||
|
for (i, cpu) in limits.cpus.iter().enumerate() {
|
||||||
|
cpus.push(Cpu::from_limits(i, cpu.to_owned()));
|
||||||
|
}
|
||||||
|
Self {
|
||||||
|
cpus,
|
||||||
|
version: 0,
|
||||||
|
smt_enabled: true,
|
||||||
|
limits,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TCpus for Cpus {
|
||||||
|
fn limits(&self) -> crate::api::CpusLimits {
|
||||||
|
log::debug!("dev_mode_Cpus::limits(self) -> {{...}}");
|
||||||
|
crate::api::CpusLimits {
|
||||||
|
cpus: self.cpus.iter().map(|x| x.limits()).collect(),
|
||||||
|
count: self.cpus.len(),
|
||||||
|
smt_capable: true,
|
||||||
|
governors: vec!["this".to_owned(), "is".to_owned(), "dev".to_owned(), "mode".to_owned()],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn json(&self) -> Vec<CpuJson> {
|
||||||
|
log::debug!("dev_mode_Cpus::json(self) -> {{...}}");
|
||||||
|
self.cpus.iter().map(|x| x.to_owned().into()).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn cpus(&mut self) -> Vec<&mut dyn TCpu> {
|
||||||
|
log::debug!("dev_mode_Cpus::cpus(self) -> {{...}}");
|
||||||
|
self.cpus.iter_mut().map(|x| x as &mut dyn TCpu).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn len(&self) -> usize {
|
||||||
|
log::debug!("dev_mode_Cpus::len(self) -> {}", self.cpus.len());
|
||||||
|
self.cpus.len()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn smt(&mut self) -> &'_ mut bool {
|
||||||
|
log::debug!("dev_mode_Cpus::smt(self) -> {}", self.smt_enabled);
|
||||||
|
&mut self.smt_enabled
|
||||||
|
}
|
||||||
|
|
||||||
|
fn provider(&self) -> crate::persist::DriverJson {
|
||||||
|
log::debug!("dev_mode_Cpus::provider(self) -> DevMode");
|
||||||
|
crate::persist::DriverJson::DevMode
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Cpu {
|
||||||
|
persist: CpuJson,
|
||||||
|
version: u64,
|
||||||
|
index: usize,
|
||||||
|
limits: GenericCpuLimit,
|
||||||
|
clock_limits: Option<MinMax<u64>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::fmt::Debug for Cpu {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
f.debug_struct("dev_mode_Cpu")
|
||||||
|
//.field("persist", &self.persist)
|
||||||
|
.field("version", &self.version)
|
||||||
|
.field("index", &self.index)
|
||||||
|
.field("limits", &self.limits)
|
||||||
|
.finish_non_exhaustive()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Cpu {
|
||||||
|
#[inline]
|
||||||
|
pub fn from_json_and_limits(other: CpuJson, version: u64, i: usize, limits: GenericCpuLimit) -> Self {
|
||||||
|
let clock_limits = other.clock_limits.clone().map(|lim| MinMax { min: lim.min, max: lim.max });
|
||||||
|
match version {
|
||||||
|
0 => Self {
|
||||||
|
persist: other,
|
||||||
|
version,
|
||||||
|
index: i,
|
||||||
|
limits,
|
||||||
|
clock_limits,
|
||||||
|
},
|
||||||
|
_ => Self {
|
||||||
|
persist: other,
|
||||||
|
version,
|
||||||
|
index: i,
|
||||||
|
limits,
|
||||||
|
clock_limits,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
pub fn from_limits(i: usize, limits: GenericCpuLimit) -> Self {
|
||||||
|
Self {
|
||||||
|
persist: CpuJson { online: true, clock_limits: None, governor: "".to_owned(), root: None },
|
||||||
|
version: 0,
|
||||||
|
index: i,
|
||||||
|
limits,
|
||||||
|
clock_limits: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn limits(&self) -> crate::api::CpuLimits {
|
||||||
|
crate::api::CpuLimits {
|
||||||
|
clock_min_limits: self.limits.clock_min.map(|lim| crate::api::RangeLimit { min: lim.min.unwrap_or(1100), max: lim.max.unwrap_or(6900) }),
|
||||||
|
clock_max_limits: self.limits.clock_max.map(|lim| crate::api::RangeLimit { min: lim.min.unwrap_or(4200), max: lim.max.unwrap_or(4300) }),
|
||||||
|
clock_step: self.limits.clock_step.unwrap_or(11),
|
||||||
|
governors: vec!["this".to_owned(), "is".to_owned(), "dev".to_owned(), "mode".to_owned()],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Into<CpuJson> for Cpu {
|
||||||
|
#[inline]
|
||||||
|
fn into(self) -> CpuJson {
|
||||||
|
self.persist
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl OnSet for Cpu {
|
||||||
|
fn on_set(&mut self) -> Result<(), Vec<SettingError>> {
|
||||||
|
log::debug!("dev_mode_Cpu::on_set(self)");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl OnResume for Cpu {
|
||||||
|
fn on_resume(&self) -> Result<(), Vec<SettingError>> {
|
||||||
|
log::debug!("dev_mode_Cpu::on_resume(self)");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TCpu for Cpu {
|
||||||
|
fn online(&mut self) -> &mut bool {
|
||||||
|
log::debug!("dev_mode_Cpu::online(self) -> {}", self.persist.online);
|
||||||
|
&mut self.persist.online
|
||||||
|
}
|
||||||
|
|
||||||
|
fn governor(&mut self, governor: String) {
|
||||||
|
log::debug!("dev_mode_Cpu::governor(self, {})", governor);
|
||||||
|
self.persist.governor = governor;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_governor(&self) -> &'_ str {
|
||||||
|
log::debug!("dev_mode_Cpu::governor(self) -> {}", self.persist.governor);
|
||||||
|
&self.persist.governor
|
||||||
|
}
|
||||||
|
|
||||||
|
fn clock_limits(&mut self, limits: Option<MinMax<u64>>) {
|
||||||
|
log::debug!("dev_mode_Cpu::clock_limits(self, {:?})", limits);
|
||||||
|
self.clock_limits = limits;
|
||||||
|
self.persist.clock_limits = self.clock_limits.clone().map(|lim| crate::persist::MinMaxJson { max: lim.max, min: lim.min });
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_clock_limits(&self) -> Option<&MinMax<u64>> {
|
||||||
|
log::debug!("dev_mode_Cpu::get_clock_limits(self) -> {:?}", self.clock_limits.as_ref());
|
||||||
|
self.clock_limits.as_ref()
|
||||||
|
}
|
||||||
|
}
|
141
backend/src/settings/dev_mode/gpu.rs
Normal file
141
backend/src/settings/dev_mode/gpu.rs
Normal file
|
@ -0,0 +1,141 @@
|
||||||
|
use std::convert::Into;
|
||||||
|
|
||||||
|
use limits_core::json_v2::GenericGpuLimit;
|
||||||
|
|
||||||
|
use crate::persist::GpuJson;
|
||||||
|
use crate::settings::MinMax;
|
||||||
|
use crate::settings::{TGpu, ProviderBuilder};
|
||||||
|
use crate::settings::{OnResume, OnSet, SettingError};
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Gpu {
|
||||||
|
persist: GpuJson,
|
||||||
|
version: u64,
|
||||||
|
limits: GenericGpuLimit,
|
||||||
|
clock_limits: Option<MinMax<u64>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::fmt::Debug for Gpu {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
f.debug_struct("dev_mode_Gpu")
|
||||||
|
//.field("persist", &self.persist)
|
||||||
|
.field("version", &self.version)
|
||||||
|
.field("limits", &self.limits)
|
||||||
|
.finish_non_exhaustive()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ProviderBuilder<GpuJson, GenericGpuLimit> for Gpu {
|
||||||
|
fn from_json_and_limits(persist: GpuJson, version: u64, limits: GenericGpuLimit) -> Self {
|
||||||
|
let clock_limits = persist.clock_limits.clone().map(|lim| MinMax { min: lim.min, max: lim.max });
|
||||||
|
Self {
|
||||||
|
persist,
|
||||||
|
version,
|
||||||
|
limits,
|
||||||
|
clock_limits,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn from_limits(limits: GenericGpuLimit) -> Self {
|
||||||
|
Self {
|
||||||
|
persist: GpuJson {
|
||||||
|
fast_ppt: None,
|
||||||
|
slow_ppt: None,
|
||||||
|
tdp: None,
|
||||||
|
tdp_boost: None,
|
||||||
|
clock_limits: None,
|
||||||
|
memory_clock: None,
|
||||||
|
root: None,
|
||||||
|
},
|
||||||
|
version: 0,
|
||||||
|
limits,
|
||||||
|
clock_limits: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Into<GpuJson> for Gpu {
|
||||||
|
#[inline]
|
||||||
|
fn into(self) -> GpuJson {
|
||||||
|
self.persist
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl OnSet for Gpu {
|
||||||
|
fn on_set(&mut self) -> Result<(), Vec<SettingError>> {
|
||||||
|
log::debug!("dev_mode_Gpu::on_set(self)");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl OnResume for Gpu {
|
||||||
|
fn on_resume(&self) -> Result<(), Vec<SettingError>> {
|
||||||
|
log::debug!("dev_mode_Gpu::on_resume(self)");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl crate::settings::OnPowerEvent for Gpu {}
|
||||||
|
|
||||||
|
impl TGpu for Gpu {
|
||||||
|
fn limits(&self) -> crate::api::GpuLimits {
|
||||||
|
log::debug!("dev_mode_Gpu::limits(self) -> {{...}}");
|
||||||
|
let ppt_divisor = self.limits.ppt_divisor.unwrap_or(1_000_000);
|
||||||
|
let tdp_divisor = self.limits.tdp_divisor.unwrap_or(1_000_000);
|
||||||
|
crate::api::GpuLimits {
|
||||||
|
fast_ppt_limits: self.limits.fast_ppt.map(|lim| crate::api::RangeLimit { min: lim.min.unwrap_or(11_000_000) / ppt_divisor, max: lim.max.unwrap_or(42_000_000) / ppt_divisor }),
|
||||||
|
slow_ppt_limits: self.limits.slow_ppt.map(|lim| crate::api::RangeLimit { min: lim.min.unwrap_or(7_000_000) / ppt_divisor, max: lim.max.unwrap_or(69_000_000) / ppt_divisor }),
|
||||||
|
ppt_step: self.limits.ppt_step.unwrap_or(1),
|
||||||
|
tdp_limits: self.limits.tdp.map(|lim| crate::api::RangeLimit { min: lim.min.unwrap_or(11_000_000) / tdp_divisor, max: lim.max.unwrap_or(69_000_000) / tdp_divisor }),
|
||||||
|
tdp_boost_limits: self.limits.tdp_boost.map(|lim| crate::api::RangeLimit { min: lim.min.unwrap_or(7_000_000) / tdp_divisor, max: lim.max.unwrap_or(69_000_000) / tdp_divisor }),
|
||||||
|
tdp_step: self.limits.tdp_step.unwrap_or(1),
|
||||||
|
clock_min_limits: self.limits.clock_min.map(|lim| crate::api::RangeLimit { min: lim.min.unwrap_or(1100), max: lim.max.unwrap_or(6900) }),
|
||||||
|
clock_max_limits: self.limits.clock_max.map(|lim| crate::api::RangeLimit { min: lim.min.unwrap_or(1100), max: lim.max.unwrap_or(4200) }),
|
||||||
|
clock_step: self.limits.clock_step.unwrap_or(100),
|
||||||
|
memory_control: self.limits.memory_clock.map(|lim| crate::api::RangeLimit { min: lim.min.unwrap_or(100), max: lim.max.unwrap_or(1100) }),
|
||||||
|
memory_step: self.limits.memory_clock_step.unwrap_or(400),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn json(&self) -> crate::persist::GpuJson {
|
||||||
|
log::debug!("dev_mode_Gpu::json(self) -> {{...}}");
|
||||||
|
self.clone().into()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ppt(&mut self, fast: Option<u64>, slow: Option<u64>) {
|
||||||
|
log::debug!("dev_mode_Gpu::ppt(self, fast: {:?}, slow: {:?})", fast, slow);
|
||||||
|
self.persist.fast_ppt = fast;
|
||||||
|
self.persist.slow_ppt = slow;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_ppt(&self) -> (Option<u64>, Option<u64>) {
|
||||||
|
log::debug!("dev_mode_Gpu::get_ppt(self) -> (fast: {:?}, slow: {:?})", self.persist.fast_ppt, self.persist.slow_ppt);
|
||||||
|
(self.persist.fast_ppt, self.persist.slow_ppt)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn clock_limits(&mut self, limits: Option<MinMax<u64>>) {
|
||||||
|
log::debug!("dev_mode_Gpu::clock_limits(self, {:?})", limits);
|
||||||
|
self.clock_limits = limits;
|
||||||
|
self.persist.clock_limits = self.clock_limits.clone().map(|lim| crate::persist::MinMaxJson { max: lim.max, min: lim.min });
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_clock_limits(&self) -> Option<&MinMax<u64>> {
|
||||||
|
log::debug!("dev_mode_Gpu::get_clock_limits(self) -> {:?}", self.clock_limits.as_ref());
|
||||||
|
self.clock_limits.as_ref()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn memory_clock(&mut self, speed: Option<u64>) {
|
||||||
|
log::debug!("dev_mode_Gpu::memory_clock(self, {:?})", speed);
|
||||||
|
self.persist.memory_clock = speed;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_memory_clock(&self) -> Option<u64> {
|
||||||
|
log::debug!("dev_mode_Gpu::memory_clock(self) -> {:?}", self.persist.memory_clock);
|
||||||
|
self.persist.memory_clock
|
||||||
|
}
|
||||||
|
|
||||||
|
fn provider(&self) -> crate::persist::DriverJson {
|
||||||
|
log::debug!("dev_mode_Gpu::provider(self) -> DevMode");
|
||||||
|
crate::persist::DriverJson::DevMode
|
||||||
|
}
|
||||||
|
}
|
15
backend/src/settings/dev_mode/mod.rs
Normal file
15
backend/src/settings/dev_mode/mod.rs
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
mod battery;
|
||||||
|
mod cpu;
|
||||||
|
mod gpu;
|
||||||
|
|
||||||
|
pub use battery::Battery;
|
||||||
|
pub use cpu::Cpus;
|
||||||
|
pub use gpu::Gpu;
|
||||||
|
|
||||||
|
fn _impl_checker() {
|
||||||
|
fn impl_provider_builder<T: crate::settings::ProviderBuilder<J, L>, J, L>() {}
|
||||||
|
|
||||||
|
impl_provider_builder::<Battery, crate::persist::BatteryJson, limits_core::json_v2::GenericBatteryLimit>();
|
||||||
|
impl_provider_builder::<Cpus, Vec<crate::persist::CpuJson>, limits_core::json_v2::GenericCpusLimit>();
|
||||||
|
impl_provider_builder::<Gpu, crate::persist::GpuJson, limits_core::json_v2::GenericGpuLimit>();
|
||||||
|
}
|
|
@ -37,5 +37,6 @@ pub fn maybe_do_button() {
|
||||||
}
|
}
|
||||||
DriverJson::Unknown => log::warn!("Can't do button activities on unknown platform"),
|
DriverJson::Unknown => log::warn!("Can't do button activities on unknown platform"),
|
||||||
DriverJson::AutoDetect => log::warn!("WTF, why is auto_detect detecting AutoDetect???"),
|
DriverJson::AutoDetect => log::warn!("WTF, why is auto_detect detecting AutoDetect???"),
|
||||||
|
DriverJson::DevMode => log::error!("Hello dev world!"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ pub mod generic;
|
||||||
pub mod generic_amd;
|
pub mod generic_amd;
|
||||||
pub mod steam_deck;
|
pub mod steam_deck;
|
||||||
pub mod unknown;
|
pub mod unknown;
|
||||||
|
pub mod dev_mode;
|
||||||
|
|
||||||
pub use detect::{auto_detect0, auto_detect_provider, limits_worker::spawn as limits_worker_spawn, get_dev_messages};
|
pub use detect::{auto_detect0, auto_detect_provider, limits_worker::spawn as limits_worker_spawn, get_dev_messages};
|
||||||
pub use driver::Driver;
|
pub use driver::Driver;
|
||||||
|
@ -23,7 +24,7 @@ pub use traits::{OnPowerEvent, OnResume, OnSet, PowerMode, TBattery, TCpu, TCpus
|
||||||
mod tests {
|
mod tests {
|
||||||
#[test]
|
#[test]
|
||||||
fn system_defaults_test() {
|
fn system_defaults_test() {
|
||||||
let settings = super::Settings::system_default("idc".into(), "Cool name".into(), 0, "Variant 0".into());
|
let settings = super::Settings::system_default("idc".into(), 0, "Cool name".into(), 0, "Variant 0".into());
|
||||||
println!("Loaded system settings: {:?}", settings);
|
println!("Loaded system settings: {:?}", settings);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue