| Message ID | 20190424221258.19992-1-jason.gerecke@wacom.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | [1/2] HID: wacom: Don't set tool type until we're in range | expand |
I can produce a version of this patch specific to v4.14.113. Please let me know the proper process for submitting such a patch. Jason --- Now instead of four in the eights place / you’ve got three, ‘Cause you added one / (That is to say, eight) to the two, / But you can’t take seven from three, / So you look at the sixty-fours.... On Thu, Apr 25, 2019 at 5:15 AM Sasha Levin <sashal@kernel.org> wrote: > > Hi, > > [This is an automated email] > > This commit has been processed because it contains a "Fixes:" tag, > fixing commit: a48324de6d4d HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range. > > The bot has tested the following trees: v5.0.9, v4.19.36, v4.14.113. > > v5.0.9: Build OK! > v4.19.36: Build OK! > v4.14.113: Failed to apply! Possible dependencies: > Unable to calculate > > > How should we proceed with this patch? > > -- > Thanks, > Sasha
On Thu, Apr 25, 2019 at 10:47:42AM -0700, Jason Gerecke wrote: >I can produce a version of this patch specific to v4.14.113. Please >let me know the proper process for submitting such a patch. Just replying to this mail will do the job, thanks! -- Thanks, Sasha
Haven't heard anything back from you about this patch set, Benjamin. Just making sure it doesn't get lost down a crack :) Jason --- Now instead of four in the eights place / you’ve got three, ‘Cause you added one / (That is to say, eight) to the two, / But you can’t take seven from three, / So you look at the sixty-fours.... On Wed, Apr 24, 2019 at 3:13 PM Gerecke, Jason <killertofu@gmail.com> wrote: > > From: Jason Gerecke <jason.gerecke@wacom.com> > > The serial number and tool type information that is reported by the tablet > while a pen is merely "in prox" instead of fully "in range" can be stale > and cause us to report incorrect tool information. Serial number, tool > type, and other information is only valid once the pen comes fully in range > so we should be careful to not use this information until that point. > > In particular, this issue may cause the driver to incorectly report > BTN_TOOL_RUBBER after switching from the eraser tool back to the pen. > > Fixes: a48324de6d ("HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range") > Cc: <stable@vger.kernel.org> # 4.11+ > Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> > Reviewed-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com> > --- > drivers/hid/wacom_wac.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > index 747730d32ab6..4c1bc239207e 100644 > --- a/drivers/hid/wacom_wac.c > +++ b/drivers/hid/wacom_wac.c > @@ -1236,13 +1236,13 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom) > /* Add back in missing bits of ID for non-USI pens */ > wacom->id[0] |= (wacom->serial[0] >> 32) & 0xFFFFF; > } > - wacom->tool[0] = wacom_intuos_get_tool_type(wacom_intuos_id_mangle(wacom->id[0])); > > for (i = 0; i < pen_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; > > if (!valid) > continue; > @@ -1251,9 +1251,24 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom) > wacom->shared->stylus_in_proximity = false; > wacom_exit_report(wacom); > input_sync(pen_input); > + > + wacom->tool[0] = 0; > + wacom->id[0] = 0; > + wacom->serial[0] = 0; > return; > } > + > if (range) { > + if (!wacom->tool[0]) { /* first in range */ > + /* Going into range select tool */ > + if (invert) > + wacom->tool[0] = BTN_TOOL_RUBBER; > + else if (wacom->id[0]) > + wacom->tool[0] = wacom_intuos_get_tool_type(wacom->id[0]); > + else > + wacom->tool[0] = BTN_TOOL_PEN; > + } > + > input_report_abs(pen_input, ABS_X, get_unaligned_le16(&frame[1])); > input_report_abs(pen_input, ABS_Y, get_unaligned_le16(&frame[3])); > > -- > 2.21.0 >
On Thu, Apr 25, 2019 at 12:13 AM Gerecke, Jason <killertofu@gmail.com> wrote: > > From: Jason Gerecke <jason.gerecke@wacom.com> > > The serial number and tool type information that is reported by the tablet > while a pen is merely "in prox" instead of fully "in range" can be stale > and cause us to report incorrect tool information. Serial number, tool > type, and other information is only valid once the pen comes fully in range > so we should be careful to not use this information until that point. > > In particular, this issue may cause the driver to incorectly report > BTN_TOOL_RUBBER after switching from the eraser tool back to the pen. > > Fixes: a48324de6d ("HID: wacom: Bluetooth IRQ for Intuos Pro should handle prox/range") > Cc: <stable@vger.kernel.org> # 4.11+ > Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com> > Reviewed-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com> > --- Series applied to for-5.2/fixes Sorry for the delay Cheers, Benjamin > drivers/hid/wacom_wac.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c > index 747730d32ab6..4c1bc239207e 100644 > --- a/drivers/hid/wacom_wac.c > +++ b/drivers/hid/wacom_wac.c > @@ -1236,13 +1236,13 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom) > /* Add back in missing bits of ID for non-USI pens */ > wacom->id[0] |= (wacom->serial[0] >> 32) & 0xFFFFF; > } > - wacom->tool[0] = wacom_intuos_get_tool_type(wacom_intuos_id_mangle(wacom->id[0])); > > for (i = 0; i < pen_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; > > if (!valid) > continue; > @@ -1251,9 +1251,24 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom) > wacom->shared->stylus_in_proximity = false; > wacom_exit_report(wacom); > input_sync(pen_input); > + > + wacom->tool[0] = 0; > + wacom->id[0] = 0; > + wacom->serial[0] = 0; > return; > } > + > if (range) { > + if (!wacom->tool[0]) { /* first in range */ > + /* Going into range select tool */ > + if (invert) > + wacom->tool[0] = BTN_TOOL_RUBBER; > + else if (wacom->id[0]) > + wacom->tool[0] = wacom_intuos_get_tool_type(wacom->id[0]); > + else > + wacom->tool[0] = BTN_TOOL_PEN; > + } > + > input_report_abs(pen_input, ABS_X, get_unaligned_le16(&frame[1])); > input_report_abs(pen_input, ABS_Y, get_unaligned_le16(&frame[3])); > > -- > 2.21.0 >
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 747730d32ab6..4c1bc239207e 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -1236,13 +1236,13 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom) /* Add back in missing bits of ID for non-USI pens */ wacom->id[0] |= (wacom->serial[0] >> 32) & 0xFFFFF; } - wacom->tool[0] = wacom_intuos_get_tool_type(wacom_intuos_id_mangle(wacom->id[0])); for (i = 0; i < pen_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; if (!valid) continue; @@ -1251,9 +1251,24 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom) wacom->shared->stylus_in_proximity = false; wacom_exit_report(wacom); input_sync(pen_input); + + wacom->tool[0] = 0; + wacom->id[0] = 0; + wacom->serial[0] = 0; return; } + if (range) { + if (!wacom->tool[0]) { /* first in range */ + /* Going into range select tool */ + if (invert) + wacom->tool[0] = BTN_TOOL_RUBBER; + else if (wacom->id[0]) + wacom->tool[0] = wacom_intuos_get_tool_type(wacom->id[0]); + else + wacom->tool[0] = BTN_TOOL_PEN; + } + input_report_abs(pen_input, ABS_X, get_unaligned_le16(&frame[1])); input_report_abs(pen_input, ABS_Y, get_unaligned_le16(&frame[3]));