quirks: disable pressure on the Lenovo Yoga 9i touchpad

This touchpad is a true pressurepad and the pressure axis gives us physical
pressure down. Using it as contact size gives flaky touch detection, so let's
just disable the axis until we do something with that value.

Fixes #562

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 53595cb23262f61005c4b24a19936dabac12159e)

diff --git a/meson.build b/meson.build
index a02bbe3105ee0a5fad6bfffb6f421246cbf84b29..37a2feb304c481929bf41d61e9fc53a6b8562417 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -803,6 +803,7 @@ if get_option('tests')
                'test/litest-device-synaptics-x220.c',
                'test/litest-device-synaptics-hover.c',
                'test/litest-device-synaptics-i2c.c',
+               'test/litest-device-synaptics-pressurepad.c',
                'test/litest-device-synaptics-rmi4.c',
                'test/litest-device-synaptics-st.c',
                'test/litest-device-synaptics-t440.c',

diff --git a/quirks/50-system-lenovo.quirks b/quirks/50-system-lenovo.quirks
index 19a3b9e5442986ab67868ec71b5b42703b262ef2..84825e449a3d8fc9798444e8564e3de2577aea43 100644 (file)
--- a/quirks/50-system-lenovo.quirks
+++ b/quirks/50-system-lenovo.quirks
@@ -130,6 +130,14 @@ MatchName=*TPPS/2 IBM TrackPoint
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadX1Yoga1st:*
 AttrTrackpointMultiplier=1.25
 
+# A true pressurepad so let's not use pressure for contact size
+# https://gitlab.freedesktop.org/libinput/libinput/-/issues/562
+[Lenovo Yoga 9i Pressurepad]
+MatchBus=i2c
+MatchVendor=0x06CB
+MatchProduct=0xCE37
+AttrEventCodeDisable=ABS_MT_PRESSURE;ABS_PRESSURE;
+
 # Lenovo Carbon X1 6th gen (RMI4 only, PS/2 is broken on this device,
 # sends bogus ABS_MT_TOOL_TYPE events for MT_TOOL_PALM
 [Lenovo Carbon X1 6th gen]

