Re: [PATCH] platform/x86: asus-wmi: Only Tell EC the OS will handle display hotkeys from asus_nb_wmi

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On 24-05-19 18:43, Andy Shevchenko wrote:
On Tue, May 21, 2019 at 9:28 AM Hans de Goede <hdegoede@xxxxxxxxxx> wrote:

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.


Hmm... doesn't apply.

That is likely because your review-andy branch contain a whole-bunch
of asus-wmi patches.

Since this is a patch fixing a regression this should go to the fixes
branch. As the other patches so far are only in your review-andy branch
it is probably best to merge this patch to for-next + fixes first and
then rebase the set you have in review-andy on top, so that this can go
to fixes without getting a merge conflict when the rest of the patches
show up...

Regards,

Hans








Cc: João Paulo Rechi Vita <jprvita@xxxxxxxxxxxx>
Fixes: 78f3ac76d9e5 ("platform/x86: asus-wmi: Tell the EC the OS will handle the display off hotkey")
Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
---
  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 b6f2ff95c3ed..59f3a37a44d7 100644
--- a/drivers/platform/x86/asus-nb-wmi.c
+++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -78,10 +78,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,
  };

  /*
@@ -92,26 +94,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 ee1fa93708ec..a66e99500c12 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -2131,7 +2131,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);

         status = wmi_install_notify_handler(asus->driver->event_guid,
diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h
index 6c1311f4b04d..57a79bddb286 100644
--- a/drivers/platform/x86/asus-wmi.h
+++ b/drivers/platform/x86/asus-wmi.h
@@ -44,6 +44,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






[Index of Archives]     [Linux Kernel Development]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux