Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8b609e6 authored by Ping Cheng's avatar Ping Cheng Committed by Greg Kroah-Hartman
Browse files

HID: wacom: Set a default resolution for older tablets 



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: default avatarPing Cheng <ping.cheng@wacom.com>
Link: https://lore.kernel.org/r/20230409164229.29777-1-ping.cheng@wacom.com


Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3decf3a7

drivers/hid/wacom_wac.c

+10 −2
Original line number Diff line number Diff line
@@ -1853,6 +1853,7 @@ static void wacom_map_usage(struct input_dev *input, struct hid_usage *usage, 
	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;
@@ -1875,8 +1876,15 @@ static void wacom_map_usage(struct input_dev *input, struct hid_usage *usage, 
	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:

		input_set_capability(input, EV_KEY, code);