Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1010239pxb; Wed, 1 Sep 2021 15:12:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgZxaVuVM2B2C8GVmVIXolCsLR82gkN2agOe5aaX6A6RKxt4VlPcTsZb7NgrkgNp6tscPk X-Received: by 2002:a92:c90a:: with SMTP id t10mr1234635ilp.188.1630534344920; Wed, 01 Sep 2021 15:12:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630534344; cv=none; d=google.com; s=arc-20160816; b=fHkkny0u9cFPALmd31543QFu68t4R5otF354/X9eD0GrafyIfHhcCv6WqhRLZDT3+p elTpxUbXKZZ7I8wYT57EByIY46wAtn8Q+cx5imE2X8XdLq7yG7GEOuUpnE5CpI90JHnp GdIDqCP9kd4Y9ogFn+mgHm6XVgo1bZ+7qspEKEM9qDPI7+o114gU6ldW0lwj/wvKYDW0 +PRk6/tL4U5wGWDmi4Q7d2qtA6fCDo/8QYcpG+KbwP13iTNvca4lYiSI4fELK/oFMOvl RqJ2CwPfBPqyXenIAbO7nVrL7ozzW4WsPUeE8b/vZebDu9C2ulxT2lKZTrtMnr+lHcnL GjJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+KhufYO8CFlKy9TTnLGbtZjlkTNRxPv0gD4w9ZjO/WI=; b=O9iL2VLgYKEFlVqWMP0GttBV4jmuZ4LLStxMCqxN49ZcCTBxgwUWf1o1cctaDIK6AL OKvvRFTwly9ECnmVce/nZLkfJ2YkkW6P9BSoWPE/bzo6DKziyYpUeU/ujqD/AnjeCF1k PUTn4CTz2+USXitAY1hgipnqvzQvCJh9WrS7OotzfXkJHrfL/kTnc/h7pp/CK9E7cUCP dZWNF9oVNbUQwKtsgmG4FT6ZaL7dWUa8gLSsHXb9SFnAFbuz7Z6LrKPy1uj7ToSeqPbY 7RijqSbcIhKMG0qR5fd9tjF7Aa8YXerA3jzLINSZ55lCG7V0v4gEznkcK2nJA6Vl7T7G Ej9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gYCA0cUC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o16si20885ils.161.2021.09.01.15.12.12; Wed, 01 Sep 2021 15:12:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gYCA0cUC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344127AbhIAMwg (ORCPT + 99 others); Wed, 1 Sep 2021 08:52:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:49978 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345851AbhIAMsm (ORCPT ); Wed, 1 Sep 2021 08:48:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D21E961222; Wed, 1 Sep 2021 12:40:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1630500051; bh=NloJrDL1ejwp/rlW88MAS7qGRk/Nlm6pJziuz8bSjjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gYCA0cUCvvNA2ac3sux9Kk3bPkZV7C9NOk3zKV5PVXP0uXmo18jh6NdOkXCN4rggN n/39rTKNtONtcJNkHj/7DWp7y2uVFavlY4nFXv6AYAww0eUofd8cHzMa9rNEIy0qxP s1WkcKG8wfPCQ52inA0VeQVL5s0/JJd0CuWpbnDg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , Sasha Levin Subject: [PATCH 5.13 083/113] platform/x86: asus-nb-wmi: Allow configuring SW_TABLET_MODE method with a module option Date: Wed, 1 Sep 2021 14:28:38 +0200 Message-Id: <20210901122304.750670669@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210901122301.984263453@linuxfoundation.org> References: <20210901122301.984263453@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans de Goede [ Upstream commit 7f45621c14a209b986cd636447bb53b7f6f881c3 ] Unfortunately we have been unable to find a reliable way to detect if and how SW_TABLET_MODE reporting is supported, so we are relying on DMI quirks for this. Add a module-option to specify the SW_TABLET_MODE method so that this can be easily tested without needing to rebuild the kernel. BugLink: https://gitlab.freedesktop.org/libinput/libinput/-/issues/639 Signed-off-by: Hans de Goede Link: https://lore.kernel.org/r/20210812145513.39117-1-hdegoede@redhat.com Signed-off-by: Sasha Levin --- drivers/platform/x86/asus-nb-wmi.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c index 0cb927f0f301..9929eedf7dd8 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c @@ -41,6 +41,10 @@ static int wapf = -1; module_param(wapf, uint, 0444); MODULE_PARM_DESC(wapf, "WAPF value"); +static int tablet_mode_sw = -1; +module_param(tablet_mode_sw, uint, 0444); +MODULE_PARM_DESC(tablet_mode_sw, "Tablet mode detect: -1:auto 0:disable 1:kbd-dock 2:lid-flip"); + static struct quirk_entry *quirks; static bool asus_q500a_i8042_filter(unsigned char data, unsigned char str, @@ -477,6 +481,21 @@ static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver) else wapf = quirks->wapf; + switch (tablet_mode_sw) { + case 0: + quirks->use_kbd_dock_devid = false; + quirks->use_lid_flip_devid = false; + break; + case 1: + quirks->use_kbd_dock_devid = true; + quirks->use_lid_flip_devid = false; + break; + case 2: + quirks->use_kbd_dock_devid = false; + quirks->use_lid_flip_devid = true; + break; + } + if (quirks->i8042_filter) { ret = i8042_install_filter(quirks->i8042_filter); if (ret) { -- 2.30.2