From: Jason Gerecke <killertofu@gmail.com>
Date: Thu, 15 Oct 2015 17:17:06 +0000 (-0700)
Subject: HID: wacom: Report full pressure range for Intuos, Cintiq 13HD Touch
X-Git-Tag: firefly_0821_release~176^2~757^2^10~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8d515fda8946cbfb359dca9d6bd416478f1b45cc;p=firefly-linux-kernel-4.4.55.git

HID: wacom: Report full pressure range for Intuos, Cintiq 13HD Touch

The new Intuos tablets added in eda01da and the Cintiq 13HD Touch added
in b4bf212 are capable of reporting 2048 levels of pressure. Although the
kernel reports the correct range to userspace, an oversight has resulted
in the driver ingoring the 11th pressure bit and only sending pressures
of 0 through 1023.

We could fix this issue by expanding the type check to include these
devices, but it makes much more sense to just have the driver look at
the device's maximum pressure when determining if it should read the
11th bit.

Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 01ff648d6098..7b3784826cce 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -765,7 +765,7 @@ static void wacom_intuos_general(struct wacom_wac *wacom)
 	/* general pen packet */
 	if ((data[1] & 0xb8) == 0xa0) {
 		t = (data[6] << 2) | ((data[7] >> 6) & 3);
-		if (features->type >= INTUOS4S && features->type <= CINTIQ_COMPANION_2) {
+		if (features->pressure_max == 2047) {
 			t = (t << 1) | (data[1] & 1);
 		}
 		input_report_abs(input, ABS_PRESSURE, t);