From patchwork Sat Jun 6 03:50:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 207783 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 966E1C433E0 for ; Sat, 6 Jun 2020 04:00:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7575D20723 for ; Sat, 6 Jun 2020 04:00:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725864AbgFFEAl (ORCPT ); Sat, 6 Jun 2020 00:00:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725791AbgFFEAk (ORCPT ); Sat, 6 Jun 2020 00:00:40 -0400 X-Greylist: delayed 401 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Fri, 05 Jun 2020 21:00:40 PDT Received: from gnutoo.cyberdimension.org (cyberdimension.org [IPv6:2001:910:1314:ffff::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F176C08C5C2 for ; Fri, 5 Jun 2020 21:00:39 -0700 (PDT) Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id 5a29ae10; Sat, 6 Jun 2020 03:50:12 +0000 (UTC) Received: from primarylaptop.localdomain (localhost.localdomain [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id a97d4652; Sat, 6 Jun 2020 03:50:12 +0000 (UTC) From: Denis 'GNUtoo' Carikli To: Dmitry Torokhov Cc: Henrik Rydberg , Andi Shyti , Stephan Gerhold , linux-input@vger.kernel.org, Denis 'GNUtoo' Carikli , Javi Ferrer Subject: [PATCH] Input: mms114: don't report 0 pressure while still tracking contact(s) Date: Sat, 6 Jun 2020 05:50:17 +0200 Message-Id: <20200606035017.7271-1-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org In the middle of a sliding gesture, we manage to have events that look like that: Event: time 1571859641.595517, -------------- SYN_REPORT ------------ Event: time 1571859641.606593, type 3 (EV_ABS), code 54 (ABS_MT_POSITION_Y), value 1193 Event: time 1571859641.606593, type 3 (EV_ABS), code 48 (ABS_MT_TOUCH_MAJOR), value 21 Event: time 1571859641.606593, type 3 (EV_ABS), code 58 (ABS_MT_PRESSURE), value 0 Event: time 1571859641.606593, type 3 (EV_ABS), code 1 (ABS_Y), value 1193 Event: time 1571859641.606593, type 3 (EV_ABS), code 24 (ABS_PRESSURE), value 0 Event: time 1571859641.606593, -------------- SYN_REPORT ------------ In such cases, we still have a valid ABS_MT_TRACKING_ID along with an ABS_MT_TOUCH_MAJOR that is > 0, which both indicates that the sliding is still in progress. However in Documentation/input/multi-touch-protocol.rst, we have: ABS_MT_PRESSURE The pressure, in arbitrary units, on the contact area. May be used instead of TOUCH and WIDTH for pressure-based devices or any device with a spatial signal intensity distribution. Because of that userspace may consider an ABS_MT_PRESSURE of 0 as an indication that the sliding stopped. This has side effects such as making it difficult to unlock the screen under Android. This fix was tested on the following devices: - GT-I9300 with a glass screen protection - GT-I9300 without any screen protection - GT-N7105 with a glass screen protection Reported-by: Javi Ferrer Signed-off-by: Denis 'GNUtoo' Carikli --- drivers/input/touchscreen/mms114.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c index 2ef1adaed9af..adc18cd9a437 100644 --- a/drivers/input/touchscreen/mms114.c +++ b/drivers/input/touchscreen/mms114.c @@ -183,7 +183,10 @@ static void mms114_process_mt(struct mms114_data *data, struct mms114_touch *tou if (touch->pressed) { touchscreen_report_pos(input_dev, &data->props, x, y, true); input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, touch->width); - input_report_abs(input_dev, ABS_MT_PRESSURE, touch->strength); + if (touch->strength) { + input_report_abs(input_dev, ABS_MT_PRESSURE, + touch->strength); + } } }