From: Sasha Levin Date: Sat, 2 Feb 2019 13:32:45 +0000 (-0500) Subject: patches for 4.20 X-Git-Tag: v4.20.7~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46a782b90e18bd181686be69330150ceb50b2c68;p=thirdparty%2Fkernel%2Fstable-queue.git patches for 4.20 Signed-off-by: Sasha Levin --- diff --git a/queue-4.20/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch b/queue-4.20/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch new file mode 100644 index 00000000000..71ecf5b4327 --- /dev/null +++ b/queue-4.20/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch @@ -0,0 +1,39 @@ +From 36390f0d2edcaefd2b9c930ed67ae335fa227afb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= +Date: Wed, 31 Oct 2018 17:21:28 -0700 +Subject: platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit 71b12beaf12f21a53bfe100795d0797f1035b570 ] + +According to Asus firmware engineers, the meaning of these codes is only +to notify the OS that the screen brightness has been turned on/off by +the EC. This does not match the meaning of KEY_DISPLAYTOGGLE / +KEY_DISPLAY_OFF, where userspace is expected to change the display +brightness. + +Signed-off-by: João Paulo Rechi Vita +Signed-off-by: Andy Shevchenko +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/asus-nb-wmi.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c +index 5a00a7665f9b..b6f2ff95c3ed 100644 +--- a/drivers/platform/x86/asus-nb-wmi.c ++++ b/drivers/platform/x86/asus-nb-wmi.c +@@ -442,8 +442,6 @@ static const struct key_entry asus_nb_wmi_keymap[] = { + { KE_KEY, 0x30, { KEY_VOLUMEUP } }, + { KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, + { KE_KEY, 0x32, { KEY_MUTE } }, +- { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */ +- { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ + { KE_KEY, 0x35, { KEY_SCREENLOCK } }, + { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, + { KE_KEY, 0x41, { KEY_NEXTSONG } }, +-- +2.19.1 + diff --git a/queue-4.20/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch b/queue-4.20/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch new file mode 100644 index 00000000000..e18063d74ab --- /dev/null +++ b/queue-4.20/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch @@ -0,0 +1,44 @@ +From 1540e8f75cdc5fccdc659fc7f49a6a4d169b1fe5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= +Date: Wed, 31 Oct 2018 17:21:27 -0700 +Subject: platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +[ Upstream commit b3f2f3799a972d3863d0fdc2ab6287aef6ca631f ] + +When the OS registers to handle events from the display off hotkey the +EC will send a notification with 0x35 for every key press, independent +of the backlight state. + +The behavior of this key on Windows, with the ATKACPI driver from Asus +installed, is turning off the backlight of all connected displays with a +fading effect, and any cursor input or key press turning the backlight +back on. The key press or cursor input that wakes up the display is also +passed through to the application under the cursor or under focus. + +The key that matches this behavior the closest is KEY_SCREENLOCK. + +Signed-off-by: João Paulo Rechi Vita +Signed-off-by: Andy Shevchenko +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/asus-nb-wmi.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c +index db2af09067db..5a00a7665f9b 100644 +--- a/drivers/platform/x86/asus-nb-wmi.c ++++ b/drivers/platform/x86/asus-nb-wmi.c +@@ -444,6 +444,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = { + { KE_KEY, 0x32, { KEY_MUTE } }, + { KE_KEY, 0x33, { KEY_DISPLAYTOGGLE } }, /* LCD on */ + { KE_KEY, 0x34, { KEY_DISPLAY_OFF } }, /* LCD off */ ++ { KE_KEY, 0x35, { KEY_SCREENLOCK } }, + { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, + { KE_KEY, 0x41, { KEY_NEXTSONG } }, + { KE_KEY, 0x43, { KEY_STOPCD } }, /* Stop/Eject */ +-- +2.19.1 + diff --git a/queue-4.20/series b/queue-4.20/series index 873f72f7e2b..1e3d72f692c 100644 --- a/queue-4.20/series +++ b/queue-4.20/series @@ -61,3 +61,5 @@ ib-uverbs-fix-oops-upon-device-disassociation.patch ib-uverbs-fix-oops-in-uverbs_user_mmap_disassociate.patch ib-hfi1-remove-overly-conservative-vm_exec-flag-check.patch ib-hfi1-add-limit-test-for-rc-uc-send-via-loopback.patch +platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch +platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch