From patchwork Tue Dec 6 17:38:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen Ballway X-Patchwork-Id: 13066198 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5210CC4708C for ; Tue, 6 Dec 2022 17:40:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233742AbiLFRks (ORCPT ); Tue, 6 Dec 2022 12:40:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235531AbiLFRkZ (ORCPT ); Tue, 6 Dec 2022 12:40:25 -0500 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D51A3C6EB for ; Tue, 6 Dec 2022 09:39:13 -0800 (PST) Received: by mail-pj1-x102a.google.com with SMTP id o12so15110249pjo.4 for ; Tue, 06 Dec 2022 09:39:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=973PYywfBJwx+1YHGPEQhiaFBM29rwzirc5WG9+xT+I=; b=AEComhb/RlxEk4aTrp+LmK6kUTtYReRjP+2zbl0PND/NKS2PmCM9qlMAfr1Ka9o/ir YHtadcFo7hR+s5sW9B3Ip99PLCo8cilwNCZWcdLIXuKrFClTiAOoSLUMmMnSOhmLZdxK +sIjlFXDPGHbma3GhrGLGW5UaYuJQOU4Q1hZ8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=973PYywfBJwx+1YHGPEQhiaFBM29rwzirc5WG9+xT+I=; b=fy3+pL8t8GorAGiNydKewRMvyHNfQ2IjZCifVWuYvGhlkhwv9b23lIAkHEcH4JyLAY WBJy9PbYq61HoPyXqMknjfJDcdW4NqxuSqMTE97LCo4Hfu8f8x3O3J9gL16OkeqSBMyn 0EM0KwVwbzWvPjiNRXobn+m5e0XMFG4fEFXvQjrhAD/5tmEM6Obi0mie9Ux0GgyC8duY m+RhYazxthT1G3/F+2KFYE52FU8mQYVMc2lrcLP5Y2IcLhQxJId5KgYqewfZ22daqiqS JxZvJyOD6XMMHE+JLJhq4xdWY7XkPdROOix9URCVQEXHhBWCClX7m0qRPt+FBDLVdlbg t4eQ== X-Gm-Message-State: ANoB5pnKsDOugWDFEmAgbjcH9oM/qGKtc4t7/t7cEkwZlrKYT+hgEDTw FTk9NOLPKfXghWmEkEAd8Oa03A== X-Google-Smtp-Source: AA0mqf73xZWg2CmIRkzo10HbSDdlWsVdYDyGiq9A4LURVqFGRJVT93ZOx9BYyXjm5shhDMmPeIhYPQ== X-Received: by 2002:a17:90b:19c8:b0:219:aa6a:4fa3 with SMTP id nm8-20020a17090b19c800b00219aa6a4fa3mr17634612pjb.9.1670348352814; Tue, 06 Dec 2022 09:39:12 -0800 (PST) Received: from ballway1.c.googlers.com.com (97.173.125.34.bc.googleusercontent.com. [34.125.173.97]) by smtp.gmail.com with ESMTPSA id b16-20020aa79510000000b00574f83c5d51sm12007886pfp.198.2022.12.06.09.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Dec 2022 09:39:12 -0800 (PST) From: Allen Ballway To: linux-kernel@vger.kernel.org Cc: Dmitry Torokhov , Henrik Rydberg , linux-input@vger.kernel.org, Benjamin Tissoires , Jiri Kosina , Allen Ballway Subject: [PATCH] HID: multitouch: Add quirks for flipped axes Date: Tue, 6 Dec 2022 17:38:52 +0000 Message-Id: <20221206173819.1.I69657e84c0606b2e5ccfa9fedbf42b7676a1e129@changeid> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Certain touchscreen devices, such as the ELAN9034, are oriented incorrectly and report touches on opposite points on the X and Y axes. For example, a 100x200 screen touched at (10,20) would report (90, 180) and vice versa. This is fixed by adding device quirks to transform the touch points into the correct spaces, from X -> MAX(X) - X, and Y -> MAX(Y) - Y. Signed-off-by: Allen Ballway --- drivers/hid/hid-multitouch.c | 46 ++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 91a4d3fc30e08..5e14cc4b00f53 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -71,6 +71,8 @@ MODULE_LICENSE("GPL"); #define MT_QUIRK_SEPARATE_APP_REPORT BIT(19) #define MT_QUIRK_FORCE_MULTI_INPUT BIT(20) #define MT_QUIRK_DISABLE_WAKEUP BIT(21) +#define MT_QUIRK_FLIP_X BIT(22) +#define MT_QUIRK_FLIP_Y BIT(23) #define MT_INPUTMODE_TOUCHSCREEN 0x02 #define MT_INPUTMODE_TOUCHPAD 0x03 @@ -212,6 +214,7 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app); #define MT_CLS_GOOGLE 0x0111 #define MT_CLS_RAZER_BLADE_STEALTH 0x0112 #define MT_CLS_SMART_TECH 0x0113 +#define MT_CLS_ELAN_FLIPPED 0x0114 #define MT_DEFAULT_MAXCONTACT 10 #define MT_MAX_MAXCONTACT 250 @@ -396,6 +399,17 @@ static const struct mt_class mt_classes[] = { MT_QUIRK_CONTACT_CNT_ACCURATE | MT_QUIRK_SEPARATE_APP_REPORT, }, + { .name = MT_CLS_ELAN_FLIPPED, + .quirks = MT_QUIRK_ALWAYS_VALID | + MT_QUIRK_IGNORE_DUPLICATES | + MT_QUIRK_HOVERING | + MT_QUIRK_CONTACT_CNT_ACCURATE | + MT_QUIRK_STICKY_FINGERS | + MT_QUIRK_WIN8_PTP_BUTTONS | + MT_QUIRK_FLIP_X | + MT_QUIRK_FLIP_Y, + .export_all_inputs = true }, + { } }; @@ -1115,10 +1129,30 @@ static int mt_process_slot(struct mt_device *td, struct input_dev *input, minor = minor >> 1; } - input_event(input, EV_ABS, ABS_MT_POSITION_X, *slot->x); - input_event(input, EV_ABS, ABS_MT_POSITION_Y, *slot->y); - input_event(input, EV_ABS, ABS_MT_TOOL_X, *slot->cx); - input_event(input, EV_ABS, ABS_MT_TOOL_Y, *slot->cy); + if (quirks & MT_QUIRK_FLIP_X) { + /* Inputs with a flipped X axis need to report MAX - X */ + int x = input_abs_get_max(input, ABS_MT_POSITION_X) - *slot->x; + int cx = input_abs_get_max(input, ABS_MT_TOOL_X) - *slot->cx; + + input_event(input, EV_ABS, ABS_MT_POSITION_X, x); + input_event(input, EV_ABS, ABS_MT_TOOL_X, cx); + } else { + input_event(input, EV_ABS, ABS_MT_POSITION_X, *slot->x); + input_event(input, EV_ABS, ABS_MT_TOOL_X, *slot->cx); + } + + if (quirks & MT_QUIRK_FLIP_Y) { + /* Inputs with a flipped Y axis need to report MAX - Y */ + int y = input_abs_get_max(input, ABS_MT_POSITION_Y) - *slot->y; + int cy = input_abs_get_max(input, ABS_MT_TOOL_Y) - *slot->cy; + + input_event(input, EV_ABS, ABS_MT_POSITION_Y, y); + input_event(input, EV_ABS, ABS_MT_TOOL_Y, cy); + } else { + input_event(input, EV_ABS, ABS_MT_POSITION_Y, *slot->y); + input_event(input, EV_ABS, ABS_MT_TOOL_Y, *slot->cy); + } + input_event(input, EV_ABS, ABS_MT_DISTANCE, !*slot->tip_state); input_event(input, EV_ABS, ABS_MT_ORIENTATION, orientation); input_event(input, EV_ABS, ABS_MT_PRESSURE, *slot->p); @@ -1963,6 +1997,10 @@ static const struct hid_device_id mt_devices[] = { USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_C002) }, /* Elan devices */ + { .driver_data = MT_CLS_ELAN_FLIPPED, + HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, + USB_VENDOR_ID_ELAN, 0x2dcd) }, + { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT, HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, USB_VENDOR_ID_ELAN, 0x313a) },