diff mbox series

[3/4] platform/x86: thinkpad-acpi: Add support for hotkey 0x131a

Message ID 20220603170212.164963-3-markpearson@lenovo.com (mailing list archive)
State Accepted, archived
Headers show
Series [1/4] platform/x86: thinkpad-acpi: profile capabilities as integer | expand

Commit Message

Mark Pearson June 3, 2022, 5:02 p.m. UTC 
On some AMD platforms if you press FN+T it will toggle whether automatic
mode transitions are active.

Recognize this keycode and use it to toggle AMT.

Co-developed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Mark Pearson <markpearson@lenovo.com>
---
 drivers/platform/x86/thinkpad_acpi.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Mario Limonciello June 3, 2022, 5:14 p.m. UTC | #1 
[AMD Official Use Only - General]



> -----Original Message-----
> From: Mark Pearson <markpearson@lenovo.com>
> Sent: Friday, June 3, 2022 12:02
> To: markpearson@lenovo.com
> Cc: hdegoede@redhat.com; markgross@kernel.org; platform-driver-
> x86@vger.kernel.org; Limonciello, Mario <Mario.Limonciello@amd.com>
> Subject: [PATCH 3/4] platform/x86: thinkpad-acpi: Add support for hotkey
> 0x131a
> 
> On some AMD platforms if you press FN+T it will toggle whether automatic
> mode transitions are active.
> 
> Recognize this keycode and use it to toggle AMT.
> 
> Co-developed-by: Mario Limonciello <mario.limonciello@amd.com>
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> Signed-off-by: Mark Pearson <markpearson@lenovo.com>
> ---
>  drivers/platform/x86/thinkpad_acpi.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/drivers/platform/x86/thinkpad_acpi.c
> b/drivers/platform/x86/thinkpad_acpi.c
> index 2df290cee0a1..f11866225ef3 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -159,6 +159,7 @@ enum tpacpi_hkey_event_t {
>  	TP_HKEY_EV_VOL_DOWN		= 0x1016, /* Volume down or
> unmute */
>  	TP_HKEY_EV_VOL_MUTE		= 0x1017, /* Mixer output
> mute */
>  	TP_HKEY_EV_PRIVACYGUARD_TOGGLE	= 0x130f, /* Toggle priv.guard
> on/off */
> +	TP_HKEY_EV_AMT_TOGGLE		= 0x131a, /* Toggle AMT
> on/off */
> 
>  	/* Reasons for waking up from S3/S4 */
>  	TP_HKEY_EV_WKUP_S3_UNDOCK	= 0x2304, /* undock
> requested, S3 */
> @@ -3735,6 +3736,7 @@ static bool hotkey_notify_extended_hotkey(const
> u32 hkey)
> 
>  	switch (hkey) {
>  	case TP_HKEY_EV_PRIVACYGUARD_TOGGLE:
> +	case TP_HKEY_EV_AMT_TOGGLE:
>  		tpacpi_driver_event(hkey);
>  		return true;
>  	}
> @@ -11038,6 +11040,15 @@ static void tpacpi_driver_event(const unsigned int
> hkey_event)
>  		if (changed)
> 
> 	drm_privacy_screen_call_notifier_chain(lcdshadow_dev);
>  	}
> +	if (hkey_event == TP_HKEY_EV_AMT_TOGGLE) {
> +		/* If we're enabling AMT we need to force balanced mode */
> +		if (!dytc_amt_active)
> +			/* This will also set AMT mode enabled */
> +			dytc_profile_set(NULL,
> PLATFORM_PROFILE_BALANCED);
> +		else
> +			dytc_control_amt(!dytc_amt_active);

I missed this while we were making the series, but a fresh set of eyes tells me
shouldn't dytc_control_amt(..)  run in either case - not just in the "else" case?

* If AMT is not active and you press the key (to activate it) you 
should switch to balanced mode "and" turn it on.
* If AMT is active and you press the key (to deactivate it) you're already in 
balanced mode, so you should just turn it off.

> +	}
> +
>  }
> 
>  static void hotkey_driver_event(const unsigned int scancode)
> --
> 2.36.1
Mark Pearson June 3, 2022, 5:21 p.m. UTC | #2 
Hi Mario

