From: Andrew Duggan <aduggan@synaptics.com>
To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Andrew Duggan <aduggan@synaptics.com>, Jiri Kosina <jikos@kernel.org>,
        Benjamin Tissoires <benjamin.tissoires@redhat.com>,
        Dmitry Torokhov <dmitry.torokhov@gmail.com>,
        Cameron Gutman <aicommander@gmail.com>,
        Thorsten Leemhuis <linux@leemhuis.info>,
        Christopher Heiny <cheiny@synaptics.com>,
        Nick Dyer <nick@shmanahar.org>
Subject: [PATCH] Input: synaptics-rmi4 - Report slot as inactive when contact is a palm
Date: Thu, 16 Mar 2017 16:56:31 -0700
Message-Id: <1489708591-4320-1-git-send-email-aduggan@synaptics.com>
MIME-Version: 1.0
Content-Type: text/plain
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Mar 2017 23:56:51.6997 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB2041
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1202
Lines: 29

When the firmware identifies a contact as a palm the driver sets the tool
type to MT_TOOL_PALM, but sets the slot state as active. Reporting the
palm as active results in userspace input libraries considering the palm
as a valid contact. Touchpads which previously were using hid-multitouch
are now not suppressing palms when switching to the RMI4 driver. This
change fixes palm rejection when using the RMI4 driver.

Signed-off-by: Andrew Duggan <aduggan@synaptics.com>
Tested-by: Cameron Gutman <aicommander@gmail.com>
---
 drivers/input/rmi4/rmi_2d_sensor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/input/rmi4/rmi_2d_sensor.c b/drivers/input/rmi4/rmi_2d_sensor.c
index 8bb866c..8d1f295 100644
--- a/drivers/input/rmi4/rmi_2d_sensor.c
+++ b/drivers/input/rmi4/rmi_2d_sensor.c
@@ -80,7 +80,8 @@ void rmi_2d_sensor_abs_report(struct rmi_2d_sensor *sensor,
 		input_mt_slot(input, slot);
 
 	input_mt_report_slot_state(input, obj->mt_tool,
-				   obj->type != RMI_2D_OBJECT_NONE);
+				   (obj->type != RMI_2D_OBJECT_NONE)
+				   && (obj->type != RMI_2D_OBJECT_PALM));
 
 	if (obj->type != RMI_2D_OBJECT_NONE) {
 		obj->x = sensor->tracking_pos[slot].x;
-- 
2.7.4