Commit 601eb4c8 authored by Luke D. Jones's avatar Luke D. Jones Committed by Hans de Goede
Browse files

platform/x86: asus-wmi: Modify behaviour of Fn+F5 fan key 



Some more recent TUF laptops have both fan_boost and thermal_throttle.
The key code for Fn+F5 is also different and unmapped.

This patch adjusts the asus_wmi_handle_event_code() match to match
for both 0x99 and 0xAE, and run both mode switch functions for
fan_boost and/or thermal_throttle if either are available.

It is required that both are tried, as in some instances the ACPI
set-method for one may not have any code body within it even though
it was returned as supported by the get method.

Signed-off-by: default avatarLuke D. Jones <luke@ljones.dev>
Link: https://lore.kernel.org/r/20220826004210.356534-2-luke@ljones.dev


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 98a2aea6

drivers/platform/x86/asus-nb-wmi.c

+1 −0
Original line number Diff line number Diff line
@@ -577,6 +577,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { 
	{ KE_KEY, 0xA5, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + TV + HDMI */

	{ KE_KEY, 0xA6, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + TV + HDMI */

	{ KE_KEY, 0xA7, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + CRT + TV + HDMI */

	{ KE_KEY, 0xAE, { KEY_FN_F5 } }, /* Fn+F5 fan mode on 2020+ */

	{ KE_KEY, 0xB3, { KEY_PROG4 } }, /* AURA */

	{ KE_KEY, 0xB5, { KEY_CALC } },

	{ KE_KEY, 0xC4, { KEY_KBDILLUMUP } },

drivers/platform/x86/asus-wmi.c

+5 −6
Original line number Diff line number Diff line
@@ -3063,14 +3063,13 @@ static void asus_wmi_handle_event_code(int code, struct asus_wmi *asus) 
		return;

	}



	if (asus->fan_boost_mode_available && code == NOTIFY_KBD_FBM) {

	if (code == NOTIFY_KBD_FBM || code == NOTIFY_KBD_TTP) {

		if (asus->fan_boost_mode_available)

			fan_boost_mode_switch_next(asus);

		return;

	}



	if (asus->throttle_thermal_policy_available && code == NOTIFY_KBD_TTP) {

		if (asus->throttle_thermal_policy_available)

			throttle_thermal_policy_switch_next(asus);

		return;



	}



	if (is_display_toggle(code) && asus->driver->quirks->no_display_toggle)