On 6/3/22 13:14, Limonciello, Mario wrote:
> [AMD Official Use Only - General]
> 
> 
> 
>> -----Original Message-----
>> From: Mark Pearson <markpearson@lenovo.com>
>> Sent: Friday, June 3, 2022 12:02
>> To: markpearson@lenovo.com
>> Cc: hdegoede@redhat.com; markgross@kernel.org; platform-driver-
>> x86@vger.kernel.org; Limonciello, Mario <Mario.Limonciello@amd.com>
>> Subject: [PATCH 3/4] platform/x86: thinkpad-acpi: Add support for hotkey
>> 0x131a
>>
>> On some AMD platforms if you press FN+T it will toggle whether automatic
>> mode transitions are active.
>>
>> Recognize this keycode and use it to toggle AMT.
>>
>> Co-developed-by: Mario Limonciello <mario.limonciello@amd.com>
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> Signed-off-by: Mark Pearson <markpearson@lenovo.com>
>> ---
>>  drivers/platform/x86/thinkpad_acpi.c | 11 +++++++++++
>>  1 file changed, 11 insertions(+)
>>
>> diff --git a/drivers/platform/x86/thinkpad_acpi.c
>> b/drivers/platform/x86/thinkpad_acpi.c
>> index 2df290cee0a1..f11866225ef3 100644
>> --- a/drivers/platform/x86/thinkpad_acpi.c
>> +++ b/drivers/platform/x86/thinkpad_acpi.c
>> @@ -159,6 +159,7 @@ enum tpacpi_hkey_event_t {
>>  	TP_HKEY_EV_VOL_DOWN		= 0x1016, /* Volume down or
>> unmute */
>>  	TP_HKEY_EV_VOL_MUTE		= 0x1017, /* Mixer output
>> mute */
>>  	TP_HKEY_EV_PRIVACYGUARD_TOGGLE	= 0x130f, /* Toggle priv.guard
>> on/off */
>> +	TP_HKEY_EV_AMT_TOGGLE		= 0x131a, /* Toggle AMT
>> on/off */
>>
>>  	/* Reasons for waking up from S3/S4 */
>>  	TP_HKEY_EV_WKUP_S3_UNDOCK	= 0x2304, /* undock
>> requested, S3 */
>> @@ -3735,6 +3736,7 @@ static bool hotkey_notify_extended_hotkey(const
>> u32 hkey)
>>
>>  	switch (hkey) {
>>  	case TP_HKEY_EV_PRIVACYGUARD_TOGGLE:
>> +	case TP_HKEY_EV_AMT_TOGGLE:
>>  		tpacpi_driver_event(hkey);
>>  		return true;
>>  	}
>> @@ -11038,6 +11040,15 @@ static void tpacpi_driver_event(const unsigned int
>> hkey_event)
>>  		if (changed)
>>
>> 	drm_privacy_screen_call_notifier_chain(lcdshadow_dev);
>>  	}
>> +	if (hkey_event == TP_HKEY_EV_AMT_TOGGLE) {
>> +		/* If we're enabling AMT we need to force balanced mode */
>> +		if (!dytc_amt_active)
>> +			/* This will also set AMT mode enabled */
>> +			dytc_profile_set(NULL,
>> PLATFORM_PROFILE_BALANCED);
>> +		else
>> +			dytc_control_amt(!dytc_amt_active);
> 
> I missed this while we were making the series, but a fresh set of eyes tells me
> shouldn't dytc_control_amt(..)  run in either case - not just in the "else" case?
> 
> * If AMT is not active and you press the key (to activate it) you 
> should switch to balanced mode "and" turn it on.
> * If AMT is active and you press the key (to deactivate it) you're already in 
> balanced mode, so you should just turn it off.

The dytc_profile_set for balanced mode will also enable AMT (if it's
supported) so I didn't want to call it twice.

Mark
Mario Limonciello June 3, 2022, 5:22 p.m. UTC | #3 
[Public]



> -----Original Message-----
> From: Mark Pearson <markpearson@lenovo.com>
> Sent: Friday, June 3, 2022 12:21
> To: Limonciello, Mario <Mario.Limonciello@amd.com>
> Cc: hdegoede@redhat.com; markgross@kernel.org; platform-driver-
> x86@vger.kernel.org
> Subject: Re: [External] RE: [PATCH 3/4] platform/x86: thinkpad-acpi: Add
> support for hotkey 0x131a
> 
> Hi Mario
> 
> On 6/3/22 13:14, Limonciello, Mario wrote:
> > [AMD Official Use Only - General]
> >
> >
> >
> >> -----Original Message-----
> >> From: Mark Pearson <markpearson@lenovo.com>
> >> Sent: Friday, June 3, 2022 12:02
> >> To: markpearson@lenovo.com
> >> Cc: hdegoede@redhat.com; markgross@kernel.org; platform-driver-
> >> x86@vger.kernel.org; Limonciello, Mario <Mario.Limonciello@amd.com>
> >> Subject: [PATCH 3/4] platform/x86: thinkpad-acpi: Add support for hotkey
> >> 0x131a
> >>
> >> On some AMD platforms if you press FN+T it will toggle whether automatic
> >> mode transitions are active.
> >>
> >> Recognize this keycode and use it to toggle AMT.
> >>
> >> Co-developed-by: Mario Limonciello <mario.limonciello@amd.com>
> >> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> >> Signed-off-by: Mark Pearson <markpearson@lenovo.com>
> >> ---
> >>  drivers/platform/x86/thinkpad_acpi.c | 11 +++++++++++
> >>  1 file changed, 11 insertions(+)
> >>
> >> diff --git a/drivers/platform/x86/thinkpad_acpi.c
> >> b/drivers/platform/x86/thinkpad_acpi.c
> >> index 2df290cee0a1..f11866225ef3 100644
> >> --- a/drivers/platform/x86/thinkpad_acpi.c
> >> +++ b/drivers/platform/x86/thinkpad_acpi.c
> >> @@ -159,6 +159,7 @@ enum tpacpi_hkey_event_t {
> >>  	TP_HKEY_EV_VOL_DOWN		= 0x1016, /* Volume down or
> >> unmute */
> >>  	TP_HKEY_EV_VOL_MUTE		= 0x1017, /* Mixer output
> >> mute */
> >>  	TP_HKEY_EV_PRIVACYGUARD_TOGGLE	= 0x130f, /* Toggle priv.guard
> >> on/off */
> >> +	TP_HKEY_EV_AMT_TOGGLE		= 0x131a, /* Toggle AMT
> >> on/off */
> >>
> >>  	/* Reasons for waking up from S3/S4 */
> >>  	TP_HKEY_EV_WKUP_S3_UNDOCK	= 0x2304, /* undock
> >> requested, S3 */
> >> @@ -3735,6 +3736,7 @@ static bool hotkey_notify_extended_hotkey(const
> >> u32 hkey)
> >>
> >>  	switch (hkey) {
> >>  	case TP_HKEY_EV_PRIVACYGUARD_TOGGLE:
> >> +	case TP_HKEY_EV_AMT_TOGGLE:
> >>  		tpacpi_driver_event(hkey);
> >>  		return true;
> >>  	}
> >> @@ -11038,6 +11040,15 @@ static void tpacpi_driver_event(const unsigned
> int
> >> hkey_event)
> >>  		if (changed)
> >>
> >> 	drm_privacy_screen_call_notifier_chain(lcdshadow_dev);
> >>  	}
> >> +	if (hkey_event == TP_HKEY_EV_AMT_TOGGLE) {
> >> +		/* If we're enabling AMT we need to force balanced mode */
> >> +		if (!dytc_amt_active)
> >> +			/* This will also set AMT mode enabled */
> >> +			dytc_profile_set(NULL,
> >> PLATFORM_PROFILE_BALANCED);
> >> +		else
> >> +			dytc_control_amt(!dytc_amt_active);
> >
> > I missed this while we were making the series, but a fresh set of eyes tells me
> > shouldn't dytc_control_amt(..)  run in either case - not just in the "else" case?
> >
> > * If AMT is not active and you press the key (to activate it) you
> > should switch to balanced mode "and" turn it on.
> > * If AMT is active and you press the key (to deactivate it) you're already in
> > balanced mode, so you should just turn it off.
> 
> The dytc_profile_set for balanced mode will also enable AMT (if it's
> supported) so I didn't want to call it twice.

Ah, got it thanks.
diff mbox series

Patch

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 2df290cee0a1..f11866225ef3 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -159,6 +159,7 @@  enum tpacpi_hkey_event_t {
 	TP_HKEY_EV_VOL_DOWN		= 0x1016, /* Volume down or unmute */
 	TP_HKEY_EV_VOL_MUTE		= 0x1017, /* Mixer output mute */
 	TP_HKEY_EV_PRIVACYGUARD_TOGGLE	= 0x130f, /* Toggle priv.guard on/off */
+	TP_HKEY_EV_AMT_TOGGLE		= 0x131a, /* Toggle AMT on/off */
 
 	/* Reasons for waking up from S3/S4 */
 	TP_HKEY_EV_WKUP_S3_UNDOCK	= 0x2304, /* undock requested, S3 */
@@ -3735,6 +3736,7 @@  static bool hotkey_notify_extended_hotkey(const u32 hkey)
 
 	switch (hkey) {
 	case TP_HKEY_EV_PRIVACYGUARD_TOGGLE:
+	case TP_HKEY_EV_AMT_TOGGLE:
 		tpacpi_driver_event(hkey);
 		return true;
 	}
@@ -11038,6 +11040,15 @@  static void tpacpi_driver_event(const unsigned int hkey_event)
 		if (changed)
 			drm_privacy_screen_call_notifier_chain(lcdshadow_dev);
 	}
+	if (hkey_event == TP_HKEY_EV_AMT_TOGGLE) {
+		/* If we're enabling AMT we need to force balanced mode */
+		if (!dytc_amt_active)
+			/* This will also set AMT mode enabled */
+			dytc_profile_set(NULL, PLATFORM_PROFILE_BALANCED);
+		else
+			dytc_control_amt(!dytc_amt_active);
+	}
+
 }
 
 static void hotkey_driver_event(const unsigned int scancode)