From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754286AbbCaPHt (ORCPT ); Tue, 31 Mar 2015 11:07:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41435 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754198AbbCaPHl (ORCPT ); Tue, 31 Mar 2015 11:07:41 -0400 From: Benjamin Tissoires To: Dmitry Torokhov , Henrik Rydberg , Hans de Goede , Peter Hutterer Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] Revert "Revert "Input: synaptics - use dmax in input_mt_assign_slots"" Date: Tue, 31 Mar 2015 11:07:36 -0400 Message-Id: <1427814457-30120-3-git-send-email-benjamin.tissoires@redhat.com> In-Reply-To: <1427814457-30120-1-git-send-email-benjamin.tissoires@redhat.com> References: <1427814457-30120-1-git-send-email-benjamin.tissoires@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Hans de Goede --- changes in v2: - acked by Hans 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