5.1-stable patches

[thirdparty/kernel/stable-queue.git] / queue-5.1 / hid-wacom-generic-correct-pad-syncing.patch

diff --git a/queue-5.1/hid-wacom-generic-correct-pad-syncing.patch b/queue-5.1/hid-wacom-generic-correct-pad-syncing.patch
new file mode 100644 (file)
index 0000000..8fe4086
--- /dev/null
+++ b/queue-5.1/hid-wacom-generic-correct-pad-syncing.patch
@@ -0,0 +1,79 @@
+From d4b8efeb46d99a5d02e7f88ac4eaccbe49370770 Mon Sep 17 00:00:00 2001
+From: Aaron Armstrong Skomra <skomra@gmail.com>
+Date: Fri, 10 May 2019 15:34:17 -0700
+Subject: HID: wacom: generic: Correct pad syncing
+
+From: Aaron Armstrong Skomra <skomra@gmail.com>
+
+commit d4b8efeb46d99a5d02e7f88ac4eaccbe49370770 upstream.
+
+Only sync the pad once per report, not once per collection.
+Also avoid syncing the pad on battery reports.
+
+Fixes: f8b6a74719b5 ("HID: wacom: generic: Support multiple tools per report")
+Cc: <stable@vger.kernel.org> # v4.17+
+Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hid/wacom_wac.c |   15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+--- a/drivers/hid/wacom_wac.c
++++ b/drivers/hid/wacom_wac.c
+@@ -2121,14 +2121,12 @@ static void wacom_wac_pad_report(struct
+       bool active = wacom_wac->hid_data.inrange_state != 0;
+ 
+       /* report prox for expresskey events */
+-      if ((wacom_equivalent_usage(field->physical) == HID_DG_TABLETFUNCTIONKEY) &&
+-          wacom_wac->hid_data.pad_input_event_flag) {
++      if (wacom_wac->hid_data.pad_input_event_flag) {
+               input_event(input, EV_ABS, ABS_MISC, active ? PAD_DEVICE_ID : 0);
+               input_sync(input);
+               if (!active)
+                       wacom_wac->hid_data.pad_input_event_flag = false;
+       }
+-
+ }
+ 
+ static void wacom_wac_pen_usage_mapping(struct hid_device *hdev,
+@@ -2704,9 +2702,7 @@ static int wacom_wac_collection(struct h
+       if (report->type != HID_INPUT_REPORT)
+               return -1;
+ 
+-      if (WACOM_PAD_FIELD(field) && wacom->wacom_wac.pad_input)
+-              wacom_wac_pad_report(hdev, report, field);
+-      else if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input)
++      if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input)
+               wacom_wac_pen_report(hdev, report);
+       else if (WACOM_FINGER_FIELD(field) && wacom->wacom_wac.touch_input)
+               wacom_wac_finger_report(hdev, report);
+@@ -2720,7 +2716,7 @@ void wacom_wac_report(struct hid_device
+       struct wacom_wac *wacom_wac = &wacom->wacom_wac;
+       struct hid_field *field;
+       bool pad_in_hid_field = false, pen_in_hid_field = false,
+-              finger_in_hid_field = false;
++              finger_in_hid_field = false, true_pad = false;
+       int r;
+       int prev_collection = -1;
+ 
+@@ -2736,6 +2732,8 @@ void wacom_wac_report(struct hid_device
+                       pen_in_hid_field = true;
+               if (WACOM_FINGER_FIELD(field))
+                       finger_in_hid_field = true;
++              if (wacom_equivalent_usage(field->physical) == HID_DG_TABLETFUNCTIONKEY)
++                      true_pad = true;
+       }
+ 
+       wacom_wac_battery_pre_report(hdev, report);
+@@ -2759,6 +2757,9 @@ void wacom_wac_report(struct hid_device
+       }
+ 
+       wacom_wac_battery_report(hdev, report);
++
++      if (true_pad && wacom->wacom_wac.pad_input)
++              wacom_wac_pad_report(hdev, report, field);
+ }
+ 
+ static int wacom_bpt_touch(struct wacom_wac *wacom)