aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 05:09:35 -0500
committerLen Brown <len.brown@intel.com>2011-01-12 05:09:35 -0500
commit3e098984073795bff5e5e3edbc1f5b0514c47c92 (patch)
tree5bdc87d02aa7e85c62eab82872a3f6e8c3a3b1b2 /drivers/acpi
parentda8aeb92d4853f37e281f11fddf61f9c7d84c3cd (diff)
parent99fd1895ef603f1a0fa9af478c96c637a7b4529d (diff)
downloadlinux-linaro-android-3e098984073795bff5e5e3edbc1f5b0514c47c92.tar.gz
Merge branch 'bugzilla-21212' into release
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/video.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 177b4ddc347..9f8c465d381 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -80,6 +80,13 @@ module_param(brightness_switch_enabled, bool, 0644);
static int allow_duplicates;
module_param(allow_duplicates, bool, 0644);
+/*
+ * Some BIOSes claim they use minimum backlight at boot,
+ * and this may bring dimming screen after boot
+ */
+static int use_bios_initial_backlight = 1;
+module_param(use_bios_initial_backlight, bool, 0644);
+
static int register_count = 0;
static int acpi_video_bus_add(struct acpi_device *device);
static int acpi_video_bus_remove(struct acpi_device *device, int type);
@@ -705,9 +712,11 @@ acpi_video_init_brightness(struct acpi_video_device *device)
* when invoked for the first time, i.e. level_old is invalid.
* set the backlight to max_level in this case
*/
- for (i = 2; i < br->count; i++)
- if (level_old == br->levels[i])
- level = level_old;
+ if (use_bios_initial_backlight) {
+ for (i = 2; i < br->count; i++)
+ if (level_old == br->levels[i])
+ level = level_old;
+ }
goto set_level;
}