| Message ID | 20220624112340.10130-2-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Commit | 3a0cf7ab8df3878a7e2f3d29275b785cf4e7afb6 |
| Headers | show |
| Series | ACPI: video / platform/x86: Fix Panasonic laptop missing keypresses | expand |
On Fri, Jun 24, 2022 at 1:23 PM Hans de Goede <hdegoede@redhat.com> wrote: > > Some systems have an ACPI video bus but not ACPI video devices with > backlight capability. On these devices brightness key-presses are > (logically) not reported through the ACPI video bus. > > Change how acpi_video_handles_brightness_key_presses() determines if > brightness key-presses are handled by the ACPI video driver to avoid > vendor specific drivers/platform/x86 drivers filtering out their > brightness key-presses even though they are the only ones reporting > these presses. > > Fixes: ed83c9171829 ("platform/x86: panasonic-laptop: Resolve hotkey double trigger bug") > Reported-and-tested-by: Stefan Seyfried <seife+kernel@b1-systems.com> > Reported-and-tested-by: Kenneth Chan <kenneth.t.chan@gmail.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> and I'm assuming that you'll take this one along with the rest of the series. > --- > drivers/acpi/acpi_video.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c > index b6ee27cb32f3..dc3c037d6313 100644 > --- a/drivers/acpi/acpi_video.c > +++ b/drivers/acpi/acpi_video.c > @@ -79,6 +79,7 @@ module_param(device_id_scheme, bool, 0444); > static int only_lcd = -1; > module_param(only_lcd, int, 0444); > > +static bool has_backlight; > static int register_count; > static DEFINE_MUTEX(register_count_mutex); > static DEFINE_MUTEX(video_list_lock); > @@ -1230,6 +1231,9 @@ acpi_video_bus_get_one_device(struct acpi_device *device, > acpi_video_device_bind(video, data); > acpi_video_device_find_cap(data); > > + if (data->cap._BCM && data->cap._BCL) > + has_backlight = true; > + > mutex_lock(&video->device_list_lock); > list_add_tail(&data->entry, &video->video_device_list); > mutex_unlock(&video->device_list_lock); > @@ -2276,6 +2280,7 @@ void acpi_video_unregister(void) > cancel_delayed_work_sync(&video_bus_register_backlight_work); > acpi_bus_unregister_driver(&acpi_video_bus); > register_count = 0; > + has_backlight = false; > } > mutex_unlock(®ister_count_mutex); > } > @@ -2294,13 +2299,7 @@ EXPORT_SYMBOL(acpi_video_register_backlight); > > bool acpi_video_handles_brightness_key_presses(void) > { > - bool have_video_busses; > - > - mutex_lock(&video_list_lock); > - have_video_busses = !list_empty(&video_bus_head); > - mutex_unlock(&video_list_lock); > - > - return have_video_busses && > + return has_backlight && > (report_key_events & REPORT_BRIGHTNESS_KEY_EVENTS); > } > EXPORT_SYMBOL(acpi_video_handles_brightness_key_presses); > -- > 2.36.0 >
On Fri, Jun 24, 2022 at 01:23:34PM +0200, Hans de Goede wrote: > Some systems have an ACPI video bus but not ACPI video devices with > backlight capability. On these devices brightness key-presses are > (logically) not reported through the ACPI video bus. > > Change how acpi_video_handles_brightness_key_presses() determines if > brightness key-presses are handled by the ACPI video driver to avoid > vendor specific drivers/platform/x86 drivers filtering out their > brightness key-presses even though they are the only ones reporting > these presses. ... > - return have_video_busses && > + return has_backlight && > (report_key_events & REPORT_BRIGHTNESS_KEY_EVENTS); I would combine on one line.
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c index b6ee27cb32f3..dc3c037d6313 100644 --- a/drivers/acpi/acpi_video.c +++ b/drivers/acpi/acpi_video.c @@ -79,6 +79,7 @@ module_param(device_id_scheme, bool, 0444); static int only_lcd = -1; module_param(only_lcd, int, 0444); +static bool has_backlight; static int register_count; static DEFINE_MUTEX(register_count_mutex); static DEFINE_MUTEX(video_list_lock); @@ -1230,6 +1231,9 @@ acpi_video_bus_get_one_device(struct acpi_device *device, acpi_video_device_bind(video, data); acpi_video_device_find_cap(data); + if (data->cap._BCM && data->cap._BCL) + has_backlight = true; + mutex_lock(&video->device_list_lock); list_add_tail(&data->entry, &video->video_device_list); mutex_unlock(&video->device_list_lock); @@ -2276,6 +2280,7 @@ void acpi_video_unregister(void) cancel_delayed_work_sync(&video_bus_register_backlight_work); acpi_bus_unregister_driver(&acpi_video_bus); register_count = 0; + has_backlight = false; } mutex_unlock(®ister_count_mutex); } @@ -2294,13 +2299,7 @@ EXPORT_SYMBOL(acpi_video_register_backlight); bool acpi_video_handles_brightness_key_presses(void) { - bool have_video_busses; - - mutex_lock(&video_list_lock); - have_video_busses = !list_empty(&video_bus_head); - mutex_unlock(&video_list_lock); - - return have_video_busses && + return has_backlight && (report_key_events & REPORT_BRIGHTNESS_KEY_EVENTS); } EXPORT_SYMBOL(acpi_video_handles_brightness_key_presses);
Some systems have an ACPI video bus but not ACPI video devices with backlight capability. On these devices brightness key-presses are (logically) not reported through the ACPI video bus. Change how acpi_video_handles_brightness_key_presses() determines if brightness key-presses are handled by the ACPI video driver to avoid vendor specific drivers/platform/x86 drivers filtering out their brightness key-presses even though they are the only ones reporting these presses. Fixes: ed83c9171829 ("platform/x86: panasonic-laptop: Resolve hotkey double trigger bug") Reported-and-tested-by: Stefan Seyfried <seife+kernel@b1-systems.com> Reported-and-tested-by: Kenneth Chan <kenneth.t.chan@gmail.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/acpi/acpi_video.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)