aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Figg <brad.figg@canonical.com>2012-03-29 08:53:11 -0700
committerJohn Rigby <john.rigby@linaro.org>2012-06-25 15:02:23 -0600
commit437250f1d8d062296cf37fc994bd2ed5e1b0cac1 (patch)
tree385b8f247359b4c81760c3e434b96458e7c93e68
parenta4f27db0fb56bfcff76fd698ca4d8d4b76898a29 (diff)
UBUNTU: SAUCE (no-up) Provide a param for allowing the BIOS to handle changing the brightness on AC/battery status changes.
BugLink: http://bugs.launchpad.net/bugs/949311 We currently carry a SAUCE patch which lets the OS handle the brightness levels automatically when connecting/disconnecting AC. There are some laptops (MSI Wind) for which this doesn't work. Provide a driver param which allows this behaviour to be overriden. Signed-off-by: Brad Figg <brad.figg@canonical.com> Acked-by: Colin King <colin.king@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
-rw-r--r--drivers/acpi/video.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 9006942eacb..e58b53c86ae 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -73,6 +73,14 @@ static bool brightness_switch_enabled = 1;
module_param(brightness_switch_enabled, bool, 0644);
/*
+ * The Default is to let the OS handle brightness autoswitching due to
+ * AC/battery status changes. On some laptops (MSI Wind) this doesn't
+ * work so we need a workaround.
+ */
+static int brightness_autoswitch_via_bios = 0;
+module_param(brightness_autoswitch_via_bios, bool, 0644);
+
+/*
* By default, we don't allow duplicate ACPI video bus devices
* under the same VGA controller
*/
@@ -1423,7 +1431,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video)
static int acpi_video_bus_start_devices(struct acpi_video_bus *video)
{
- return acpi_video_bus_DOS(video, 0, 1);
+ return acpi_video_bus_DOS(video, 0, !brightness_autoswitch_via_bios);
}
static int acpi_video_bus_stop_devices(struct acpi_video_bus *video)