Commit 7f29f17b authored by Éric Piel's avatar Éric Piel Committed by Dmitry Torokhov
Browse files

Input: elantech - discard the first 2 positions on some firmwares 



According to the Dell/Ubuntu driver, what was previously observed as
"jumpy cursor" corresponds to the hardware sending incorrect data for
the first two reports of a one touch finger. So let's use the same
workaround as in the other driver. Also, detect another firmware
version with the same behaviour, as in the other driver.

Signed-off-by: default avatarÉric Piel <eric.piel@tremplin-utc.net>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 7be3c134

drivers/input/mouse/elantech.c

+10 −11
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse) 
	struct elantech_data *etd = psmouse->private;

	unsigned char *packet = psmouse->packet;

	int fingers;

	static int old_fingers;



	if (etd->fw_version < 0x020000) {

		/*
@@ -203,10 +202,13 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse) 
	}



	if (etd->jumpy_cursor) {

		/* Discard packets that are likely to have bogus coordinates */

		if (fingers > old_fingers) {

		if (fingers != 1) {

			etd->single_finger_reports = 0;

		} else if (etd->single_finger_reports < 2) {

			/* Discard first 2 reports of one finger, bogus */

			etd->single_finger_reports++;

			elantech_debug("discarding packet\n");

			goto discard_packet_v1;

			return;

		}

	}
@@ -238,9 +240,6 @@ static void elantech_report_absolute_v1(struct psmouse *psmouse) 
	}



	input_sync(dev);



 discard_packet_v1:

	old_fingers = fingers;

}



/*
@@ -733,13 +732,13 @@ int elantech_init(struct psmouse *psmouse) 
	etd->capabilities = param[0];



	/*

	 * This firmware seems to suffer from misreporting coordinates when

	 * This firmware suffers from misreporting coordinates when

	 * a touch action starts causing the mouse cursor or scrolled page

	 * to jump. Enable a workaround.

	 */

	if (etd->fw_version == 0x020022) {

		pr_info("firmware version 2.0.34 detected, enabling jumpy cursor workaround\n");

		etd->jumpy_cursor = 1;

	if (etd->fw_version == 0x020022 || etd->fw_version == 0x020600) {

		pr_info("firmware version 2.0.34/2.6.0 detected, enabling jumpy cursor workaround\n");

		etd->jumpy_cursor = true;

	}



	if (elantech_set_absolute_mode(psmouse)) {

drivers/input/mouse/elantech.h

+4 −3
Original line number Diff line number Diff line
@@ -100,10 +100,11 @@ struct elantech_data { 
	unsigned char reg_26;

	unsigned char debug;

	unsigned char capabilities;

	unsigned char paritycheck;

	unsigned char jumpy_cursor;

	bool paritycheck;

	bool jumpy_cursor;

	unsigned char hw_version;

	unsigned int fw_version;

	unsigned int single_finger_reports;

	unsigned char parity[256];

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE