diff options
author | Daniel Martin <consume.noise@gmail.com> | 2015-03-09 01:28:40 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-03-09 02:32:19 -0400 |
commit | ac097930f0730a9b777737de2b51e0fc49d2be7a (patch) | |
tree | bdf1e4d796772fa80910a8474d19be60b426e732 /drivers/input | |
parent | 9aff65982d0f58a78a27769fba7e97bc937b2593 (diff) |
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: 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>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/mouse/synaptics.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 47c5dca20a60..87c37f745b92 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c | |||
@@ -368,8 +368,14 @@ static int synaptics_resolution(struct psmouse *psmouse) | |||
368 | } | 368 | } |
369 | } | 369 | } |
370 | 370 | ||
371 | if (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 && | 371 | if (SYN_CAP_MIN_DIMENSIONS(priv->ext_cap_0c) && |
372 | SYN_CAP_MIN_DIMENSIONS(priv->ext_cap_0c)) { | 372 | (SYN_EXT_CAP_REQUESTS(priv->capabilities) >= 7 || |
373 | /* | ||
374 | * Firmware v8.1 does not report proper number of extended | ||
375 | * capabilities, but has been proven to report correct min | ||
376 | * coordinates. | ||
377 | */ | ||
378 | SYN_ID_FULL(priv->identity) == 0x801)) { | ||
373 | if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MIN_COORDS, resp)) { | 379 | if (synaptics_send_cmd(psmouse, SYN_QUE_EXT_MIN_COORDS, resp)) { |
374 | psmouse_warn(psmouse, | 380 | psmouse_warn(psmouse, |
375 | "device claims to have min coordinates query, but I'm not able to read it.\n"); | 381 | "device claims to have min coordinates query, but I'm not able to read it.\n"); |