| From: Daniel Martin <consume.noise@gmail.com> |
| Date: Sun, 8 Mar 2015 22:28:40 -0700 |
| Subject: Input: synaptics - query min dimensions for fw v8.1 |
| |
| commit ac097930f0730a9b777737de2b51e0fc49d2be7a upstream. |
| |
| 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 |
| |
| Signed-off-by: Daniel Martin <consume.noise@gmail.com> |
| re-order the tests to check SYN_CAP_MIN_DIMENSIONS even on FW 8.1 |
| Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> |
| Acked-by: Hans de Goede <hdegoede@redhat.com> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/input/mouse/synaptics.c | 10 ++++++++-- |
| 1 file changed, 8 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/input/mouse/synaptics.c |
| +++ b/drivers/input/mouse/synaptics.c |
| @@ -274,8 +274,14 @@ static int synaptics_resolution(struct p |
| } |
| } |
| |
| - if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 && |
| - SYN_CAP_MIN_DIMENSIONS(priv->ext_cap_0c)) { |
| + if (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)) { |
| psmouse_warn(psmouse, |
| "device claims to have min coordinates query, but I'm not able to read it.\n"); |
