Commit 31a4cf1d authored by Hans de Goede's avatar Hans de Goede Committed by Jiri Kosina
Browse files

HID: multitouch: Disable event reporting on suspend on the Asus T101HA touchpad 



The Asus T101HA has a problem with spurious wakeups when the lid is
closed, this is caused by the screen sitting so close to the touchpad
that the touchpad ends up reporting touch events, causing these wakeups.

Add a quirk which disables event reporting on suspend when set, and
enable this quirk for the Asus T101HA touchpad fixing the spurious
wakeups, while still allowing the device to be woken by pressing a
key on the keyboard (which is part of the same USB device).

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent e62b91cd

drivers/hid/hid-multitouch.c

+26 −2
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ MODULE_LICENSE("GPL"); 
#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_QUIRK_DISABLE_WAKEUP		BIT(21)



#define MT_INPUTMODE_TOUCHSCREEN	0x02

#define MT_INPUTMODE_TOUCHPAD		0x03
@@ -191,6 +192,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app); 
#define MT_CLS_EXPORT_ALL_INPUTS		0x0013

/* reserved					0x0014 */

#define MT_CLS_WIN_8_FORCE_MULTI_INPUT		0x0015

#define MT_CLS_WIN_8_DISABLE_WAKEUP		0x0016



/* vendor specific classes */

#define MT_CLS_3M				0x0101
@@ -283,6 +285,15 @@ static const struct mt_class mt_classes[] = { 
			MT_QUIRK_WIN8_PTP_BUTTONS |

			MT_QUIRK_FORCE_MULTI_INPUT,

		.export_all_inputs = true },

	{ .name = MT_CLS_WIN_8_DISABLE_WAKEUP,

		.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_DISABLE_WAKEUP,

		.export_all_inputs = true },



	/*

	 * vendor specific classes
@@ -763,7 +774,8 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
			return 1;

		case HID_DG_CONFIDENCE:

			if ((cls->name == MT_CLS_WIN_8 ||

			     cls->name == MT_CLS_WIN_8_FORCE_MULTI_INPUT) &&

			     cls->name == MT_CLS_WIN_8_FORCE_MULTI_INPUT ||

			     cls->name == MT_CLS_WIN_8_DISABLE_WAKEUP) &&

				(field->application == HID_DG_TOUCHPAD ||

				 field->application == HID_DG_TOUCHSCREEN))

				app->quirks |= MT_QUIRK_CONFIDENCE;
@@ -1753,8 +1765,14 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) 
#ifdef CONFIG_PM

static int mt_suspend(struct hid_device *hdev, pm_message_t state)

{

	struct mt_device *td = hid_get_drvdata(hdev);



	/* High latency is desirable for power savings during S3/S0ix */

	if (td->mtclass.quirks & MT_QUIRK_DISABLE_WAKEUP)

		mt_set_modes(hdev, HID_LATENCY_HIGH, false, false);

	else

		mt_set_modes(hdev, HID_LATENCY_HIGH, true, true);



	return 0;

}
@@ -1813,6 +1831,12 @@ static const struct hid_device_id mt_devices[] = { 
		MT_USB_DEVICE(USB_VENDOR_ID_ANTON,

			USB_DEVICE_ID_ANTON_TOUCH_PAD) },



	/* Asus T101HA */

	{ .driver_data = MT_CLS_WIN_8_DISABLE_WAKEUP,

		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,

			   USB_VENDOR_ID_ASUSTEK,

			   USB_DEVICE_ID_ASUSTEK_T101HA_KEYBOARD) },



	/* Asus T304UA */

	{ .driver_data = MT_CLS_ASUS,

		HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH_WIN_8,