From: Sasha Levin Date: Sat, 2 Feb 2019 13:32:46 +0000 (-0500) Subject: patches for 4.14 X-Git-Tag: v4.20.7~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de059b5ebd4a37e3966f005c2a68fb277cbf0863;p=thirdparty%2Fkernel%2Fstable-queue.git patches for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch b/queue-4.14/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch new file mode 100644 index 00000000000..4108f9bcc97 --- /dev/null +++ b/queue-4.14/platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch @@ -0,0 +1,39 @@ +From ec949aefdb6e9d21408a385b6c59dca5f12c6f54 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 2a697bf572c9..9c4b0d7f15c3 100644 +--- a/drivers/platform/x86/asus-nb-wmi.c ++++ b/drivers/platform/x86/asus-nb-wmi.c +@@ -433,8 +433,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.14/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch b/queue-4.14/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch new file mode 100644 index 00000000000..c8fcbfb7ae0 --- /dev/null +++ b/queue-4.14/platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch @@ -0,0 +1,44 @@ +From 4fb100e83b09e43d0a7f67b7ae66c1cbfc843270 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 a6a33327f5e7..2a697bf572c9 100644 +--- a/drivers/platform/x86/asus-nb-wmi.c ++++ b/drivers/platform/x86/asus-nb-wmi.c +@@ -435,6 +435,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.14/series b/queue-4.14/series index 60d1ce15375..67ac6a0bd69 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -32,3 +32,5 @@ gfs2-revert-fix-loop-in-gfs2_rbm_find.patch mmc-bcm2835-fix-dma-channel-leak-on-probe-error.patch alsa-hda-realtek-fixed-hp_pin-no-value.patch ib-hfi1-remove-overly-conservative-vm_exec-flag-check.patch +platform-x86-asus-nb-wmi-map-0x35-to-key_screenlock.patch +platform-x86-asus-nb-wmi-drop-mapping-of-0x33-and-0x.patch