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

Remove dangerous use of ppt* in platform, add use of ppt_pl3_fppt in asus_armoury handler

Browse Source
This commit is contained in:
Luke D. Jones
2025-01-13 23:10:37 +13:00
parent be51a1ab77
commit a790d9a499
6 changed files with 53 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
rog-platform/src/firmware_attributes.rs
View File

@@ -238,25 +238,26 @@ pub enum FirmwareAttribute {
CoresEfficiency = 2,
PptPl1Spl = 3,
PptPl2Sppt = 4,
PptApuSppt = 5,
PptPlatformSppt = 6,
PptFppt = 7,
NvDynamicBoost = 8,
NvTempTarget = 9,
DgpuBaseTgp = 10,
DgpuTgp = 11,
ChargeMode = 12,
BootSound = 13,
McuPowersave = 14,
PanelOverdrive = 15,
PanelHdMode = 16,
EgpuConnected = 17,
EgpuEnable = 18,
DgpuDisable = 19,
GpuMuxMode = 20,
MiniLedMode = 21,
PendingReboot = 22,
None = 23
PptPl3Fppt = 5,
PptFppt = 6,
PptApuSppt = 7,
PptPlatformSppt = 8,
NvDynamicBoost = 9,
NvTempTarget = 10,
DgpuBaseTgp = 11,
DgpuTgp = 12,
ChargeMode = 13,
BootSound = 14,
McuPowersave = 15,
PanelOverdrive = 16,
PanelHdMode = 17,
EgpuConnected = 18,
EgpuEnable = 19,
DgpuDisable = 20,
GpuMuxMode = 21,
MiniLedMode = 22,
PendingReboot = 23,
None = 24
}
impl From<&str> for FirmwareAttribute {
@@ -267,9 +268,10 @@ impl From<&str> for FirmwareAttribute {
"cores_efficiency" => Self::CoresEfficiency,
"ppt_pl1_spl" => Self::PptPl1Spl,
"ppt_pl2_sppt" => Self::PptPl2Sppt,
"ppt_pl3_fppt" => Self::PptPl3Fppt,
"ppt_fppt" => Self::PptFppt,
"ppt_apu_sppt" => Self::PptApuSppt,
"ppt_platform_sppt" => Self::PptPlatformSppt,
"ppt_fppt" => Self::PptFppt,
"nv_dynamic_boost" => Self::NvDynamicBoost,
"nv_temp_target" => Self::NvTempTarget,
"dgpu_base_tgp" => Self::DgpuBaseTgp,
@@ -298,9 +300,10 @@ impl From<FirmwareAttribute> for &str {
FirmwareAttribute::CoresEfficiency => "cores_efficiency",
FirmwareAttribute::PptPl1Spl => "ppt_pl1_spl",
FirmwareAttribute::PptPl2Sppt => "ppt_pl2_sppt",
FirmwareAttribute::PptPl3Fppt => "ppt_pl3_fppt",
FirmwareAttribute::PptFppt => "ppt_fppt",
FirmwareAttribute::PptApuSppt => "ppt_apu_sppt",
FirmwareAttribute::PptPlatformSppt => "ppt_platform_sppt",
FirmwareAttribute::PptFppt => "ppt_fppt",
FirmwareAttribute::NvDynamicBoost => "nv_dynamic_boost",
FirmwareAttribute::NvTempTarget => "nv_temp_target",
FirmwareAttribute::DgpuBaseTgp => "dgpu_base_tgp",

60
rog-platform/src/platform.rs
View File

@@ -47,57 +47,6 @@ impl RogPlatform {
pp_path
);
attr_u8!(
/// Package Power Target total of CPU: PL1 on Intel, SPL on AMD.
/// Shown on Intel+Nvidia or AMD+Nvidia based systems:
/// * min=5, max=250
"ppt_pl1_spl",
path
);
attr_u8!(
/// Slow Package Power Tracking Limit of CPU: PL2 on Intel, SPPT,
/// on AMD. Shown on Intel+Nvidia or AMD+Nvidia based systems:
/// * min=5, max=250
"ppt_pl2_sppt",
path
);
attr_u8!(
/// Fast Package Power Tracking Limit of CPU. AMD+Nvidia only:
/// * min=5, max=250
"ppt_fppt",
path
);
attr_u8!(
/// APU SPPT limit. Shown on full AMD systems only:
/// * min=5, max=130
"ppt_apu_sppt",
path
);
attr_u8!(
/// Platform SPPT limit. Shown on full AMD systems only:
/// * min=5, max=130
"ppt_platform_sppt",
path
);
attr_u8!(
/// Dynamic boost limit of the Nvidia dGPU:
/// * min=5, max=25
"nv_dynamic_boost",
path
);
attr_u8!(
/// Target temperature limit of the Nvidia dGPU:
/// * min=75, max=87
"nv_temp_target",
path
);
attr_bool!(
/// Control the POST animation "FWOOoosh" sound
"boot_sound",
@@ -364,12 +313,5 @@ pub enum Properties {
PanelOd,
MiniLedMode,
EgpuEnable,
ThrottlePolicy,
PptPl1Spl,
PptPl2Sppt,
PptFppt,
PptApuSppt,
PptPlatformSppt,
NvDynamicBoost,
NvTempTarget
ThrottlePolicy
}