diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fc38424..cd203023 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 + usbraw - Refactor how ROGCC handles IPC for background open, run-in-bg - Refactor daemon task creation to be simpler (for development) +- Rename dpu_only to gpu_mux. Update all related messages and info. ### Breaking - DBUS: rename path `/org/asuslinux/RogBios` to `/org/asuslinux/Platform` - DBUS: renamed `dedicated_graphic_mode` to `gpu_mux_mode` (`GpuMuxMode`) diff --git a/MANUAL.md b/MANUAL.md index 963ab906..385ea06f 100644 --- a/MANUAL.md +++ b/MANUAL.md @@ -91,7 +91,7 @@ where the number is a percentage. Some options that you find in Armory Crate are available under this controller, so far there is: - POST sound: this is the sound you hear on bios boot post -- G-Sync: this controls if the dGPU (Nvidia) is the *only* GPU, making it the main GPU and disabling the iGPU +- GPU MUX: this controls if the dGPU is the *only* GPU, making it the main GPU and disabling the iGPU These options are not written to the config file as they are stored in efivars. The only way to change these is to use the exposed safe dbus methods, or use the `asusctl` CLI tool. diff --git a/asusctl/src/main.rs b/asusctl/src/main.rs index a00153b1..9e3f13d3 100644 --- a/asusctl/src/main.rs +++ b/asusctl/src/main.rs @@ -771,7 +771,7 @@ fn handle_bios_option( for line in usage.iter().filter(|line| { line.contains("sound") && supported.post_sound - || line.contains("GPU") && supported.dgpu_only + || line.contains("GPU") && supported.gpu_mux || line.contains("panel") && supported.panel_overdrive }) { println!("{}", line); diff --git a/daemon/src/ctrl_platform.rs b/daemon/src/ctrl_platform.rs index 794993b9..fa3e251d 100644 --- a/daemon/src/ctrl_platform.rs +++ b/daemon/src/ctrl_platform.rs @@ -30,18 +30,18 @@ impl GetSupported for CtrlRogBios { let mut panel_overdrive = false; let mut dgpu_disable = false; let mut egpu_enable = false; - let mut dgpu_only = false; + let mut gpu_mux = false; if let Ok(platform) = AsusPlatform::new() { panel_overdrive = platform.has_panel_od(); dgpu_disable = platform.has_dgpu_disable(); egpu_enable = platform.has_egpu_enable(); - dgpu_only = platform.has_gpu_mux_mode(); + gpu_mux = platform.has_gpu_mux_mode(); } RogBiosSupportedFunctions { post_sound: Path::new(ASUS_POST_LOGO_SOUND).exists(), - dgpu_only, + gpu_mux, panel_overdrive, dgpu_disable, egpu_enable, @@ -54,8 +54,8 @@ impl CtrlRogBios { let platform = AsusPlatform::new()?; if !platform.has_gpu_mux_mode() { - info!("G-Sync Switchable Graphics not detected"); - info!("If your laptop is not a G-Sync enabled laptop then you can ignore this. Standard graphics switching will still work."); + info!("G-Sync Switchable Graphics or GPU MUX not detected"); + info!("Standard graphics switching will still work."); } if Path::new(ASUS_POST_LOGO_SOUND).exists() { diff --git a/rog-control-center/src/page_states.rs b/rog-control-center/src/page_states.rs index 970ae519..773bf77e 100644 --- a/rog-control-center/src/page_states.rs +++ b/rog-control-center/src/page_states.rs @@ -39,7 +39,7 @@ impl BiosState { } else { false }, - dedicated_gfx: if supported.rog_bios_ctrl.dgpu_only { + dedicated_gfx: if supported.rog_bios_ctrl.gpu_mux { dbus.proxies().rog_bios().gpu_mux_mode()? } else { GpuMode::NotSupported diff --git a/rog-control-center/src/widgets/rog_bios.rs b/rog-control-center/src/widgets/rog_bios.rs index 8da4173a..82cc0398 100644 --- a/rog-control-center/src/widgets/rog_bios.rs +++ b/rog-control-center/src/widgets/rog_bios.rs @@ -90,7 +90,7 @@ pub fn rog_bios_group( } } - if supported.rog_bios_ctrl.dgpu_only { + if supported.rog_bios_ctrl.gpu_mux { let mut changed = false; ui.group(|ui| { ui.vertical(|ui| { diff --git a/rog-platform/src/platform.rs b/rog-platform/src/platform.rs index 62b13525..45c5432c 100644 --- a/rog-platform/src/platform.rs +++ b/rog-platform/src/platform.rs @@ -14,7 +14,7 @@ use crate::{ /// - dgpu_disable /// - egpu_enable /// - panel_od -/// - dgpu_only +/// - gpu_mux /// - keyboard_mode, set keyboard RGB mode and speed /// - keyboard_state, set keyboard power states #[derive(Debug, PartialEq, PartialOrd, Clone)] diff --git a/rog-platform/src/power.rs b/rog-platform/src/power.rs index fb7735b6..783ced85 100644 --- a/rog-platform/src/power.rs +++ b/rog-platform/src/power.rs @@ -12,7 +12,7 @@ use crate::{ /// - dgpu_disable /// - egpu_enable /// - panel_od -/// - dgpu_only +/// - gpu_mux /// - keyboard_mode, set keyboard RGB mode and speed /// - keyboard_state, set keyboard power states #[derive(Debug, PartialEq, PartialOrd, Clone)] diff --git a/rog-platform/src/supported.rs b/rog-platform/src/supported.rs index 161fdc64..eee45d62 100644 --- a/rog-platform/src/supported.rs +++ b/rog-platform/src/supported.rs @@ -38,7 +38,7 @@ pub struct LedSupportedFunctions { #[derive(Serialize, Deserialize, Type, Debug, Default, Clone)] pub struct RogBiosSupportedFunctions { pub post_sound: bool, - pub dgpu_only: bool, + pub gpu_mux: bool, pub panel_overdrive: bool, pub dgpu_disable: bool, pub egpu_enable: bool, @@ -93,7 +93,7 @@ impl fmt::Display for RogBiosSupportedFunctions { writeln!(f, "\tPanel Overdrive: {}", self.panel_overdrive)?; writeln!(f, "\tdGPU disable switch: {}", self.dgpu_disable)?; writeln!(f, "\teGPU enable switch: {}", self.egpu_enable)?; - writeln!(f, "\tDedicated GFX switch: {}", self.dgpu_only)?; + writeln!(f, "\tGPU MUX control: {}", self.gpu_mux)?; Ok(()) } }