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

Commit ac097930 authored by Daniel Martin's avatar Daniel Martin Committed by Dmitry Torokhov
Browse files

Input: synaptics - query min dimensions for fw v8.1

Query the min dimensions even if the check
SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 fails, but we know that the
firmware version 8.1 is safe.

With that we don't need quirks for post-2013 models anymore as they expose
correct min and max dimensions.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=91541



Cc: stable@vger.kernel.org
Signed-off-by: default avatarDaniel Martin <consume.noise@gmail.com>
  re-order the tests to check SYN_CAP_MIN_DIMENSIONS even on FW 8.1
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 9aff6598
Loading
Loading
Loading
Loading
+8 −2
Original line number Original line Diff line number Diff line
@@ -368,8 +368,14 @@ static int synaptics_resolution(struct psmouse *psmouse)
		}
		}
	}
	}


	if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 &&
	if (SYN_CAP_MIN_DIMENSIONS(priv->ext_cap_0c) &&
	    SYN_CAP_MIN_DIMENSIONS(priv->ext_cap_0c)) {
	    (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 ||
	     /*
	      * Firmware v8.1 does not report proper number of extended
	      * capabilities, but has been proven to report correct min
	      * coordinates.
	      */
	     SYN_ID_FULL(priv->identity) == 0x801)) {
		if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MIN_COORDS, resp)) {
		if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MIN_COORDS, resp)) {
			psmouse_warn(psmouse,
			psmouse_warn(psmouse,
				     "device claims to have min coordinates query, but I'm not able to read it.\n");
				     "device claims to have min coordinates query, but I'm not able to read it.\n");