Commit ffca8e0c authored by Jason Gerecke's avatar Jason Gerecke Committed by Greg Kroah-Hartman

HID: wacom: Sync INTUOSP2_BT touch state after each frame if necessary

commit 69dbdfff upstream.

The Bluetooth interface of the 2nd-gen Intuos Pro batches together four
independent "frames" of finger data into a single report. Each frame
is essentially equivalent to a single USB report, with the up-to-10
fingers worth of information being spread across two frames. At the
moment the driver only calls `input_sync` after processing all four
frames have been processed, which can result in the driver sending
multiple updates for a single slot within the same SYN_REPORT. This
can confuse userspace, so modify the driver to sync more often if
necessary (i.e., after reporting the state of all fingers).

Fixes: 4922cd26 ("HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic interface")
Cc: <stable@vger.kernel.org> # 4.11+
Signed-off-by: default avatarJason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c92181f5
...@@ -1371,11 +1371,17 @@ static void wacom_intuos_pro2_bt_touch(struct wacom_wac *wacom) ...@@ -1371,11 +1371,17 @@ static void wacom_intuos_pro2_bt_touch(struct wacom_wac *wacom)
if (wacom->num_contacts_left <= 0) { if (wacom->num_contacts_left <= 0) {
wacom->num_contacts_left = 0; wacom->num_contacts_left = 0;
wacom->shared->touch_down = wacom_wac_finger_count_touches(wacom); wacom->shared->touch_down = wacom_wac_finger_count_touches(wacom);
input_sync(touch_input);
} }
} }
input_report_switch(touch_input, SW_MUTE_DEVICE, !(data[281] >> 7)); if (wacom->num_contacts_left == 0) {
input_sync(touch_input); // Be careful that we don't accidentally call input_sync with
// only a partial set of fingers of processed
input_report_switch(touch_input, SW_MUTE_DEVICE, !(data[281] >> 7));
input_sync(touch_input);
}
} }
static void wacom_intuos_pro2_bt_pad(struct wacom_wac *wacom) static void wacom_intuos_pro2_bt_pad(struct wacom_wac *wacom)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment