6.2-stable patches

added patches:
	hid-wacom-insert-timestamp-to-packed-bluetooth-bt-events.patch
	hid-wacom-set-a-default-resolution-for-older-tablets.patch

diff --git a/queue-6.2/hid-wacom-insert-timestamp-to-packed-bluetooth-bt-events.patch b/queue-6.2/hid-wacom-insert-timestamp-to-packed-bluetooth-bt-events.patch
new file mode 100644 (file)
index 0000000..3841763
--- /dev/null
+++ b/queue-6.2/hid-wacom-insert-timestamp-to-packed-bluetooth-bt-events.patch
@@ -0,0 +1,109 @@
+From 17d793f3ed53080dab6bbeabfc82de890c901001 Mon Sep 17 00:00:00 2001
+From: Ping Cheng <pinglinux@gmail.com>
+Date: Fri, 24 Feb 2023 08:26:43 -0800
+Subject: HID: wacom: insert timestamp to packed Bluetooth (BT) events
+
+From: Ping Cheng <pinglinux@gmail.com>
+
+commit 17d793f3ed53080dab6bbeabfc82de890c901001 upstream.
+
+To fully utilize the BT polling/refresh rate, a few input events
+are sent together to reduce event delay. This causes issue to the
+timestamp generated by input_sync since all the events in the same
+packet would pretty much have the same timestamp. This patch inserts
+time interval to the events by averaging the total time used for
+sending the packet.
+
+This decision was mainly based on observing the actual time interval
+between each BT polling. The interval doesn't seem to be constant,
+due to the network and system environment. So, using solutions other
+than averaging doesn't end up with valid timestamps.
+
+Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
+Reviewed-by: Jason Gerecke <jason.gerecke@wacom.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/hid/wacom_wac.c |   26 ++++++++++++++++++++++++++
+ drivers/hid/wacom_wac.h |    1 +
+ 2 files changed, 27 insertions(+)
+
+--- a/drivers/hid/wacom_wac.c
++++ b/drivers/hid/wacom_wac.c
+@@ -1308,6 +1308,9 @@ static void wacom_intuos_pro2_bt_pen(str
+ 
+       struct input_dev *pen_input = wacom->pen_input;
+       unsigned char *data = wacom->data;
++      int number_of_valid_frames = 0;
++      int time_interval = 15000000;
++      ktime_t time_packet_received = ktime_get();
+       int i;
+ 
+       if (wacom->features.type == INTUOSP2_BT ||
+@@ -1328,12 +1331,30 @@ static void wacom_intuos_pro2_bt_pen(str
+               wacom->id[0] |= (wacom->serial[0] >> 32) & 0xFFFFF;
+       }
+ 
++      /* number of valid frames */
+       for (i = 0; i < pen_frames; i++) {
+               unsigned char *frame = &data[i*pen_frame_len + 1];
+               bool valid = frame[0] & 0x80;
++
++              if (valid)
++                      number_of_valid_frames++;
++      }
++
++      if (number_of_valid_frames) {
++              if (wacom->hid_data.time_delayed)
++                      time_interval = ktime_get() - wacom->hid_data.time_delayed;
++              time_interval /= number_of_valid_frames;
++              wacom->hid_data.time_delayed = time_packet_received;
++      }
++
++      for (i = 0; i < number_of_valid_frames; i++) {
++              unsigned char *frame = &data[i*pen_frame_len + 1];
++              bool valid = frame[0] & 0x80;
+               bool prox = frame[0] & 0x40;
+               bool range = frame[0] & 0x20;
+               bool invert = frame[0] & 0x10;
++              int frames_number_reversed = number_of_valid_frames - i - 1;
++              int event_timestamp = time_packet_received - frames_number_reversed * time_interval;
+ 
+               if (!valid)
+                       continue;
+@@ -1346,6 +1367,7 @@ static void wacom_intuos_pro2_bt_pen(str
+                       wacom->tool[0] = 0;
+                       wacom->id[0] = 0;
+                       wacom->serial[0] = 0;
++                      wacom->hid_data.time_delayed = 0;
+                       return;
+               }
+ 
+@@ -1382,6 +1404,7 @@ static void wacom_intuos_pro2_bt_pen(str
+                                                get_unaligned_le16(&frame[11]));
+                       }
+               }
++
+               if (wacom->tool[0]) {
+                       input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));
+                       if (wacom->features.type == INTUOSP2_BT ||
+@@ -1405,6 +1428,9 @@ static void wacom_intuos_pro2_bt_pen(str
+ 
+               wacom->shared->stylus_in_proximity = prox;
+ 
++              /* add timestamp to unpack the frames */
++              input_set_timestamp(pen_input, event_timestamp);
++
+               input_sync(pen_input);
+       }
+ }
+--- a/drivers/hid/wacom_wac.h
++++ b/drivers/hid/wacom_wac.h
+@@ -324,6 +324,7 @@ struct hid_data {
+       int ps_connected;
+       bool pad_input_event_flag;
+       unsigned short sequence_number;
++      int time_delayed;
+ };
+ 
+ struct wacom_remote_data {

diff --git a/queue-6.2/hid-wacom-set-a-default-resolution-for-older-tablets.patch b/queue-6.2/hid-wacom-set-a-default-resolution-for-older-tablets.patch
new file mode 100644 (file)
index 0000000..9602741
--- /dev/null
+++ b/queue-6.2/hid-wacom-set-a-default-resolution-for-older-tablets.patch
@@ -0,0 +1,48 @@
+From 08a46b4190d345544d04ce4fe2e1844b772b8535 Mon Sep 17 00:00:00 2001
+From: Ping Cheng <pinglinux@gmail.com>
+Date: Sun, 9 Apr 2023 09:42:29 -0700
+Subject: HID: wacom: Set a default resolution for older tablets
+
+From: Ping Cheng <pinglinux@gmail.com>
+
+commit 08a46b4190d345544d04ce4fe2e1844b772b8535 upstream.
+
+Some older tablets may not report physical maximum for X/Y
+coordinates. Set a default to prevent undefined resolution.
+
+Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
+Link: https://lore.kernel.org/r/20230409164229.29777-1-ping.cheng@wacom.com
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/hid/wacom_wac.c |   12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+--- a/drivers/hid/wacom_wac.c
++++ b/drivers/hid/wacom_wac.c
+@@ -1895,6 +1895,7 @@ static void wacom_map_usage(struct input
+       int fmax = field->logical_maximum;
+       unsigned int equivalent_usage = wacom_equivalent_usage(usage->hid);
+       int resolution_code = code;
++      int resolution = hidinput_calc_abs_res(field, resolution_code);
+ 
+       if (equivalent_usage == HID_DG_TWIST) {
+               resolution_code = ABS_RZ;
+@@ -1915,8 +1916,15 @@ static void wacom_map_usage(struct input
+       switch (type) {
+       case EV_ABS:
+               input_set_abs_params(input, code, fmin, fmax, fuzz, 0);
+-              input_abs_set_res(input, code,
+-                                hidinput_calc_abs_res(field, resolution_code));
++
++              /* older tablet may miss physical usage */
++              if ((code == ABS_X || code == ABS_Y) && !resolution) {
++                      resolution = WACOM_INTUOS_RES;
++                      hid_warn(input,
++                               "Wacom usage (%d) missing resolution \n",
++                               code);
++              }
++              input_abs_set_res(input, code, resolution);
+               break;
+       case EV_KEY:
+       case EV_MSC:

diff --git a/queue-6.2/series b/queue-6.2/series
index 10c82a83631a62960acc59bc20e4613ced39079d..cb687139539a6226b1367df3602ed4c3c3cbde74 100644 (file)
--- a/queue-6.2/series
+++ b/queue-6.2/series
@@ -204,3 +204,5 @@ drm-amd-pm-avoid-potential-ubsan-issue-on-legacy-asics.patch
 drm-amd-load-mes-microcode-during-early_init.patch
 drm-amd-add-a-new-helper-for-loading-validating-microcode.patch
 drm-amd-use-amdgpu_ucode_-helpers-for-mes.patch
+hid-wacom-set-a-default-resolution-for-older-tablets.patch
+hid-wacom-insert-timestamp-to-packed-bluetooth-bt-events.patch