|
@@ -1,6 +1,6 @@
|
|
-From 80e5b85c3ab5604b233e4f4ad3f826ce309c26d7 Mon Sep 17 00:00:00 2001
|
|
|
|
-From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
|
-Date: Tue, 11 Jun 2019 21:47:19 +0200
|
|
|
|
|
|
+From cb4ccf8470366106d240cad5afc4a8fc5d1c577b Mon Sep 17 00:00:00 2001
|
|
|
|
+From: Jake Day <jake@ninebysix.com>
|
|
|
|
+Date: Wed, 26 Jun 2019 20:43:20 -0400
|
|
Subject: [PATCH 05/11] ipts
|
|
Subject: [PATCH 05/11] ipts
|
|
|
|
|
|
---
|
|
---
|
|
@@ -1222,7 +1222,7 @@ index 4a9f139e7b73..a800b93cf33d 100644
|
|
|
|
|
|
static void pch_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
static void pch_enable_backlight(const struct intel_crtc_state *crtc_state,
|
|
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
|
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
|
|
-index 2faf5421fdd0..831617c386e6 100644
|
|
|
|
|
|
+index 184e49036e1d..0f4ab4776c25 100644
|
|
--- a/drivers/hid/hid-multitouch.c
|
|
--- a/drivers/hid/hid-multitouch.c
|
|
+++ b/drivers/hid/hid-multitouch.c
|
|
+++ b/drivers/hid/hid-multitouch.c
|
|
@@ -173,6 +173,7 @@ struct mt_device {
|
|
@@ -173,6 +173,7 @@ struct mt_device {
|
|
@@ -1233,7 +1233,7 @@ index 2faf5421fdd0..831617c386e6 100644
|
|
|
|
|
|
/* classes of device behavior */
|
|
/* classes of device behavior */
|
|
#define MT_CLS_DEFAULT 0x0001
|
|
#define MT_CLS_DEFAULT 0x0001
|
|
-@@ -792,8 +793,11 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
|
|
|
|
|
+@@ -799,8 +800,11 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
|
app->scantime_logical_max = field->logical_maximum;
|
|
app->scantime_logical_max = field->logical_maximum;
|
|
return 1;
|
|
return 1;
|
|
case HID_DG_CONTACTCOUNT:
|
|
case HID_DG_CONTACTCOUNT:
|
|
@@ -1247,7 +1247,7 @@ index 2faf5421fdd0..831617c386e6 100644
|
|
return 1;
|
|
return 1;
|
|
case HID_DG_AZIMUTH:
|
|
case HID_DG_AZIMUTH:
|
|
/*
|
|
/*
|
|
-@@ -1283,9 +1287,11 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
|
|
|
|
|
+@@ -1290,9 +1294,11 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
|
field->application != HID_DG_TOUCHSCREEN &&
|
|
field->application != HID_DG_TOUCHSCREEN &&
|
|
field->application != HID_DG_PEN &&
|
|
field->application != HID_DG_PEN &&
|
|
field->application != HID_DG_TOUCHPAD &&
|
|
field->application != HID_DG_TOUCHPAD &&
|
|
@@ -1259,7 +1259,7 @@ index 2faf5421fdd0..831617c386e6 100644
|
|
field->application != HID_GD_WIRELESS_RADIO_CTLS &&
|
|
field->application != HID_GD_WIRELESS_RADIO_CTLS &&
|
|
field->application != HID_GD_SYSTEM_MULTIAXIS &&
|
|
field->application != HID_GD_SYSTEM_MULTIAXIS &&
|
|
!(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&
|
|
!(field->application == HID_VD_ASUS_CUSTOM_MEDIA_KEYS &&
|
|
-@@ -1330,6 +1336,14 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
|
|
|
|
|
|
+@@ -1337,6 +1343,14 @@ static int mt_input_mapped(struct hid_device *hdev, struct hid_input *hi,
|
|
struct mt_device *td = hid_get_drvdata(hdev);
|
|
struct mt_device *td = hid_get_drvdata(hdev);
|
|
struct mt_report_data *rdata;
|
|
struct mt_report_data *rdata;
|
|
|
|
|
|
@@ -1274,7 +1274,7 @@ index 2faf5421fdd0..831617c386e6 100644
|
|
rdata = mt_find_report_data(td, field->report);
|
|
rdata = mt_find_report_data(td, field->report);
|
|
if (rdata && rdata->is_mt_collection) {
|
|
if (rdata && rdata->is_mt_collection) {
|
|
/* We own these mappings, tell hid-input to ignore them */
|
|
/* We own these mappings, tell hid-input to ignore them */
|
|
-@@ -1555,12 +1569,13 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
|
|
|
|
|
|
+@@ -1562,12 +1576,13 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
|
|
/* already handled by hid core */
|
|
/* already handled by hid core */
|
|
break;
|
|
break;
|
|
case HID_DG_TOUCHSCREEN:
|
|
case HID_DG_TOUCHSCREEN:
|
|
@@ -1289,7 +1289,7 @@ index 2faf5421fdd0..831617c386e6 100644
|
|
break;
|
|
break;
|
|
case HID_VD_ASUS_CUSTOM_MEDIA_KEYS:
|
|
case HID_VD_ASUS_CUSTOM_MEDIA_KEYS:
|
|
suffix = "Custom Media Keys";
|
|
suffix = "Custom Media Keys";
|
|
-@@ -1677,6 +1692,7 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
|
|
|
|
|
+@@ -1684,6 +1699,7 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
|
td->hdev = hdev;
|
|
td->hdev = hdev;
|
|
td->mtclass = *mtclass;
|
|
td->mtclass = *mtclass;
|
|
td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN;
|
|
td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN;
|
|
@@ -6170,5 +6170,5 @@ index 000000000000..f329bbfb8079
|
|
+
|
|
+
|
|
+#endif // INTEL_IPTS_IF_H
|
|
+#endif // INTEL_IPTS_IF_H
|
|
--
|
|
--
|
|
-2.22.0
|
|
|
|
|
|
+2.19.1
|
|
|
|
|