LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Henrik Rydberg <rydberg@bitmath.org>,
	Hans de Goede <hdegoede@redhat.com>,
	Peter Hutterer <peter.hutterer@redhat.com>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] Revert "Revert "Input: synaptics - use dmax in input_mt_assign_slots""
Date: Mon, 30 Mar 2015 18:09:27 -0400	[thread overview]
Message-ID: <1427753368-2795-3-git-send-email-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <1427753368-2795-1-git-send-email-benjamin.tissoires@redhat.com>

This reverts commit 09d042a2eb90 ("Revert "Input: synaptics - use dmax in input_mt_assign_slots"")

Now that balanced slots assignments seem to be fixed, let's
reenable the use in synaptics.c and wait for users to complain
if there are still problems.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
 drivers/input/mouse/synaptics.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 1d3d11d..02a12b694 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -67,6 +67,9 @@
 #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
  ****************************************************************************/
@@ -922,7 +925,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, 0);
+	input_mt_assign_slots(dev, slot, pos, nsemi, DMAX * priv->x_res);
 
 	for (i = 0; i < nsemi; i++) {
 		input_mt_slot(dev, slot[i]);
-- 
2.3.4


  parent reply	other threads:[~2015-03-30 22:10 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-30 22:09 [PATCH 0/3] Balanced slots, attempt #2 Benjamin Tissoires
2015-03-30 22:09 ` [PATCH 1/3] Input: mt - prevent balanced slot assignment to assign twice the slot Benjamin Tissoires
2015-03-31  7:24   ` Henrik Rydberg
2015-03-31 14:58     ` Benjamin Tissoires
2015-03-30 22:09 ` Benjamin Tissoires [this message]
2015-03-30 22:09 ` [PATCH 3/3] Input: synaptics - allocate 3 slots to keep stability in image sensors Benjamin Tissoires
2015-03-31  7:11 ` [PATCH 0/3] Balanced slots, attempt #2 Hans de Goede

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1427753368-2795-3-git-send-email-benjamin.tissoires@redhat.com \
    --to=benjamin.tissoires@redhat.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=hdegoede@redhat.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peter.hutterer@redhat.com \
    --cc=rydberg@bitmath.org \
    --subject='Re: [PATCH 2/3] Revert "Revert "Input: synaptics - use dmax in input_mt_assign_slots""' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).