diff options
| author | Laura Abbott <labbott@redhat.com> | 2019-10-14 10:03:12 -0400 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2019-10-14 10:03:12 -0400 |
| commit | bfc2ea12704d1d2b567b8a6c9480a0b1bf12af2e (patch) | |
| tree | 6e2fdd854512f505135fc16ac4e94e36f863022c | |
| parent | 418aac751886a77a8e009b34414a3eb7b6fab525 (diff) | |
| download | kernel-bfc2ea12704d1d2b567b8a6c9480a0b1bf12af2e.tar.gz kernel-bfc2ea12704d1d2b567b8a6c9480a0b1bf12af2e.tar.xz kernel-bfc2ea12704d1d2b567b8a6c9480a0b1bf12af2e.zip | |
Drop old Input workaround
Based on comments from the authors, this should be worked around in
libinput now.
| -rw-r--r-- | Input-synaptics-pin-3-touches-when-the-firmware-repo.patch | 47 | ||||
| -rw-r--r-- | kernel.spec | 2 |
2 files changed, 0 insertions, 49 deletions
diff --git a/Input-synaptics-pin-3-touches-when-the-firmware-repo.patch b/Input-synaptics-pin-3-touches-when-the-firmware-repo.patch deleted file mode 100644 index e697968c7..000000000 --- a/Input-synaptics-pin-3-touches-when-the-firmware-repo.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Benjamin Tissoires <benjamin.tissoires@redhat.com> -Date: Thu, 16 Apr 2015 13:01:46 -0400 -Subject: [PATCH] Input - synaptics: pin 3 touches when the firmware reports 3 - fingers - -Synaptics PS/2 touchpad can send only 2 touches in a report. They can -detect 4 or 5 and this information is valuable. - -In commit 63c4fda (Input: synaptics - allocate 3 slots to keep stability -in image sensors), we allocate 3 slots, but we still continue to report -the 2 available fingers. That means that the client sees 2 used slots while -there is a total of 3 fingers advertised by BTN_TOOL_TRIPLETAP. - -For old kernels this is not a problem because max_slots was 2 and libinput/ -xorg-synaptics knew how to deal with that. Now that max_slot is 3, the -clients ignore BTN_TOOL_TRIPLETAP and count the actual used slots (so 2). -It then gets confused when receiving the BTN_TOOL_TRIPLETAP and DOUBLETAP -information, and goes wild. - -We can pin the 3 slots until we get a total number of fingers below 2. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1212230 - -Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> ---- - drivers/input/mouse/synaptics.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c -index 3a32caf06bf1..58102970f94f 100644 ---- a/drivers/input/mouse/synaptics.c -+++ b/drivers/input/mouse/synaptics.c -@@ -940,6 +940,14 @@ static void synaptics_report_mt_data(struct psmouse *psmouse, - input_report_abs(dev, ABS_MT_PRESSURE, hw[i]->z); - } - -+ /* keep (slot count <= num_fingers) by pinning all slots */ -+ if (num_fingers >= 3) { -+ for (i = 0; i < 3; i++) { -+ input_mt_slot(dev, i); -+ input_mt_report_slot_state(dev, MT_TOOL_FINGER, true); -+ } -+ } -+ - input_mt_drop_unused(dev); - - /* Don't use active slot count to generate BTN_TOOL events. */ diff --git a/kernel.spec b/kernel.spec index a0f8116fc..1d5cfa085 100644 --- a/kernel.spec +++ b/kernel.spec @@ -495,8 +495,6 @@ Source5000: patch-5.%{base_sublevel}-git%{gitrev}.xz # Standalone patches # 100 - Generic long running patches -Patch122: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch - # 200 - x86 / secureboot # bz 1497559 - Make kernel MODSIGN code not error on missing variables |