aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/asus-wmi.c
diff options
context:
space:
mode:
authorAceLan Kao <acelan.kao@canonical.com>2012-06-13 03:32:06 -0400
committerMatthew Garrett <mjg@redhat.com>2012-07-28 00:11:49 -0400
commit272c77d55672ef92eda9d5e24a5a7ac62df9c431 (patch)
tree8c960ccb629eb89e638810a96195573313d617d1 /drivers/platform/x86/asus-wmi.c
parente052067df00592b1b62d1d438191b931f2009cbb (diff)
asus-wmi: control backlight power through WMI, not ACPI
BugLink: https://bugs.launchpad.net/bugs/1000146 Some h/w that can adjust screen brightness through ACPI functions, but can't turn on/off the backlight power correctly. So, we list those h/w in quirks and try to turn on/off the backlight power through WMI. Signed-off-by: AceLan Kao <acelan.kao@canonical.com> Signed-off-by: Corentin Chary <corentin.chary@gmail.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86/asus-wmi.c')
-rw-r--r--drivers/platform/x86/asus-wmi.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 556cbb455ed..486f836b79d 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -47,6 +47,9 @@
47#include <linux/thermal.h> 47#include <linux/thermal.h>
48#include <acpi/acpi_bus.h> 48#include <acpi/acpi_bus.h>
49#include <acpi/acpi_drivers.h> 49#include <acpi/acpi_drivers.h>
50#ifdef CONFIG_ACPI_VIDEO
51#include <acpi/video.h>
52#endif
50 53
51#include "asus-wmi.h" 54#include "asus-wmi.h"
52 55
@@ -1676,7 +1679,13 @@ static int asus_wmi_add(struct platform_device *pdev)
1676 if (err) 1679 if (err)
1677 goto fail_rfkill; 1680 goto fail_rfkill;
1678 1681
1682 if (asus->driver->quirks->wmi_backlight_power)
1683 acpi_video_dmi_promote_vendor();
1679 if (!acpi_video_backlight_support()) { 1684 if (!acpi_video_backlight_support()) {
1685#ifdef CONFIG_ACPI_VIDEO
1686 pr_info("Disabling ACPI video driver\n");
1687 acpi_video_unregister();
1688#endif
1680 err = asus_wmi_backlight_init(asus); 1689 err = asus_wmi_backlight_init(asus);
1681 if (err && err != -ENODEV) 1690 if (err && err != -ENODEV)
1682 goto fail_backlight; 1691 goto fail_backlight;