summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-11 09:19:42 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-11 09:19:42 -0400
commit00acd3eec4ed22578b1930a8c500ff17ffe8fc0d (patch)
tree66300cc52306dfa84f51750c1fa175cd015bec4c
parent80e48d0c7e8aced5df19d369961137f58ba97811 (diff)
downloadkernel-00acd3eec4ed22578b1930a8c500ff17ffe8fc0d.tar.gz
kernel-00acd3eec4ed22578b1930a8c500ff17ffe8fc0d.tar.xz
kernel-00acd3eec4ed22578b1930a8c500ff17ffe8fc0d.zip
Revert synaptics patch
Benjamin says this hurts more than it helps
-rw-r--r--Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch35
-rw-r--r--kernel.spec2
2 files changed, 37 insertions, 0 deletions
diff --git a/Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch b/Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch
new file mode 100644
index 000000000..a49f79957
--- /dev/null
+++ b/Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch
@@ -0,0 +1,35 @@
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Wed, 11 Mar 2015 09:14:03 -0400
+Subject: [PATCH] Revert "Input: synaptics - use dmax in input_mt_assign_slots"
+
+This reverts commit 6ab17a8484f03c188a93713369912f1545eb26e9.
+---
+ drivers/input/mouse/synaptics.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
+index c74bfa1c05e3..dda605836546 100644
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -67,9 +67,6 @@
+ #define X_MAX_POSITIVE 8176
+ #define Y_MAX_POSITIVE 8176
+
+-/* maximum ABS_MT_POSITION displacement (in mm) */
+-#define DMAX 10
+-
+ /*****************************************************************************
+ * Stuff we need even when we do not want native Synaptics support
+ ****************************************************************************/
+@@ -915,7 +912,7 @@ static void synaptics_report_mt_data(struct psmouse *psmouse,
+ pos[i].y = synaptics_invert_y(hw[i]->y);
+ }
+
+- input_mt_assign_slots(dev, slot, pos, nsemi, DMAX * priv->x_res);
++ input_mt_assign_slots(dev, slot, pos, nsemi, 0);
+
+ for (i = 0; i < nsemi; i++) {
+ input_mt_slot(dev, slot[i]);
+--
+2.1.0
+
diff --git a/kernel.spec b/kernel.spec
index 39825a414..6a3bfbfff 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -649,6 +649,7 @@ Patch26160: Input-synaptics-remove-TOPBUTTONPAD-property-for-Len.patch
Patch26161: Input-synaptics-re-route-tracksticks-buttons-on-the-.patch
Patch26162: Input-synaptics-remove-X1-Carbon-3rd-gen-from-the-to.patch
Patch26163: Input-synaptics-remove-X250-from-the-topbuttonpad-li.patch
+Patch26164: Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1403,6 +1404,7 @@ ApplyPatch Input-synaptics-remove-TOPBUTTONPAD-property-for-Len.patch
ApplyPatch Input-synaptics-re-route-tracksticks-buttons-on-the-.patch
ApplyPatch Input-synaptics-remove-X1-Carbon-3rd-gen-from-the-to.patch
ApplyPatch Input-synaptics-remove-X250-from-the-topbuttonpad-li.patch
+ApplyPatch Revert-Input-synaptics-use-dmax-in-input_mt_assign_s.patch
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch