From patchwork Thu Aug 8 11:59:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 13757310 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B2D2AC3DA4A for ; Thu, 8 Aug 2024 11:59:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F3F2610E70C; Thu, 8 Aug 2024 11:59:40 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=live.com header.i=@live.com header.b="qjqXmB+G"; dkim-atps=neutral Received: from IND01-BMX-obe.outbound.protection.outlook.com (mail-bmxind01olkn2080.outbound.protection.outlook.com [40.92.103.80]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6369410E6EE for ; Thu, 8 Aug 2024 11:59:39 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BKnkKVIfrlN/QnuWgO/xQRvYPaDNsxN8ewzFadNd7BgT3eI0cItMVUTvZNziAn1BP+B7IyGZgCcHuQXwZgsVkH+PncB3UkEkKfhZ93TlSUjI+mN4TxgWFifIu9EuiBaRdhtHM4HU2zt65+JADDXiXJy8/biMg/LE7PDNLZHDYZVPUd4TlrSA/oZ8N4V2E5fQQ0Z+VhAljNrIHDcHfEyIjxFpfZRWtmLUw8zIx4SgQc+JBzbUsvZzE/xg/97PD7iSWUxi0Pddm/DE/C7dgOizNzBDib7BGslonP6FiNXx4VRkaOkDuGci2eWUkX7QWdfF8WI+TAJ+3RsDj8miMKDlFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cIBzWghiSd/94g2S+ca6KQlE54fye1PXtvDLmTaqqw4=; b=X1jVWux/yAfmzKMS1iBEoKqlS4Qcfr9BNeuHbo4cIWE6s/ud9cTnchL2IV5MO2pztzPogJ+kivDEgtx7LCOhaOdcmvauUXox5PrJKSJziIGUHTdREYejdiV/e2VTCnP87KmcyQU8iz6Ri+mrf5wesJ/RDZFOEqcL1h/SJ0tX40FfYxaurZpNaBKKttRNikFHbr3H9tqeqiexPWJoDukqLPQnLgMOGzYDdHO6oQGbMpAb7U1hVRq6XyKL2uz3NE3p4QTD6rFzg3pkpI/XSKCavw3aH5vWB7eUgAIi/b2iUfQLX4oYNZJruRl7z08rKfM2OxhEh38qHX73FfDMKa8Ljg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cIBzWghiSd/94g2S+ca6KQlE54fye1PXtvDLmTaqqw4=; b=qjqXmB+Gz1gH8un44FhAamAcUYUmRobZx1KlUR3SFpAZCzYpaC0xmD2VGmrcQ/iq1P6ul7C6it1VtXBfDiGwcPVpcjPANzXf5k9VTma9gaRYOQK0I1PF/RLYiSf+MeXEcmc0f6Lnc5MGJ/QUYTQvdicn4IJjmJLdzly0G204+XHuR4NsUupB1lUWNpi3xSL/waP9r2WaTF75uOsC0WJxl2cz/7DQrjFmNJl040FOurhP2ZeaAe3ZpWF6Kh+SaRL5K0rn8k5b908yX9THweWL/3AgBXob6NAY6+abt/PjDSOr0Pj6Q+fkBceTRKYpOFwb5jov4TktNXgiA0CQ4VVGSw== Received: from MA0P287MB0217.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:b3::9) by PN3P287MB0339.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:d0::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14; Thu, 8 Aug 2024 11:59:28 +0000 Received: from MA0P287MB0217.INDP287.PROD.OUTLOOK.COM ([fe80::98d2:3610:b33c:435a]) by MA0P287MB0217.INDP287.PROD.OUTLOOK.COM ([fe80::98d2:3610:b33c:435a%5]) with mapi id 15.20.7849.013; Thu, 8 Aug 2024 11:59:28 +0000 From: Aditya Garg To: "tzimmermann@suse.de" , "maarten.lankhorst@linux.intel.com" , "mripard@kernel.org" , "airlied@gmail.com" , "daniel@ffwll.ch" , Jiri Kosina , "bentiss@kernel.org" CC: Kerem Karabay , Linux Kernel Mailing List , "dri-devel@lists.freedesktop.org" , "linux-input@vger.kernel.org" , Orlando Chamberlain Subject: [PATCH v2 5/9] HID: multitouch: take cls->maxcontacts into account for devices without a HID_DG_CONTACTMAX field too Thread-Topic: [PATCH v2 5/9] HID: multitouch: take cls->maxcontacts into account for devices without a HID_DG_CONTACTMAX field too Thread-Index: AQHa6YprE4GB4W58ekuSXmWzZRZGLA== Date: Thu, 8 Aug 2024 11:59:28 +0000 Message-ID: <53EA503C-0D5F-4648-8508-8DA12C8282D2@live.com> References: <9550ADFD-0534-471D-94B4-EF370943CF80@live.com> In-Reply-To: <9550ADFD-0534-471D-94B4-EF370943CF80@live.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [2hblk00hwwCLsEXuCWOc69nMz8sdAmxYYwwyNCq8YMFeDT3rSvGhoJglLAMseVkKhMehtxVcWaY=] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MA0P287MB0217:EE_|PN3P287MB0339:EE_ x-ms-office365-filtering-correlation-id: fb34778c-1cf7-47af-9d2a-08dcb7a18e49 x-microsoft-antispam: BCL:0; ARA:14566002|19110799003|461199028|8060799006|15080799003|440099028|3412199025|102099032; x-microsoft-antispam-message-info: q5N7SCLDH9W4K2X3afGlGyIBVl3QZv+aCIai5JpsCYv1CDyvk0xm4Qbz2IXmPvPjGNYnCs419AGEdLzGit2JdigKCxxXknTnRvvOch1KvhBX7gpRBMqk1XNY1HvUOIvdprAa6nrMfz6htbtSkmtqHQFMdsRumIZDuKvEd5Ss9ZFFmoS28EiI7/Dkpbzo/XmVR+s2uJFSli46NnsA96V9nconaB3L60wh7IYu5CU9GXg5qpyMZHrOldl40LkIkJBoVgVfs6Hiyav3roUEUnJANr9BxJwFNDanrW0bUReVWjIwroF/pLFvsRHp2Dy6TlodNzd72tHcCSh5rPEgk2tkZ02r5ZbVyoZAgbSpSIZUSfH9y4E1ZjrZrh/zfGIsPqiSXx/hPH28ianjAp6WaecvfnKyjns4OE53gnLlRuKstZvmyZVcwyvMdnj4EOBd+p9nzPbMXXiRiA5y04SkO1du5NG3eydHD3cHr6Ro6PYFaACskxdQ++MmYD4hmanp0ZYctBUF0bk0erdYkJ4IJNJqbn1y0g97hF50UmTS8Z3wMakixOz3FC4XCwjFISC3BAW1IW2boauJpsisHtyxfYG1UgYhPJIiwRINUJe0Oe5O/mYuo5dRn0d4aZNK1lXmiCp/tY1K2M2ul/JhWN7+bOq6iZ8ODe7kE+tLv6ggBPC/i++KABohnOaSHb5dxtqxCV9T x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: X9jmghm/ddvgc1ftvOKUa5612bjMPCSJO+tb2p2j1wseuLCG63CzKWAYNsa0EmV7dvQeNBS2p/FCqqZPlK8b1CLzMAFYANMjGdglq9fht06ML+pemdqD88VWatmmWTeNWmIM9x31bsJRh5Q1l9HuiXcaRvJAC8PELSJNKIpANfwRsVEct/DLmUzX6nH1CzTj4ghmJnGUsgLpJFajw6VQLQUEMHPPukaZMr5ff9NgH02NQl3YrTpuZfYYLvnWSUlfb95/V4Rk+KHtjpxmpQMDeb6uuE5PCB0fynNmVorjEbQ15fMJWb5Mtsq2Y1oTH29Cig0YAMZdLVzx8uToG9tMJYwxUfot7I7gJoTvV6sB6iycirNYsaiJSUUEgT2rw5Aumny0y+F03TebWQr8UGa1i+EgLuA2unZw64zdBxxJipNDT2P29soWvGCW5IFMA9MSfp28lkzRYnpJ+ZJUO9I7O60798LJwY/H1UFzP9Yioz37kwrHJ3iNgVzy81VYlVOWe7JC/DNkP09I/7/ahWCqU/rypb82u1gu445v5goMjPXPbn5UJWzKZug+lLFDu+SMlYvEyLrzwGxm+zGqjhyaEChP8K8yQA7ZVcVRTp+U/j3WA6HqvNkwtwoHgcxGPxbuZ5dUykZbKQHG4jsCYz4GvkEVmnjUjBFKy/ma1ifIO+8lKuj+x0t5xqomaUm96I4BhNffhdVrZvjfGWJDAG++vXAvF8QVL/fgBauDmOHZGeIwKVzM9Tg9tDxNbjcMap4MwCWCjWZ0RyQiI7b6VSlDEsOQFLKCIv2EfpZ4SegGINYxpDVaW5xIGDtXdLtLW3kqp5SJ2eYEtK+HkoQAbTc3F8Az1dhWLAaWyXLRUgH93KIyul+fBOTtcUJXUbY+Dk58f+cHDRgr0MocLTFrjMlUCgVpPrNNT8pb4lb/jO00+txPAsSnnvV28cuA0xdOctCSSJfPNNu6KtlPLUUgPeeedEKRP82HQUNCvnnYvTBLF/1Q7nF9bgaaEFtys5pW4h1pDuhplHMtst2rBKNSZmTb1nHdB27TL5VKZYNLnI6s5dDdApnTF1ADfImHImKKqW4Q7v5tr7RzNW11Ky7Pvku7pUOV/oO2fsI7EAs8eVw/3F6Xq8LjSPqCgz0pczWD8hIVdravOBTRiwh4XweM6gzXUiwnUm04o/RaiP67YRJvTq+amuplFO38oJSBAZTE7r587olUSChiEJBeKe5+qHyWDnFlnCxdzmksm6Bf9sIOzZvajeHkGwmtGtu5LkXHW6O7YgRuozCRvmh2NOt1huiHVy99V2yQ6mvZQuC+ic5hWLGuFl6Q+yTvUy6bKdKf4Y0D Content-ID: <53C2C860601E514581EAC7FA4CDFD8CB@INDP287.PROD.OUTLOOK.COM> MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-24072.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB0217.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: fb34778c-1cf7-47af-9d2a-08dcb7a18e49 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Aug 2024 11:59:28.4131 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN3P287MB0339 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Kerem Karabay This is needed for Apple Touch Bars, where no HID_DG_CONTACTMAX field is present and the maximum contact count is greater than the default. Signed-off-by: Kerem Karabay Signed-off-by: Aditya Garg --- drivers/hid/hid-multitouch.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 571435da5..60b675cd1 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -490,9 +490,6 @@ static void mt_feature_mapping(struct hid_device *hdev, if (!td->maxcontacts && field->logical_maximum <= MT_MAX_MAXCONTACT) td->maxcontacts = field->logical_maximum; - if (td->mtclass.maxcontacts) - /* check if the maxcontacts is given by the class */ - td->maxcontacts = td->mtclass.maxcontacts; break; case HID_DG_BUTTONTYPE: @@ -1309,6 +1306,10 @@ static int mt_touch_input_configured(struct hid_device *hdev, struct input_dev *input = hi->input; int ret; + /* check if the maxcontacts is given by the class */ + if (cls->maxcontacts) + td->maxcontacts = cls->maxcontacts; + if (!td->maxcontacts) td->maxcontacts = MT_DEFAULT_MAXCONTACT;