1 files changed, 26 insertions, 11 deletions

diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index 1468f008bfbd..a8a19a5ccee5 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -25,6 +25,10 @@
 #define WACOM_INTUOS_RES        100
 #define WACOM_INTUOS3_RES       200
 
+/* Newer Cintiq and DTU have an offset between tablet and screen areas */
+#define WACOM_DTU_OFFSET        200
+#define WACOM_CINTIQ_OFFSET     400
+
 /*
  * Scale factor relating reported contact size to logical contact area.
  * 2^14/pi is a good approximation on Intuos5 and 3rd-gen Bamboo
@@ -2680,10 +2684,12 @@ static const struct wacom_features wacom_features_0x317 =
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0xF4 =
         { "Wacom Cintiq 24HD", 104280, 65400, 2047, 63,
-          WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
+          WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
 static const struct wacom_features wacom_features_0xF8 =
         { "Wacom Cintiq 24HD touch", 104280, 65400, 2047, 63, /* Pen */
-          WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
+          WACOM_24HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0xf6 };
 static const struct wacom_features wacom_features_0xF6 =
         { "Wacom Cintiq 24HD touch", .type = WACOM_24HDT, /* Touch */
@@ -2700,7 +2706,8 @@ static const struct wacom_features wacom_features_0xC6 =
           WACOM_BEE, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES };
 static const struct wacom_features wacom_features_0x304 =
         { "Wacom Cintiq 13HD", 59352, 33648, 1023, 63,
-          WACOM_13HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
+          WACOM_13HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
 static const struct wacom_features wacom_features_0xC7 =
         { "Wacom DTU1931", 37832, 30305, 511, 0,
           PL, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
@@ -2713,13 +2720,16 @@ static const struct wacom_features wacom_features_0xF0 =
           DTU, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0xFB =
         { "Wacom DTU1031", 22096, 13960, 511, 0,
-          DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
+          DTUS, WACOM_INTUOS_RES, WACOM_INTUOS_RES,
+          WACOM_DTU_OFFSET, WACOM_DTU_OFFSET };
 static const struct wacom_features wacom_features_0x57 =
         { "Wacom DTK2241", 95640, 54060, 2047, 63,
-          DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
+          DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
 static const struct wacom_features wacom_features_0x59 = /* Pen */
         { "Wacom DTH2242", 95640, 54060, 2047, 63,
-          DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
+          DTK, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5D };
 static const struct wacom_features wacom_features_0x5D = /* Touch */
         { "Wacom DTH2242",       .type = WACOM_24HDT,
@@ -2727,13 +2737,16 @@ static const struct wacom_features wacom_features_0x5D = /* Touch */
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0xCC =
         { "Wacom Cintiq 21UX2", 87000, 65400, 2047, 63,
-          WACOM_21UX2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
+          WACOM_21UX2, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
 static const struct wacom_features wacom_features_0xFA =
         { "Wacom Cintiq 22HD", 95640, 54060, 2047, 63,
-          WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200 };
+          WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET };
 static const struct wacom_features wacom_features_0x5B =
         { "Wacom Cintiq 22HDT", 95640, 54060, 2047, 63,
-          WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
+          WACOM_22HD, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x5e };
 static const struct wacom_features wacom_features_0x5E =
         { "Wacom Cintiq 22HDT", .type = WACOM_24HDT,
@@ -2879,7 +2892,8 @@ static const struct wacom_features wacom_features_0x6004 =
           TABLETPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x307 =
         { "Wacom ISDv5 307", 59352, 33648, 2047, 63,
-          CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
+          CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x309 };
 static const struct wacom_features wacom_features_0x309 =
         { "Wacom ISDv5 309", .type = WACOM_24HDT, /* Touch */
@@ -2887,7 +2901,8 @@ static const struct wacom_features wacom_features_0x309 =
           .check_for_hid_type = true, .hid_type = HID_TYPE_USBNONE };
 static const struct wacom_features wacom_features_0x30A =
         { "Wacom ISDv5 30A", 59352, 33648, 2047, 63,
-          CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 200, 200,
+          CINTIQ_HYBRID, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES,
+          WACOM_CINTIQ_OFFSET, WACOM_CINTIQ_OFFSET,
           .oVid = USB_VENDOR_ID_WACOM, .oPid = 0x30C };
 static const struct wacom_features wacom_features_0x30C =
         { "Wacom ISDv5 30C", .type = WACOM_24HDT, /* Touch */