diff --git a/test/litest-device-synaptics-pressurepad.c b/test/litest-device-synaptics-pressurepad.c
new file mode 100644 (file)
index 0000000..e0e5562
--- /dev/null
+++ b/test/litest-device-synaptics-pressurepad.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright © 2021 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "config.h"
+
+#include "litest.h"
+#include "litest-int.h"
+
+/* Device from https://gitlab.freedesktop.org/libinput/libinput/-/issues/562 */
+
+static struct input_event down[] = {
+       { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN  },
+       { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN },
+       { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN },
+       { .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
+       { .type = EV_ABS, .code = ABS_MT_TRACKING_ID, .value = LITEST_AUTO_ASSIGN },
+       { .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
+       { .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
+       { .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+       { .type = -1, .code = -1 },
+};
+
+static struct input_event move[] = {
+       { .type = EV_ABS, .code = ABS_MT_SLOT, .value = LITEST_AUTO_ASSIGN },
+       { .type = EV_ABS, .code = ABS_X, .value = LITEST_AUTO_ASSIGN  },
+       { .type = EV_ABS, .code = ABS_Y, .value = LITEST_AUTO_ASSIGN },
+       { .type = EV_ABS, .code = ABS_PRESSURE, .value = LITEST_AUTO_ASSIGN },
+       { .type = EV_ABS, .code = ABS_MT_POSITION_X, .value = LITEST_AUTO_ASSIGN },
+       { .type = EV_ABS, .code = ABS_MT_POSITION_Y, .value = LITEST_AUTO_ASSIGN },
+       { .type = EV_SYN, .code = SYN_REPORT, .value = 0 },
+       { .type = -1, .code = -1 },
+};
+
+
+static int
+get_axis_default(struct litest_device *d, unsigned int evcode, int32_t *value)
+{
+       switch (evcode) {
+       /* Always set pressure to zero. The real device sends pressure
+        * values > 30 when the device is clicked but until this is a)
+        * handled by libinput and b) integrated into this test suite
+        * a zero value does the job.
+        */
+       case ABS_PRESSURE:
+       case ABS_MT_PRESSURE:
+               *value = 0;
+               return 0;
+       }
+       return 1;
+}
+
+static struct litest_device_interface interface = {
+       .touch_down_events = down,
+       .touch_move_events = move,
+
+       .get_axis_default = get_axis_default,
+};
+
+static struct input_id input_id = {
+       .bustype = 0x18,
+       .vendor = 0x6cb,
+       .product = 0xce37,
+};
+
+static int events[] = {
+       EV_KEY, BTN_LEFT,
+       EV_KEY, BTN_TOOL_FINGER,
+       EV_KEY, BTN_TOUCH,
+       EV_KEY, BTN_TOOL_DOUBLETAP,
+       EV_KEY, BTN_TOOL_TRIPLETAP,
+       EV_KEY, BTN_TOOL_QUADTAP,
+       EV_KEY, BTN_TOOL_QUINTTAP,
+       INPUT_PROP_MAX, INPUT_PROP_POINTER,
+       INPUT_PROP_MAX, INPUT_PROP_BUTTONPAD,
+       -1, -1,
+};
+
+static struct input_absinfo absinfo[] = {
+       { ABS_X, 0, 1224, 0, 0, 12 },
+       { ABS_Y, 0, 756, 0, 0, 12 },
+       { ABS_PRESSURE, 0, 255, 0, 0, 0 },
+       { ABS_MT_SLOT, 0, 4, 0, 0, 0 },
+       { ABS_MT_POSITION_X, 0, 1224, 0, 0, 12 },
+       { ABS_MT_POSITION_Y, 0, 756, 0, 0, 12 },
+       { ABS_MT_TRACKING_ID, 0, 65535, 0, 0, 0 },
+       { ABS_MT_PRESSURE, 0, 255, 0, 0, 0 },
+       { ABS_MT_TOOL_TYPE, 0, 2, 0, 0, 0 },
+       { .value = -1 }
+};
+
+TEST_DEVICE("synaptics-pressurepad",
+       .type = LITEST_SYNAPTICS_PRESSUREPAD,
+       .features = LITEST_TOUCHPAD | LITEST_CLICKPAD | LITEST_BUTTON,
+       .interface = &interface,
+
+       .name = "SYNA2B31:00 06CB:CE37 Touchpad",
+       .id = &input_id,
+       .events = events,
+       .absinfo = absinfo,
+)

diff --git a/test/litest.h b/test/litest.h
index 1f4e609d7e2015165e920e2fc21a14c84da0641d..08ce20acefbb63e19370ab98982807bb61519d69 100644 (file)
--- a/test/litest.h
+++ b/test/litest.h
@@ -306,6 +306,7 @@ enum litest_device_type {
        LITEST_TABLET_MODE_UNRELIABLE,
        LITEST_KEYBOARD_LOGITECH_MEDIA_KEYBOARD_ELITE,
        LITEST_SONY_VAIO_KEYS,
+       LITEST_SYNAPTICS_PRESSUREPAD,
 };
 
 #define LITEST_DEVICELESS      -2

diff --git a/test/test-touchpad-tap.c b/test/test-touchpad-tap.c
index 74e03ccb634f9354947f68c300c06826892a031d..ff03df936c80b59f751a1ae0d3b58ff955788424 100644 (file)
--- a/test/test-touchpad-tap.c
+++ b/test/test-touchpad-tap.c
@@ -2765,6 +2765,9 @@ touchpad_has_palm_pressure(struct litest_device *dev)
 {
        struct libevdev *evdev = dev->evdev;
 
+       if (dev->which == LITEST_SYNAPTICS_PRESSUREPAD)
+               return false;
+
        if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_PRESSURE))
                return true;
 

diff --git a/test/test-touchpad.c b/test/test-touchpad.c
index 96cb8db59c186b65c322bec5d2b6636d5f3bf379..c7e3cbd19f057c099a63a89d06fc2b90904c633a 100644 (file)
--- a/test/test-touchpad.c
+++ b/test/test-touchpad.c
@@ -1795,6 +1795,9 @@ touchpad_has_palm_pressure(struct litest_device *dev)
 {
        struct libevdev *evdev = dev->evdev;
 
+       if (dev->which == LITEST_SYNAPTICS_PRESSUREPAD)
+               return false;
+
        if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_PRESSURE))
                return true;
 
@@ -5913,6 +5916,9 @@ touchpad_has_pressure(struct litest_device *dev)
 {
        struct libevdev *evdev = dev->evdev;
 
+       if (dev->which == LITEST_SYNAPTICS_PRESSUREPAD)
+               return false;
+
        if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_PRESSURE))
                return true;