Commit 40d5bb87 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

HID: multitouch: enable multi-input as a quirk for some devices 

Two touchpad/trackstick combos are currently not behaving properly.
They define a mouse emulation collection, as per Win8 requirements,
but also define a separate mouse collection for the trackstick.

The way the kernel currently treat the collections is that it
merges both in one device. However, given that the first mouse
collection already defines X,Y and left, right buttons, when
mapping the events from the second mouse collection, hid-multitouch
sees that these events are already mapped, and simply ignores them.

To be able to report events from the tracktick, add a new quirked
class for it, and manually add the 2 devices we know about.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=207235


Cc: stable@vger.kernel.org
Tested-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent 47cf1b42

drivers/hid/hid-multitouch.c

+26 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ MODULE_LICENSE("GPL"); 
#define MT_QUIRK_ASUS_CUSTOM_UP		BIT(17)

#define MT_QUIRK_WIN8_PTP_BUTTONS	BIT(18)

#define MT_QUIRK_SEPARATE_APP_REPORT	BIT(19)

#define MT_QUIRK_FORCE_MULTI_INPUT	BIT(20)



#define MT_INPUTMODE_TOUCHSCREEN	0x02

#define MT_INPUTMODE_TOUCHPAD		0x03
@@ -189,6 +190,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app); 
#define MT_CLS_WIN_8				0x0012

#define MT_CLS_EXPORT_ALL_INPUTS		0x0013

#define MT_CLS_WIN_8_DUAL			0x0014

#define MT_CLS_WIN_8_FORCE_MULTI_INPUT		0x0015



/* vendor specific classes */

#define MT_CLS_3M				0x0101
@@ -279,6 +281,15 @@ static const struct mt_class mt_classes[] = { 
			MT_QUIRK_CONTACT_CNT_ACCURATE |

			MT_QUIRK_WIN8_PTP_BUTTONS,

		.export_all_inputs = true },

	{ .name = MT_CLS_WIN_8_FORCE_MULTI_INPUT,

		.quirks = MT_QUIRK_ALWAYS_VALID |

			MT_QUIRK_IGNORE_DUPLICATES |

			MT_QUIRK_HOVERING |

			MT_QUIRK_CONTACT_CNT_ACCURATE |

			MT_QUIRK_STICKY_FINGERS |

			MT_QUIRK_WIN8_PTP_BUTTONS |

			MT_QUIRK_FORCE_MULTI_INPUT,

		.export_all_inputs = true },



	/*

	 * vendor specific classes
@@ -1714,6 +1725,11 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	if (id->group != HID_GROUP_MULTITOUCH_WIN_8)

		hdev->quirks |= HID_QUIRK_MULTI_INPUT;



	if (mtclass->quirks & MT_QUIRK_FORCE_MULTI_INPUT) {

		hdev->quirks &= ~HID_QUIRK_INPUT_PER_APP;

		hdev->quirks |= HID_QUIRK_MULTI_INPUT;

	}



	timer_setup(&td->release_timer, mt_expired_timeout, 0);



	ret = hid_parse(hdev);
@@ -1926,6 +1942,11 @@ static const struct hid_device_id mt_devices[] = { 
		MT_USB_DEVICE(USB_VENDOR_ID_DWAV,

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_C002) },



	/* Elan devices */

	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,

		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_ELAN, 0x313a) },



	/* Elitegroup panel */

	{ .driver_data = MT_CLS_SERIAL,

		MT_USB_DEVICE(USB_VENDOR_ID_ELITEGROUP,
@@ -2056,6 +2077,11 @@ static const struct hid_device_id mt_devices[] = { 
		MT_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM,

			USB_DEVICE_ID_MTP_STM)},



	/* Synaptics devices */

	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,

		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,

			USB_VENDOR_ID_SYNAPTICS, 0xce08) },



	/* TopSeed panels */

	{ .driver_data = MT_CLS_TOPSEED,

		MT_USB_DEVICE(USB_VENDOR_ID_TOPSEED2,

CRA Git | Maintained and supported by SUSTech CRA and CCSE