Skip to content

Commit 3b692c5

Browse files
dsdandy-shev
authored andcommitted
HID: asus: only support backlight when it's not driven by WMI
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 <drake@endlessm.com> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent ffb6ce7 commit 3b692c5

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

drivers/hid/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ config HID_APPLEIR
149149
config HID_ASUS
150150
tristate "Asus"
151151
depends on LEDS_CLASS
152+
depends on ASUS_WMI || ASUS_WMI=n
152153
---help---
153154
Support for Asus notebook built-in keyboard and touchpad via i2c, and
154155
the Asus Republic of Gamers laptop keyboard special keys.

drivers/hid/hid-asus.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include <linux/dmi.h>
3030
#include <linux/hid.h>
3131
#include <linux/module.h>
32+
#include <linux/platform_data/x86/asus-wmi.h>
3233
#include <linux/input/mt.h>
3334
#include <linux/usb.h> /* For to_usb_interface for T100 touchpad intf check */
3435

@@ -349,6 +350,24 @@ static void asus_kbd_backlight_work(struct work_struct *work)
349350
hid_err(led->hdev, "Asus failed to set keyboard backlight: %d\n", ret);
350351
}
351352

353+
/* WMI-based keyboard backlight LED control (via asus-wmi driver) takes
354+
* precedence. We only activate HID-based backlight control when the
355+
* WMI control is not available.
356+
*/
357+
static bool asus_kbd_wmi_led_control_present(struct hid_device *hdev)
358+
{
359+
u32 value;
360+
int ret;
361+
362+
ret = asus_wmi_evaluate_method(ASUS_WMI_METHODID_DSTS2,
363+
ASUS_WMI_DEVID_KBD_BACKLIGHT, 0, &value);
364+
hid_dbg(hdev, "WMI backlight check: rc %d value %x", ret, value);
365+
if (ret)
366+
return false;
367+
368+
return !!(value & ASUS_WMI_DSTS_PRESENCE_BIT);
369+
}
370+
352371
static int asus_kbd_register_leds(struct hid_device *hdev)
353372
{
354373
struct asus_drvdata *drvdata = hid_get_drvdata(hdev);
@@ -436,7 +455,9 @@ static int asus_input_configured(struct hid_device *hdev, struct hid_input *hi)
436455

437456
drvdata->input = input;
438457

439-
if (drvdata->enable_backlight && asus_kbd_register_leds(hdev))
458+
if (drvdata->enable_backlight &&
459+
!asus_kbd_wmi_led_control_present(hdev) &&
460+
asus_kbd_register_leds(hdev))
440461
hid_warn(hdev, "Failed to initialize backlight.\n");
441462

442463
return 0;

0 commit comments

Comments
 (0)