From patchwork Tue May 22 20:55:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Drake X-Patchwork-Id: 10419625 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.web.codeaurora.org (Postfix) with ESMTP id 9BA27600CC for ; Tue, 22 May 2018 20:55:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89DE8290F5 for ; Tue, 22 May 2018 20:55:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E4122913E; Tue, 22 May 2018 20:55:54 +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 1BC2B290F5 for ; Tue, 22 May 2018 20:55:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753148AbeEVUzx (ORCPT ); Tue, 22 May 2018 16:55:53 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:41331 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753146AbeEVUzw (ORCPT ); Tue, 22 May 2018 16:55:52 -0400 Received: by mail-qt0-f193.google.com with SMTP id g13-v6so25329384qth.8 for ; Tue, 22 May 2018 13:55:52 -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=rJ6NzIyeJP7QxetWI7DDI9vSFs2CDxzZQ6Pq5TyAJVQ=; b=J8Hoh/IVfDqdxSsHd/Ag45jbD6rjaiZyDE5C81w/NgcMhVLn9znYNxLYVuU1u8bDiG aRC0t8tifzbXSnqskNHJXiFcgtB1CadNj7lk+X28dXMDyZSvYJNF2/9LASTc9lX8gk7i T0DXLKI0y36QXIHFv/ST45KJuZzNYxw3XfxHbBUaP0qHVbpQACLxJVuoH8nKCEqAqyxC jzzmrpEcFpJs7Hr3DiJfC6/g07oEvj3IwSbUA6eGRPkR1L1DkTyHcmToPLwKQSB5dHlb RMzsOz+6XpSbwXssZxWGSrjZ0KFL78wxoy8qWRKpqQiaNXo+ORypCYCedyZbouc+IuEo e9Xw== 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=rJ6NzIyeJP7QxetWI7DDI9vSFs2CDxzZQ6Pq5TyAJVQ=; b=VPWM+T0FC1yUWbnT242R+ZKL4UVtiFmQUtmW9Fl8TPbR4oiywDTddbi5AwpSazIBeD UhIsueBlWWlxHmcopOMRpTVmCV9380KYQ0+70M0FufCAh2A2IaL5+el7d3cEXM0iYc7N EZNz1FtSRht8WxVNQbEpB3DRIXBK/Jc01UmbDwzmRjE5JkCjWgL9sIVLxNMPwE4a8Wz5 JfwqaG+nHeSkdKkQBhXRKWA6caR7WdSNfdxnw0I0g2pPEN2ZvyViUHRQ4S50cx6K9+F0 2cXAEZAGWbAFgoDaHj9SQq6hWMvi4GlK0zsk1n2P1ZZqSeZ2HanGxPapsG6UqilwnZra Lw+g== X-Gm-Message-State: ALKqPweZzmRtKNon1Q4YiksP0gFiLOVF7E4co0k9WJaCk4F4PHvwrbm4 Y91AArDE1JdPuMrtUXQn+PHoWg== X-Google-Smtp-Source: AB8JxZpdGK6xvDVLA1Qx36BWRTmLH9HKIpSyfEL2Mv2ZmsUEPCzBlAKKvBScw6HkRWDRVlihuAVEaQ== X-Received: by 2002:ac8:28f2:: with SMTP id j47-v6mr79469qtj.150.1527022551877; Tue, 22 May 2018 13:55:51 -0700 (PDT) Received: from limbo.local ([186.77.197.45]) by smtp.gmail.com with ESMTPSA id z64-v6sm12758886qke.66.2018.05.22.13.55.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 May 2018 13:55:51 -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 v2 2/2] HID: asus: only support backlight when it's not driven by WMI Date: Tue, 22 May 2018 14:55:42 -0600 Message-Id: <20180522205542.11991-2-drake@endlessm.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180522205542.11991-1-drake@endlessm.com> References: <20180522205542.11991-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). Signed-off-by: Daniel Drake Acked-by: Benjamin Tissoires --- 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 0000434a1fbd..3c0d461bb830 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 ASUS_WMI ---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;