gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure thermal policy is set on resume and relaod

Browse Source
This commit is contained in:
Luke D. Jones
2023-12-05 19:22:17 +13:00
parent 993131d0a9
commit 5c8bb6e6ea
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
asusd/src/ctrl_platform.rs
View File

@@ -179,6 +179,20 @@ impl CtrlPlatform {
} }
} }
} }
async fn update_policy_ac_or_bat(&self, power_plugged: bool) {
let profile = if power_plugged {
self.config.lock().await.platform_policy_on_ac
} else {
self.config.lock().await.platform_policy_on_battery
};
self.platform
.set_throttle_thermal_policy(profile.into())
.ok();
if let Some(cpu) = self.cpu_control.as_ref() {
cpu.set_epp(profile.into()).ok();
}
}
} }
#[dbus_interface(name = "org.asuslinux.Daemon")] #[dbus_interface(name = "org.asuslinux.Daemon")]
@@ -508,21 +522,10 @@ impl crate::Reloadable for CtrlPlatform {
)?; )?;
} }
if self.platform.has_throttle_thermal_policy() {
if let Ok(ac) = self.power.get_online() {
let profile = if ac == 1 {
self.config.lock().await.platform_policy_on_ac
} else {
self.config.lock().await.platform_policy_on_battery
};
self.platform.set_throttle_thermal_policy(profile.into())?;
if let Some(cpu) = self.cpu_control.as_ref() {
cpu.set_epp(profile.into())?;
}
}
}
if let Ok(power_plugged) = self.power.get_online() { if let Ok(power_plugged) = self.power.get_online() {
if self.platform.has_throttle_thermal_policy() {
self.update_policy_ac_or_bat(power_plugged > 0).await;
}
self.run_ac_or_bat_cmd(power_plugged > 0).await; self.run_ac_or_bat_cmd(power_plugged > 0).await;
} }
@@ -600,6 +603,14 @@ impl CtrlTask for CtrlPlatform {
) )
.ok(); .ok();
} }
if let Ok(power_plugged) = platform1.power.get_online() {
if !sleeping && platform1.platform.has_throttle_thermal_policy() {
platform1.update_policy_ac_or_bat(power_plugged > 0).await;
}
if !sleeping {
platform1.run_ac_or_bat_cmd(power_plugged > 0).await;
}
}
} }
}, },
move |shutting_down| { move |shutting_down| {
@@ -624,23 +635,12 @@ impl CtrlTask for CtrlPlatform {
async move {} async move {}
}, },
move |power_plugged| { move |power_plugged| {
let mut platform3 = platform3.clone(); let platform3 = platform3.clone();
// power change // power change
async move { async move {
let policy = if power_plugged { if platform3.platform.has_throttle_thermal_policy() {
platform3.config.lock().await.platform_policy_on_ac platform3.update_policy_ac_or_bat(power_plugged).await;
} else { }
platform3.config.lock().await.platform_policy_on_battery
};
platform3
.set_throttle_thermal_policy(policy)
.await
.map_err(|err| {
warn!("RogPlatform: throttle_thermal_policy {}", err);
FdoErr::Failed(format!("RogPlatform: throttle_thermal_policy: {err}"))
})
.ok();
platform3.run_ac_or_bat_cmd(power_plugged).await; platform3.run_ac_or_bat_cmd(power_plugged).await;
} }
}, },