| Message ID | 20250113-platform_profile-v4-3-23be0dff19f1@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | platform/x86 acer-wmi: Improve platform profile handling | expand |
On Mon, Jan 13, 2025 at 06:44:11PM +0530, Hridesh MG wrote: > Make use of platform_profile_cycle() to simplify the logic used for > cycling through the different platform profiles. Also remove the > unnecessary handling for AC power, as the hardware accepts different > profiles regardless of whether AC is plugged in. > > Link: https://lore.kernel.org/platform-driver-x86/20e3ac66-b040-49a9-ab00-0adcfdaed2ff@gmx.de/ > Signed-off-by: Hridesh MG <hridesh699@gmail.com> Reviewed-by: Kurt Borja <kuurtb@gmail.com> > --- > drivers/platform/x86/acer-wmi.c | 78 ++++++++++------------------------------- > 1 file changed, 19 insertions(+), 59 deletions(-) > > diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c > index f662e3740408f70e1e921a90fe75ce441fd239d0..88416c37eca0af2099b0c8d91b38912a4e5d108f 100644 > --- a/drivers/platform/x86/acer-wmi.c > +++ b/drivers/platform/x86/acer-wmi.c > @@ -2028,76 +2028,36 @@ static int acer_platform_profile_setup(struct platform_device *device) > static int acer_thermal_profile_change(void) > { > /* > - * This mode key can rotate each mode or toggle turbo mode. > - * On battery, only ECO and BALANCED mode are available. > + * This mode key will either cycle through each mode or toggle the turbo profile. > */ > if (quirks->predator_v4) { > u8 current_tp; > - int tp, err; > - u64 on_AC; > + int err, tp; > > - err = WMID_gaming_get_misc_setting(ACER_WMID_MISC_SETTING_PLATFORM_PROFILE, > - ¤t_tp); > - if (err) > - return err; > - > - /* Check power source */ > - err = WMID_gaming_get_sys_info(ACER_WMID_CMD_GET_PREDATOR_V4_BAT_STATUS, &on_AC); > - if (err < 0) > - return err; > + if (cycle_gaming_thermal_profile) { > + platform_profile_cycle(); > + } else { > + err = WMID_gaming_get_misc_setting( > + ACER_WMID_MISC_SETTING_PLATFORM_PROFILE, ¤t_tp); > + if (err) > + return err; > > - switch (current_tp) { > - case ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO: > - if (!on_AC) > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED; > - else if (cycle_gaming_thermal_profile) > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_ECO; > - else > + if (current_tp == ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO) > tp = last_non_turbo_profile; > - break; > - case ACER_PREDATOR_V4_THERMAL_PROFILE_PERFORMANCE: > - if (!on_AC) > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED; > - else > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO; > - break; > - case ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED: > - if (!on_AC) > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_ECO; > - else if (cycle_gaming_thermal_profile) > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_PERFORMANCE; > - else > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO; > - break; > - case ACER_PREDATOR_V4_THERMAL_PROFILE_QUIET: > - if (!on_AC) > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED; > - else if (cycle_gaming_thermal_profile) > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED; > - else > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO; > - break; > - case ACER_PREDATOR_V4_THERMAL_PROFILE_ECO: > - if (!on_AC) > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED; > - else if (cycle_gaming_thermal_profile) > - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_QUIET; > else > tp = ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO; > - break; > - default: > - return -EOPNOTSUPP; > - } > > - err = WMID_gaming_set_misc_setting(ACER_WMID_MISC_SETTING_PLATFORM_PROFILE, tp); > - if (err) > - return err; > + err = WMID_gaming_set_misc_setting( > + ACER_WMID_MISC_SETTING_PLATFORM_PROFILE, tp); > + if (err) > + return err; > > - /* Store non-turbo profile for turbo mode toggle*/ > - if (tp != ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO) > - last_non_turbo_profile = tp; > + /* Store last profile for toggle */ > + if (current_tp != ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO) > + last_non_turbo_profile = current_tp; > > - platform_profile_notify(&platform_profile_handler); > + platform_profile_notify(&platform_profile_handler); > + } > } > > return 0; > > -- > 2.47.1 >
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index f662e3740408f70e1e921a90fe75ce441fd239d0..88416c37eca0af2099b0c8d91b38912a4e5d108f 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -2028,76 +2028,36 @@ static int acer_platform_profile_setup(struct platform_device *device) static int acer_thermal_profile_change(void) { /* - * This mode key can rotate each mode or toggle turbo mode. - * On battery, only ECO and BALANCED mode are available. + * This mode key will either cycle through each mode or toggle the turbo profile. */ if (quirks->predator_v4) { u8 current_tp; - int tp, err; - u64 on_AC; + int err, tp; - err = WMID_gaming_get_misc_setting(ACER_WMID_MISC_SETTING_PLATFORM_PROFILE, - ¤t_tp); - if (err) - return err; - - /* Check power source */ - err = WMID_gaming_get_sys_info(ACER_WMID_CMD_GET_PREDATOR_V4_BAT_STATUS, &on_AC); - if (err < 0) - return err; + if (cycle_gaming_thermal_profile) { + platform_profile_cycle(); + } else { + err = WMID_gaming_get_misc_setting( + ACER_WMID_MISC_SETTING_PLATFORM_PROFILE, ¤t_tp); + if (err) + return err; - switch (current_tp) { - case ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO: - if (!on_AC) - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED; - else if (cycle_gaming_thermal_profile) - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_ECO; - else + if (current_tp == ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO) tp = last_non_turbo_profile; - break; - case ACER_PREDATOR_V4_THERMAL_PROFILE_PERFORMANCE: - if (!on_AC) - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED; - else - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO; - break; - case ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED: - if (!on_AC) - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_ECO; - else if (cycle_gaming_thermal_profile) - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_PERFORMANCE; - else - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO; - break; - case ACER_PREDATOR_V4_THERMAL_PROFILE_QUIET: - if (!on_AC) - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED; - else if (cycle_gaming_thermal_profile) - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED; - else - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO; - break; - case ACER_PREDATOR_V4_THERMAL_PROFILE_ECO: - if (!on_AC) - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED; - else if (cycle_gaming_thermal_profile) - tp = ACER_PREDATOR_V4_THERMAL_PROFILE_QUIET; else tp = ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO; - break; - default: - return -EOPNOTSUPP; - } - err = WMID_gaming_set_misc_setting(ACER_WMID_MISC_SETTING_PLATFORM_PROFILE, tp); - if (err) - return err; + err = WMID_gaming_set_misc_setting( + ACER_WMID_MISC_SETTING_PLATFORM_PROFILE, tp); + if (err) + return err; - /* Store non-turbo profile for turbo mode toggle*/ - if (tp != ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO) - last_non_turbo_profile = tp; + /* Store last profile for toggle */ + if (current_tp != ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO) + last_non_turbo_profile = current_tp; - platform_profile_notify(&platform_profile_handler); + platform_profile_notify(&platform_profile_handler); + } } return 0;
Make use of platform_profile_cycle() to simplify the logic used for cycling through the different platform profiles. Also remove the unnecessary handling for AC power, as the hardware accepts different profiles regardless of whether AC is plugged in. Link: https://lore.kernel.org/platform-driver-x86/20e3ac66-b040-49a9-ab00-0adcfdaed2ff@gmx.de/ Signed-off-by: Hridesh MG <hridesh699@gmail.com> --- drivers/platform/x86/acer-wmi.c | 78 ++++++++++------------------------------- 1 file changed, 19 insertions(+), 59 deletions(-)