From: Greg Kroah-Hartman Date: Tue, 29 Sep 2015 14:19:20 +0000 (+0200) Subject: delete input-synaptics-fix-handling-of-disabling-gesture-mode.patch X-Git-Tag: v4.1.9~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe6d7c957d9551f082a8d5c606057434fb7c3d67;p=thirdparty%2Fkernel%2Fstable-queue.git delete input-synaptics-fix-handling-of-disabling-gesture-mode.patch --- diff --git a/queue-3.10/input-synaptics-fix-handling-of-disabling-gesture-mode.patch b/queue-3.10/input-synaptics-fix-handling-of-disabling-gesture-mode.patch deleted file mode 100644 index 046895dd145..00000000000 --- a/queue-3.10/input-synaptics-fix-handling-of-disabling-gesture-mode.patch +++ /dev/null @@ -1,57 +0,0 @@ -From e51e38494a8ecc18650efb0c840600637891de2c Mon Sep 17 00:00:00 2001 -From: Dmitry Torokhov -Date: Thu, 20 Aug 2015 14:28:48 -0700 -Subject: Input: synaptics - fix handling of disabling gesture mode - -From: Dmitry Torokhov - -commit e51e38494a8ecc18650efb0c840600637891de2c upstream. - -Bit 2 of the mode byte has dual meaning: it can disable reporting of -gestures when touchpad works in Relative mode or normal Absolute mode, -or it can enable so called Extended W-Mode when touchpad uses enhanced -Absolute mode (W-mode). The extended W-Mode confuses our driver and -causes missing button presses on some Thinkpads (x250, T450s), so let's -make sure we do not enable it. - -Also, according to the spec W mode "... bit is defined only in Absolute -mode on pads whose capExtended capability bit is set. In Relative mode and -in TouchPads without this capability, the bit is reserved and should be -left at 0.", so let's make sure we respect this requirement as well. - -Reported-by: Nick Bowler -Suggested-by: Gabor Balla -Tested-by: Gabor Balla -Tested-by: Nick Bowler -Signed-off-by: Dmitry Torokhov -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/input/mouse/synaptics.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - ---- a/drivers/input/mouse/synaptics.c -+++ b/drivers/input/mouse/synaptics.c -@@ -360,14 +360,18 @@ static int synaptics_set_mode(struct psm - struct synaptics_data *priv = psmouse->private; - - priv->mode = 0; -- if (priv->absolute_mode) -+ -+ if (priv->absolute_mode) { - priv->mode |= SYN_BIT_ABSOLUTE_MODE; -- if (priv->disable_gesture) -+ if (SYN_CAP_EXTENDED(priv->capabilities)) -+ priv->mode |= SYN_BIT_W_MODE; -+ } -+ -+ if (!SYN_MODE_WMODE(priv->mode) && priv->disable_gesture) - priv->mode |= SYN_BIT_DISABLE_GESTURE; -+ - if (psmouse->rate >= 80) - priv->mode |= SYN_BIT_HIGH_RATE; -- if (SYN_CAP_EXTENDED(priv->capabilities)) -- priv->mode |= SYN_BIT_W_MODE; - - if (synaptics_mode_cmd(psmouse, priv->mode)) - return -1; diff --git a/queue-3.10/series b/queue-3.10/series index 6979bfe55fb..27809ef210d 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -5,7 +5,6 @@ mac80211-enable-assoc-check-for-mesh-interfaces.patch arm64-kconfig-move-list_poison-to-a-safe-value.patch arm64-compat-fix-vfp-save-restore-across-signal-handlers-in-big-endian.patch arm64-head.s-initialise-mdcr_el2-in-el2_setup.patch -input-synaptics-fix-handling-of-disabling-gesture-mode.patch alsa-hda-enable-headphone-jack-detect-on-old-fujitsu-laptops.patch alsa-hda-use-alc880_fixup_fujitsu-for-fsc-amilo-m1437.patch powerpc-mm-fix-pte_pagesize_index-crash-on-4k-w-64k-hash.patch diff --git a/queue-4.1/input-synaptics-fix-handling-of-disabling-gesture-mode.patch b/queue-4.1/input-synaptics-fix-handling-of-disabling-gesture-mode.patch deleted file mode 100644 index 7a54a741eb7..00000000000 --- a/queue-4.1/input-synaptics-fix-handling-of-disabling-gesture-mode.patch +++ /dev/null @@ -1,57 +0,0 @@ -From e51e38494a8ecc18650efb0c840600637891de2c Mon Sep 17 00:00:00 2001 -From: Dmitry Torokhov -Date: Thu, 20 Aug 2015 14:28:48 -0700 -Subject: Input: synaptics - fix handling of disabling gesture mode - -From: Dmitry Torokhov - -commit e51e38494a8ecc18650efb0c840600637891de2c upstream. - -Bit 2 of the mode byte has dual meaning: it can disable reporting of -gestures when touchpad works in Relative mode or normal Absolute mode, -or it can enable so called Extended W-Mode when touchpad uses enhanced -Absolute mode (W-mode). The extended W-Mode confuses our driver and -causes missing button presses on some Thinkpads (x250, T450s), so let's -make sure we do not enable it. - -Also, according to the spec W mode "... bit is defined only in Absolute -mode on pads whose capExtended capability bit is set. In Relative mode and -in TouchPads without this capability, the bit is reserved and should be -left at 0.", so let's make sure we respect this requirement as well. - -Reported-by: Nick Bowler -Suggested-by: Gabor Balla -Tested-by: Gabor Balla -Tested-by: Nick Bowler -Signed-off-by: Dmitry Torokhov -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/input/mouse/synaptics.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - ---- a/drivers/input/mouse/synaptics.c -+++ b/drivers/input/mouse/synaptics.c -@@ -519,14 +519,18 @@ static int synaptics_set_mode(struct psm - struct synaptics_data *priv = psmouse->private; - - priv->mode = 0; -- if (priv->absolute_mode) -+ -+ if (priv->absolute_mode) { - priv->mode |= SYN_BIT_ABSOLUTE_MODE; -- if (priv->disable_gesture) -+ if (SYN_CAP_EXTENDED(priv->capabilities)) -+ priv->mode |= SYN_BIT_W_MODE; -+ } -+ -+ if (!SYN_MODE_WMODE(priv->mode) && priv->disable_gesture) - priv->mode |= SYN_BIT_DISABLE_GESTURE; -+ - if (psmouse->rate >= 80) - priv->mode |= SYN_BIT_HIGH_RATE; -- if (SYN_CAP_EXTENDED(priv->capabilities)) -- priv->mode |= SYN_BIT_W_MODE; - - if (synaptics_mode_cmd(psmouse, priv->mode)) - return -1; diff --git a/queue-4.1/series b/queue-4.1/series index 580aaefc71b..4c5f9810c27 100644 --- a/queue-4.1/series +++ b/queue-4.1/series @@ -23,7 +23,6 @@ arm64-errata-add-module-build-workaround-for-erratum-843419.patch arm-arm64-kvm-vgic-check-for-irqchip_in_kernel-when-mapping-resources.patch kvm-arm64-add-workaround-for-cortex-a57-erratum-852523.patch arm64-kvm-disable-virtual-timer-even-if-the-guest-is-not-using-it.patch -input-synaptics-fix-handling-of-disabling-gesture-mode.patch input-evdev-do-not-report-errors-form-flush.patch alsa-usb-audio-correct-the-value-cache-check.patch alsa-hda-enable-headphone-jack-detect-on-old-fujitsu-laptops.patch diff --git a/queue-4.2/input-synaptics-fix-handling-of-disabling-gesture-mode.patch b/queue-4.2/input-synaptics-fix-handling-of-disabling-gesture-mode.patch deleted file mode 100644 index 7a54a741eb7..00000000000 --- a/queue-4.2/input-synaptics-fix-handling-of-disabling-gesture-mode.patch +++ /dev/null @@ -1,57 +0,0 @@ -From e51e38494a8ecc18650efb0c840600637891de2c Mon Sep 17 00:00:00 2001 -From: Dmitry Torokhov -Date: Thu, 20 Aug 2015 14:28:48 -0700 -Subject: Input: synaptics - fix handling of disabling gesture mode - -From: Dmitry Torokhov - -commit e51e38494a8ecc18650efb0c840600637891de2c upstream. - -Bit 2 of the mode byte has dual meaning: it can disable reporting of -gestures when touchpad works in Relative mode or normal Absolute mode, -or it can enable so called Extended W-Mode when touchpad uses enhanced -Absolute mode (W-mode). The extended W-Mode confuses our driver and -causes missing button presses on some Thinkpads (x250, T450s), so let's -make sure we do not enable it. - -Also, according to the spec W mode "... bit is defined only in Absolute -mode on pads whose capExtended capability bit is set. In Relative mode and -in TouchPads without this capability, the bit is reserved and should be -left at 0.", so let's make sure we respect this requirement as well. - -Reported-by: Nick Bowler -Suggested-by: Gabor Balla -Tested-by: Gabor Balla -Tested-by: Nick Bowler -Signed-off-by: Dmitry Torokhov -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/input/mouse/synaptics.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - ---- a/drivers/input/mouse/synaptics.c -+++ b/drivers/input/mouse/synaptics.c -@@ -519,14 +519,18 @@ static int synaptics_set_mode(struct psm - struct synaptics_data *priv = psmouse->private; - - priv->mode = 0; -- if (priv->absolute_mode) -+ -+ if (priv->absolute_mode) { - priv->mode |= SYN_BIT_ABSOLUTE_MODE; -- if (priv->disable_gesture) -+ if (SYN_CAP_EXTENDED(priv->capabilities)) -+ priv->mode |= SYN_BIT_W_MODE; -+ } -+ -+ if (!SYN_MODE_WMODE(priv->mode) && priv->disable_gesture) - priv->mode |= SYN_BIT_DISABLE_GESTURE; -+ - if (psmouse->rate >= 80) - priv->mode |= SYN_BIT_HIGH_RATE; -- if (SYN_CAP_EXTENDED(priv->capabilities)) -- priv->mode |= SYN_BIT_W_MODE; - - if (synaptics_mode_cmd(psmouse, priv->mode)) - return -1; diff --git a/queue-4.2/series b/queue-4.2/series index b35dfa63c76..fb20a54acc8 100644 --- a/queue-4.2/series +++ b/queue-4.2/series @@ -35,7 +35,6 @@ arm64-errata-add-module-build-workaround-for-erratum-843419.patch arm-arm64-kvm-vgic-check-for-irqchip_in_kernel-when-mapping-resources.patch kvm-arm64-add-workaround-for-cortex-a57-erratum-852523.patch arm64-kvm-disable-virtual-timer-even-if-the-guest-is-not-using-it.patch -input-synaptics-fix-handling-of-disabling-gesture-mode.patch input-evdev-do-not-report-errors-form-flush.patch alsa-usb-audio-correct-the-value-cache-check.patch alsa-hda-fix-missing-inline-for-dummy-snd_hdac_set_codec_wakeup.patch