| Message ID | 1452760908-15965-4-git-send-email-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
On Thu, Jan 14, 2016 at 09:41:48AM +0100, Hans de Goede wrote: > acpi_video_handles_brightness_key_presses()'s may return false if the i915 > driver is not loaded yet when thinkpad_acpi loads, and then return true > after the i915 driver has loaded. This means that thinkpad_acpi cannot > use it as is since thinkpad_acpi caches the return value. > > This reverts commit 7714687a2b2d ("thinkpad_acpi: Use > acpi_video_handles_brightness_key_presses()"). > Rafael, I presume this would go through your tree? No objection from me. Henrique? Acked-by: Darren Hart <dvhart@linux.intel.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/platform/x86/thinkpad_acpi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c > index f453d5d..0bed473 100644 > --- a/drivers/platform/x86/thinkpad_acpi.c > +++ b/drivers/platform/x86/thinkpad_acpi.c > @@ -3488,7 +3488,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) > /* Do not issue duplicate brightness change events to > * userspace. tpacpi_detect_brightness_capabilities() must have > * been called before this point */ > - if (acpi_video_handles_brightness_key_presses()) { > + if (acpi_video_get_backlight_type() != acpi_backlight_vendor) { > pr_info("This ThinkPad has standard ACPI backlight " > "brightness control, supported by the ACPI " > "video driver\n"); > -- > 2.5.0 > >
On Thu, Jan 14, 2016, at 21:18, Darren Hart wrote: > On Thu, Jan 14, 2016 at 09:41:48AM +0100, Hans de Goede wrote: > > acpi_video_handles_brightness_key_presses()'s may return false if the i915 > > driver is not loaded yet when thinkpad_acpi loads, and then return true > > after the i915 driver has loaded. This means that thinkpad_acpi cannot > > use it as is since thinkpad_acpi caches the return value. > > > > This reverts commit 7714687a2b2d ("thinkpad_acpi: Use > > acpi_video_handles_brightness_key_presses()"). > > > > Rafael, I presume this would go through your tree? > > No objection from me. Henrique? Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> > > Acked-by: Darren Hart <dvhart@linux.intel.com> > > > Signed-off-by: Hans de Goede <hdegoede@redhat.com>
On Thursday, January 14, 2016 03:18:56 PM Darren Hart wrote: > On Thu, Jan 14, 2016 at 09:41:48AM +0100, Hans de Goede wrote: > > acpi_video_handles_brightness_key_presses()'s may return false if the i915 > > driver is not loaded yet when thinkpad_acpi loads, and then return true > > after the i915 driver has loaded. This means that thinkpad_acpi cannot > > use it as is since thinkpad_acpi caches the return value. > > > > This reverts commit 7714687a2b2d ("thinkpad_acpi: Use > > acpi_video_handles_brightness_key_presses()"). > > > > Rafael, I presume this would go through your tree? Yes, I'll take care of this, thanks! > No objection from me. Henrique? > > Acked-by: Darren Hart <dvhart@linux.intel.com> > > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > --- > > drivers/platform/x86/thinkpad_acpi.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c > > index f453d5d..0bed473 100644 > > --- a/drivers/platform/x86/thinkpad_acpi.c > > +++ b/drivers/platform/x86/thinkpad_acpi.c > > @@ -3488,7 +3488,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) > > /* Do not issue duplicate brightness change events to > > * userspace. tpacpi_detect_brightness_capabilities() must have > > * been called before this point */ > > - if (acpi_video_handles_brightness_key_presses()) { > > + if (acpi_video_get_backlight_type() != acpi_backlight_vendor) { > > pr_info("This ThinkPad has standard ACPI backlight " > > "brightness control, supported by the ACPI " > > "video driver\n"); > >
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index f453d5d..0bed473 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -3488,7 +3488,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) /* Do not issue duplicate brightness change events to * userspace. tpacpi_detect_brightness_capabilities() must have * been called before this point */ - if (acpi_video_handles_brightness_key_presses()) { + if (acpi_video_get_backlight_type() != acpi_backlight_vendor) { pr_info("This ThinkPad has standard ACPI backlight " "brightness control, supported by the ACPI " "video driver\n");
acpi_video_handles_brightness_key_presses()'s may return false if the i915 driver is not loaded yet when thinkpad_acpi loads, and then return true after the i915 driver has loaded. This means that thinkpad_acpi cannot use it as is since thinkpad_acpi caches the return value. This reverts commit 7714687a2b2d ("thinkpad_acpi: Use acpi_video_handles_brightness_key_presses()"). Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/platform/x86/thinkpad_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)