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

[Hans de Goede]

Hi,

On 28-05-19 15:37, Hans de Goede wrote:
> 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...

Ping? This is a 5.x regression fix, as such it would be really good to
get this into 5.2 and then cherry-picked into 5.y.z.

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