Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 595e9276ce68791317484ec7f0f9f2e0457c3b34

Authored by Benjamin Tissoires
Committed by Jiri Kosina
1 parent f961bd3516
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

HID: do not init input reports for Win 8 multitouch devices 

Some multitouch screens do not like to be polled for input reports.
However, the Win8 spec says that all touches should be sent during
each report, making the initialization of reports unnecessary.
The Win7 spec is less precise, so do not use this for those devices.

Add the quirk HID_QUIRK_NO_INIT_INPUT_REPORTS so that we do not have to
introduce a quirk for each problematic device. This quirk makes the driver
behave the same way the Win 8 does. It actually retrieves the features,
but not the inputs.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
Tested-by: Srinivas Pandruvada<srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Showing 3 changed files with 21 additions and 3 deletions Side-by-side Diff

drivers/hid/hid-multitouch.c
Diff comments   View file @ 595e927
... ... @@ -951,6 +951,18 @@
951 951 hdev->quirks |= HID_QUIRK_MULTI_INPUT;
952 952 hdev->quirks |= HID_QUIRK_NO_EMPTY_INPUT;
953 953  
  954 + /*
  955 + * Handle special quirks for Windows 8 certified devices.
  956 + */
  957 + if (id->group == HID_GROUP_MULTITOUCH_WIN_8)
  958 + /*
  959 + * Some multitouch screens do not like to be polled for input
  960 + * reports. Fortunately, the Win8 spec says that all touches
  961 + * should be sent during each report, making the initialization
  962 + * of input reports unnecessary.
  963 + */
  964 + hdev->quirks |= HID_QUIRK_NO_INIT_INPUT_REPORTS;
  965 +
954 966 td = devm_kzalloc(&hdev->dev, sizeof(struct mt_device), GFP_KERNEL);
955 967 if (!td) {
956 968 dev_err(&hdev->dev, "cannot allocate multitouch data\n");
drivers/hid/usbhid/hid-core.c
Diff comments   View file @ 595e927
... ... @@ -807,12 +807,17 @@
807 807 {
808 808 struct hid_report *report;
809 809 struct usbhid_device *usbhid = hid->driver_data;
  810 + struct hid_report_enum *report_enum;
810 811 int err, ret;
811 812  
812   - list_for_each_entry(report, &hid->report_enum[HID_INPUT_REPORT].report_list, list)
813   - usbhid_submit_report(hid, report, USB_DIR_IN);
  813 + if (!(hid->quirks & HID_QUIRK_NO_INIT_INPUT_REPORTS)) {
  814 + report_enum = &hid->report_enum[HID_INPUT_REPORT];
  815 + list_for_each_entry(report, &report_enum->report_list, list)
  816 + usbhid_submit_report(hid, report, USB_DIR_IN);
  817 + }
814 818  
815   - list_for_each_entry(report, &hid->report_enum[HID_FEATURE_REPORT].report_list, list)
  819 + report_enum = &hid->report_enum[HID_FEATURE_REPORT];
  820 + list_for_each_entry(report, &report_enum->report_list, list)
816 821 usbhid_submit_report(hid, report, USB_DIR_IN);
817 822  
818 823 err = 0;
... ... @@ -283,6 +283,7 @@
283 283 #define HID_QUIRK_MULTI_INPUT 0x00000040
284 284 #define HID_QUIRK_HIDINPUT_FORCE 0x00000080
285 285 #define HID_QUIRK_NO_EMPTY_INPUT 0x00000100
  286 +#define HID_QUIRK_NO_INIT_INPUT_REPORTS 0x00000200
286 287 #define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000
287 288 #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000
288 289 #define HID_QUIRK_NO_INIT_REPORTS 0x20000000