mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

HID: wacom: Only report rotation for art pen

Browse source 
commit 7ccced33a0 upstream.

The generic routine, wacom_wac_pen_event, turns rotation value 90
degree anti-clockwise before posting the events. This non-zero
event trggers a non-zero ABS_Z event for non art pen tools. However,
HID_DG_TWIST is only supported by art pen.

[jkosina@suse.cz: fix build: add missing brace]
Cc: stable@vger.kernel.org
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>
This commit is contained in:
Ping Cheng 2022-05-13 14:51:56 -07:00 committed by Greg Kroah-Hartman
parent 57f2ee517d
commit 0ba645def7
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/hid/wacom_wac.c
View file

@ -638,9 +638,26 @@ static int wacom_intuos_id_mangle(int tool_id)
return (tool_id & ~0xFFF) << 4 | (tool_id & 0xFFF); return (tool_id & ~0xFFF) << 4 | (tool_id & 0xFFF);
} }
static bool wacom_is_art_pen(int tool_id)
{
bool is_art_pen = false;
switch (tool_id) {
case 0x885: /* Intuos3 Marker Pen */
case 0x804: /* Intuos4/5 13HD/24HD Marker Pen */
case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */
is_art_pen = true;
break;
}
return is_art_pen;
}
static int wacom_intuos_get_tool_type(int tool_id) static int wacom_intuos_get_tool_type(int tool_id)
{ {
int tool_type; int tool_type = BTN_TOOL_PEN;
if (wacom_is_art_pen(tool_id))
return tool_type;
switch (tool_id) { switch (tool_id) {
case 0x812: /* Inking pen */ case 0x812: /* Inking pen */
@ -655,12 +672,9 @@ static int wacom_intuos_get_tool_type(int tool_id)
case 0x852: case 0x852:
case 0x823: /* Intuos3 Grip Pen */ case 0x823: /* Intuos3 Grip Pen */
case 0x813: /* Intuos3 Classic Pen */ case 0x813: /* Intuos3 Classic Pen */
case 0x885: /* Intuos3 Marker Pen */
case 0x802: /* Intuos4/5 13HD/24HD General Pen */ case 0x802: /* Intuos4/5 13HD/24HD General Pen */
case 0x804: /* Intuos4/5 13HD/24HD Marker Pen */
case 0x8e2: /* IntuosHT2 pen */ case 0x8e2: /* IntuosHT2 pen */
case 0x022: case 0x022:
case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */
case 0x10842: /* MobileStudio Pro Pro Pen slim */ case 0x10842: /* MobileStudio Pro Pro Pen slim */
case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */ case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */
case 0x16802: /* Cintiq 13HD Pro Pen */ case 0x16802: /* Cintiq 13HD Pro Pen */
@ -718,10 +732,6 @@ static int wacom_intuos_get_tool_type(int tool_id)
case 0x10902: /* Intuos4/5 13HD/24HD Airbrush */ case 0x10902: /* Intuos4/5 13HD/24HD Airbrush */
tool_type = BTN_TOOL_AIRBRUSH; tool_type = BTN_TOOL_AIRBRUSH;
break; break;
default: /* Unknown tool */
tool_type = BTN_TOOL_PEN;
break;
} }
return tool_type; return tool_type;
} }
@ -2312,6 +2322,9 @@ static void wacom_wac_pen_event(struct hid_device *hdev, struct hid_field *field
} }
return; return;
case HID_DG_TWIST: case HID_DG_TWIST:
/* don't modify the value if the pen doesn't support the feature */
if (!wacom_is_art_pen(wacom_wac->id[0])) return;
/* /*
* Userspace expects pen twist to have its zero point when * Userspace expects pen twist to have its zero point when
* the buttons/finger is on the tablet's left. HID values * the buttons/finger is on the tablet's left. HID values