From patchwork Thu Jan 25 19:08:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Niestroj X-Patchwork-Id: 10184741 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0A71F60388 for ; Thu, 25 Jan 2018 19:36:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA83C28962 for ; Thu, 25 Jan 2018 19:35:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF45228A09; Thu, 25 Jan 2018 19:35:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5928928962 for ; Thu, 25 Jan 2018 19:35:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751108AbeAYTf4 (ORCPT ); Thu, 25 Jan 2018 14:35:56 -0500 Received: from smtp.megiteam.pl ([31.186.83.105]:59229 "EHLO smtp.megiteam.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751171AbeAYTf4 (ORCPT ); Thu, 25 Jan 2018 14:35:56 -0500 Received: from [95.143.241.142] (helo=localhost.localdomain) by smtp.megiteam.pl with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1eemt5-0002S9-0p; Thu, 25 Jan 2018 20:08:39 +0100 From: Marcin Niestroj To: Dmitry Torokhov Cc: Bastien Nocera , Antonio Ospite , linux-input@vger.kernel.org, Marcin Niestroj Subject: [PATCH v3 2/3] Input: goodix - fix simultaneous axes inversion and swap Date: Thu, 25 Jan 2018 20:08:28 +0100 Message-Id: <20180125190829.8968-3-m.niestroj@grinn-global.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180125190829.8968-1-m.niestroj@grinn-global.com> References: <20180125190829.8968-1-m.niestroj@grinn-global.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP goodix_ts_data structure contains abs_x_max and abs_y_max members, which contain already swapped maximum ranges. That causes reporting touch events with invalid position (out of range values). Problem occurs for example when ts->inverted_x and ts->swapped_x_y are true, but ts->inverted_y is false. Assuming we have 720x1280 touch panel, ts->abs_x_max == 1279 and ts->abs_y_max == 719 (because we inverted that in goodix_read_config()). Now let's assume that we received event from (0:0) position (in touch panel original coordinates). In function goodix_ts_report_touch() we calculate input_x as 1279, but after swapping input_y takes that value (which is more that maximum 719 value reported during initialization). Take into account that abs_x_max and abs_y_max are already swapped in goodix_ts_report_touch(), so position for inverted axes will be calculated correctly. Signed-off-by: Marcin Niestroj Fixes: ad48cf5e9597 ("Input: goodix - add axis swapping and axis inversion support") Reviewed-by: Bastien Nocera --- Changes v2 -> v3 (suggested by Bastien): - add explanation about when the problem occurs Changes v1 -> v2 (suggested by Bastien): - patch splitted off from patch 3 drivers/input/touchscreen/goodix.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c index 7896097ca69b..dc832890f6d3 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -296,12 +296,18 @@ static void goodix_ts_report_touch(struct goodix_ts_data *ts, u8 *coor_data) int input_w = get_unaligned_le16(&coor_data[5]); /* Inversions have to happen before axis swapping */ - if (ts->inverted_x) - input_x = ts->abs_x_max - input_x; - if (ts->inverted_y) - input_y = ts->abs_y_max - input_y; - if (ts->swapped_x_y) + if (!ts->swapped_x_y) { + if (ts->inverted_x) + input_x = ts->abs_x_max - input_x; + if (ts->inverted_y) + input_y = ts->abs_y_max - input_y; + } else { + if (ts->inverted_x) + input_x = ts->abs_y_max - input_x; + if (ts->inverted_y) + input_y = ts->abs_x_max - input_y; swap(input_x, input_y); + } input_mt_slot(ts->input_dev, id); input_mt_report_slot_state(ts->input_dev, MT_TOOL_FINGER, true);