107 lines
3.5 KiB
Diff
107 lines
3.5 KiB
Diff
|
From d004ab4e282082ddb645ff48d3f62a28fc5d69ef Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
Date: Wed, 15 May 2019 12:27:23 +0200
|
||
|
|
Subject: [PATCH] platform/x86: asus-wmi: Only Tell EC the OS will handle
|
||
|
|
display hotkeys from asus_nb_wmi
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Commit 78f3ac76d9e5 ("platform/x86: asus-wmi: Tell the EC the OS will
|
||
|
|
handle the display off hotkey") causes the backlight to be permanently off
|
||
|
|
on various EeePC laptop models using the eeepc-wmi driver (Asus EeePC
|
||
|
|
1015BX, Asus EeePC 1025C).
|
||
|
|
|
||
|
|
The asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT, 2, NULL) call added
|
||
|
|
by that commit is made conditional in this commit and only enabled in
|
||
|
|
the quirk_entry structs in the asus-nb-wmi driver fixing the broken
|
||
|
|
display / backlight on various EeePC laptop models.
|
||
|
|
|
||
|
|
Cc: João Paulo Rechi Vita <jprvita@endlessm.com>
|
||
|
|
Fixes: 78f3ac76d9e5 ("platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey")
|
||
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/platform/x86/asus-nb-wmi.c | 8 ++++++++
|
||
|
|
drivers/platform/x86/asus-wmi.c | 2 +-
|
||
|
|
drivers/platform/x86/asus-wmi.h | 1 +
|
||
|
|
3 files changed, 10 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
|
||
|
|
index 81642102bf65..8d9e30dbb5af 100644
|
||
|
|
--- a/drivers/platform/x86/asus-nb-wmi.c
|
||
|
|
+++ b/drivers/platform/x86/asus-nb-wmi.c
|
||
|
|
@@ -65,10 +65,12 @@ static bool asus_q500a_i8042_filter(unsigned char data, unsigned char str,
|
||
|
|
|
||
|
|
static struct quirk_entry quirk_asus_unknown = {
|
||
|
|
.wapf = 0,
|
||
|
|
+ .wmi_backlight_set_devstate = true,
|
||
|
|
};
|
||
|
|
|
||
|
|
static struct quirk_entry quirk_asus_q500a = {
|
||
|
|
.i8042_filter = asus_q500a_i8042_filter,
|
||
|
|
+ .wmi_backlight_set_devstate = true,
|
||
|
|
};
|
||
|
|
|
||
|
|
/*
|
||
|
|
@@ -79,26 +81,32 @@ static struct quirk_entry quirk_asus_q500a = {
|
||
|
|
static struct quirk_entry quirk_asus_x55u = {
|
||
|
|
.wapf = 4,
|
||
|
|
.wmi_backlight_power = true,
|
||
|
|
+ .wmi_backlight_set_devstate = true,
|
||
|
|
.no_display_toggle = true,
|
||
|
|
};
|
||
|
|
|
||
|
|
static struct quirk_entry quirk_asus_wapf4 = {
|
||
|
|
.wapf = 4,
|
||
|
|
+ .wmi_backlight_set_devstate = true,
|
||
|
|
};
|
||
|
|
|
||
|
|
static struct quirk_entry quirk_asus_x200ca = {
|
||
|
|
.wapf = 2,
|
||
|
|
+ .wmi_backlight_set_devstate = true,
|
||
|
|
};
|
||
|
|
|
||
|
|
static struct quirk_entry quirk_asus_ux303ub = {
|
||
|
|
.wmi_backlight_native = true,
|
||
|
|
+ .wmi_backlight_set_devstate = true,
|
||
|
|
};
|
||
|
|
|
||
|
|
static struct quirk_entry quirk_asus_x550lb = {
|
||
|
|
+ .wmi_backlight_set_devstate = true,
|
||
|
|
.xusb2pr = 0x01D9,
|
||
|
|
};
|
||
|
|
|
||
|
|
static struct quirk_entry quirk_asus_forceals = {
|
||
|
|
+ .wmi_backlight_set_devstate = true,
|
||
|
|
.wmi_force_als_set = true,
|
||
|
|
};
|
||
|
|
|
||
|
|
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
|
||
|
|
index 3e4336025e8f..9b18a184e0aa 100644
|
||
|
|
--- a/drivers/platform/x86/asus-wmi.c
|
||
|
|
+++ b/drivers/platform/x86/asus-wmi.c
|
||
|
|
@@ -2146,7 +2146,7 @@ static int asus_wmi_add(struct platform_device *pdev)
|
||
|
|
err = asus_wmi_backlight_init(asus);
|
||
|
|
if (err && err != -ENODEV)
|
||
|
|
goto fail_backlight;
|
||
|
|
- } else
|
||
|
|
+ } else if (asus->driver->quirks->wmi_backlight_set_devstate)
|
||
|
|
err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT, 2, NULL);
|
||
|
|
|
||
|
|
if (asus_wmi_has_fnlock_key(asus)) {
|
||
|
|
diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h
|
||
|
|
index 0930be770688..4f31b68642a0 100644
|
||
|
|
--- a/drivers/platform/x86/asus-wmi.h
|
||
|
|
+++ b/drivers/platform/x86/asus-wmi.h
|
||
|
|
@@ -31,6 +31,7 @@ struct quirk_entry {
|
||
|
|
bool store_backlight_power;
|
||
|
|
bool wmi_backlight_power;
|
||
|
|
bool wmi_backlight_native;
|
||
|
|
+ bool wmi_backlight_set_devstate;
|
||
|
|
bool wmi_force_als_set;
|
||
|
|
int wapf;
|
||
|
|
/*
|
||
|
|
--
|
||
|
|
2.21.0
|
||
|
|
|