From mboxrd@z Thu Jan 1 00:00:00 1970 From: Darren Hart Subject: Re: [PATCH 4/4] Revert "thinkpad_acpi: Use acpi_video_handles_brightness_key_presses()" Date: Thu, 14 Jan 2016 15:18:56 -0800 Message-ID: <20160114231856.GA20294@malice.jf.intel.com> References: <1452760908-15965-1-git-send-email-hdegoede@redhat.com> <1452760908-15965-4-git-send-email-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1452760908-15965-4-git-send-email-hdegoede@redhat.com> Sender: platform-driver-x86-owner@vger.kernel.org To: Hans de Goede Cc: Henrique de Moraes Holschuh , "Rafael J. Wysocki" , platform-driver-x86@vger.kernel.org, ibm-acpi-devel@lists.sourceforge.net, Adrien Schildknecht , Zhang Rui , Len Brown , linux-acpi@vger.kernel.org List-Id: linux-acpi@vger.kernel.org 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 > Signed-off-by: Hans de Goede > --- > 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 > > -- Darren Hart Intel Open Source Technology Center