From patchwork Tue Oct 9 06:40:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Drake X-Patchwork-Id: 10632007 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 524AB17E3 for ; Tue, 9 Oct 2018 06:41:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 438EB28B50 for ; Tue, 9 Oct 2018 06:41:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 360FA28B5B; Tue, 9 Oct 2018 06:41:05 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,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 AF52D28B53 for ; Tue, 9 Oct 2018 06:41:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725927AbeJIN41 (ORCPT ); Tue, 9 Oct 2018 09:56:27 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:42888 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726460AbeJIN41 (ORCPT ); Tue, 9 Oct 2018 09:56:27 -0400 Received: by mail-pl1-f195.google.com with SMTP id c8-v6so305519plo.9 for ; Mon, 08 Oct 2018 23:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessm-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WAqxnc7+dpFcisPoGTfgDmr/ikCsXzwKKXIetAalypw=; b=IN/f0/Fbo9xTRMCO5fmGoszBdxQUyM9/DJUk3QTI6xGupUuK8yJwbJO/owBjz/P+NJ Dmt0hdgAN+OjT2Yv7DR2pck6IQWlbk0idoVFB+d/+gVMCamiQ9A/4W1Iiw6VbWhiWz26 Wqhr1mceyIdkqK26sOWczmOrEvNNif3mAG3GoXdLLzdqmf0LNmMHj3ZhA5sJBDWf4sRA V1A7NOFa2Z+GKWBxtnczQEtfSMNbnhB7B/0k/cEhJrufAwGA+zxIiHoxBU7LnPDAkh34 MrJxZD8O6tTHTOnKaxvVqrWyVbzXZjvZ7VDJX8McPsmOLWKE8A9DBZt8+BOAmTlD1g9N Tq+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WAqxnc7+dpFcisPoGTfgDmr/ikCsXzwKKXIetAalypw=; b=bt1GZuAeaIFRVaXkgH70AKcJR1AcGYDo+xNgMj9P8bY4v6see8XpAiOxl92ZYdwloQ WyJLJOrQiCSkFqyTPiHIO2neJllZLwqUKCwf6hMFHH1wbKLK2fKCZ4/5iWYBPsmR/XuF ojfm0ahkqt6YVt9VTS56rzGBnQdOoL07Q6zddoPKELPDXq6OyMeYgWYdHmoinp6EDl8Y dL/q3uZ0PzrojOJuoRxJTnp+xwdzskpTBSvRfgy0elwMZ1fkNyUCisjAZ3XVlszuvZx+ fvn8qY6e+XpYuR1l8lMPbqlTCq/xG5C9iWhVDxSszIVRy2svhaH2EbPQ1YO5LQjpT2q/ 7Qdw== X-Gm-Message-State: ABuFfojRwrhaYUkwJRwNEFs0hPjfuzfSveBjyZNEuHMqqB0H+9dzGDoa zW2O/mKXsJM9NTQeOn0w33yKzA== X-Google-Smtp-Source: ACcGV636ycPvliOSyU/1pIVnwvmaVLle0DQV3z+WRttpDSdtQ9Ul7a/wqz5JMKYEhQp4bclj4wZ8Sg== X-Received: by 2002:a17:902:9b89:: with SMTP id y9-v6mr27290747plp.239.1539067263516; Mon, 08 Oct 2018 23:41:03 -0700 (PDT) Received: from limbo.local (125-227-158-176.HINET-IP.hinet.net. [125.227.158.176]) by smtp.gmail.com with ESMTPSA id 74-v6sm27455879pfx.182.2018.10.08.23.41.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Oct 2018 23:41:03 -0700 (PDT) From: Daniel Drake To: corentin.chary@gmail.com, andy.shevchenko@gmail.com Cc: acpi4asus-user@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, jikos@kernel.org, benjamin.tissoires@redhat.com, linux-input@vger.kernel.org, linux@endlessm.com Subject: [PATCH v3 2/2] HID: asus: only support backlight when it's not driven by WMI Date: Tue, 9 Oct 2018 14:40:56 +0800 Message-Id: <20181009064056.17478-2-drake@endlessm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181009064056.17478-1-drake@endlessm.com> References: <20181009064056.17478-1-drake@endlessm.com> Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Asus GL502VSK has the same 0B05:1837 keyboard as we've seen in several Republic of Gamers laptops. However, in this model, the keybard backlight control exposed by hid-asus has no effect on the keyboard backlight. Instead, the keyboard backlight is correctly driven by asus-wmi. With two keyboard backlight devices available (and only the acer-wmi one working), GNOME is picking the wrong one to drive in the UI. Avoid this problem by not creating the backlight interface when we detect a WMI-driven keyboard backlight. We have also tested Asus GL702VMK which does have the hid-asus backlight present, and it still works fine with this patch (WMI method call returns UNSUPPORTED_METHOD). A direct "depends on ASUS_WMI" is intentionally avoided so that HID_ASUS users who have ASUS_WMI=n will not quietly lose their HID_ASUS driver on a kernel upgrade. Signed-off-by: Daniel Drake Reviewed-by: Benjamin Tissoires --- Notes: v2: use asus-wmi driver to check WMI device status v3: avoid "depends on ASUS_WMI" drivers/hid/Kconfig | 1 + drivers/hid/hid-asus.c | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 61e1953ff921..4287dfe2e58e 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -149,6 +149,7 @@ config HID_APPLEIR config HID_ASUS tristate "Asus" depends on LEDS_CLASS + depends on m || ASUS_WMI != m ---help--- Support for Asus notebook built-in keyboard and touchpad via i2c, and the Asus Republic of Gamers laptop keyboard special keys. diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index 88a5672f42cd..c42af8511b38 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -26,6 +26,7 @@ * any later version. */ +#include #include #include #include @@ -349,6 +350,25 @@ static void asus_kbd_backlight_work(struct work_struct *work) hid_err(led->hdev, "Asus failed to set keyboard backlight: %d\n", ret); } +/* WMI-based keyboard backlight LED control (via asus-wmi driver) takes + * precedence. We only activate HID-based backlight control when the + * WMI control is not available. + */ +static bool asus_kbd_wmi_led_control_present(struct hid_device *hdev) +{ + u32 value; + int ret; + + ret = asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS2, + ASUS_WMI_DEVID_KBD_BACKLIGHT, 0, &value); + hid_dbg(hdev, "WMI backlight check: rc %d value %x", ret, value); + + if (ret != 0) + return false; + + return !!(value & ASUS_WMI_DSTS_PRESENCE_BIT); +} + static int asus_kbd_register_leds(struct hid_device *hdev) { struct asus_drvdata *drvdata = hid_get_drvdata(hdev); @@ -436,7 +456,9 @@ static int asus_input_configured(struct hid_device *hdev, struct hid_input *hi) drvdata->input = input; - if (drvdata->enable_backlight && asus_kbd_register_leds(hdev)) + if (drvdata->enable_backlight && + !asus_kbd_wmi_led_control_present(hdev) && + asus_kbd_register_leds(hdev)) hid_warn(hdev, "Failed to initialize backlight.\n"); return 0;