mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 04:26:45 +00:00
HID: wacom: Sync INTUOSP2_BT touch state after each frame if necessary
commit69dbdfffef
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:4922cd26f0
("HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic interface") Cc: <stable@vger.kernel.org> # 4.11+ Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f0c83ba15f
commit
3e5a7e1f13
1 changed files with 8 additions and 2 deletions
|
@ -1328,13 +1328,19 @@ 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (wacom->num_contacts_left == 0) {
|
||||||
|
// 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_report_switch(touch_input, SW_MUTE_DEVICE, !(data[281] >> 7));
|
||||||
input_sync(touch_input);
|
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)
|
||||||
{
|
{
|
||||||
struct input_dev *pad_input = wacom->pad_input;
|
struct input_dev *pad_input = wacom->pad_input;
|
||||||
|
|
Loading…
Reference in a new issue