Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (59 commits) ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework ACPI: fix resource check message ACPI / Battery: Update information on info notification and resume ACPI: Drop device flag wake_capable ACPI: Always check if _PRW is present before trying to evaluate it ACPI / PM: Check status of power resources under mutexes ACPI / PM: Rename acpi_power_off_device() ACPI / PM: Drop acpi_power_nocheck ACPI / PM: Drop acpi_bus_get_power() Platform / x86: Make fujitsu_laptop use acpi_bus_update_power() ACPI / Fan: Rework the handling of power resources ACPI / PM: Register power resource devices as soon as they are needed ACPI / PM: Register acpi_power_driver early ACPI / PM: Add function for updating device power state consistently ACPI / PM: Add function for device power state initialization ACPI / PM: Introduce __acpi_bus_get_power() ACPI / PM: Introduce function for refcounting device power resources ACPI / PM: Add functions for manipulating lists of power resources ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes ACPICA: Update version to 20101209 ...
This commit is contained in:
Linus Torvalds
@@ -33,7 +33,6 @@
|
||||
#include <linux/input.h>
|
||||
#include <linux/backlight.h>
|
||||
#include <linux/thermal.h>
|
||||
#include <linux/video_output.h>
|
||||
#include <linux/sort.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/pci_ids.h>
|
||||
@@ -81,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);
|
||||
@@ -172,9 +178,6 @@ struct acpi_video_device_cap {
|
||||
u8 _BQC:1; /* Get current brightness level */
|
||||
u8 _BCQ:1; /* Some buggy BIOS uses _BCQ instead of _BQC */
|
||||
u8 _DDC:1; /*Return the EDID for this device */
|
||||
u8 _DCS:1; /*Return status of output device */
|
||||
u8 _DGS:1; /*Query graphics state */
|
||||
u8 _DSS:1; /*Device state set */
|
||||
};
|
||||
|
||||
struct acpi_video_brightness_flags {
|
||||
@@ -202,7 +205,6 @@ struct acpi_video_device {
|
||||
struct acpi_video_device_brightness *brightness;
|
||||
struct backlight_device *backlight;
|
||||
struct thermal_cooling_device *cooling_dev;
|
||||
struct output_device *output_dev;
|
||||
};
|
||||
|
||||
static const char device_decode[][30] = {
|
||||
@@ -226,10 +228,6 @@ static int acpi_video_get_next_level(struct acpi_video_device *device,
|
||||
u32 level_current, u32 event);
|
||||
static int acpi_video_switch_brightness(struct acpi_video_device *device,
|
||||
int event);
|
||||
static int acpi_video_device_get_state(struct acpi_video_device *device,
|
||||
unsigned long long *state);
|
||||
static int acpi_video_output_get(struct output_device *od);
|
||||
static int acpi_video_device_set_state(struct acpi_video_device *device, int state);
|
||||
|
||||
/*backlight device sysfs support*/
|
||||
static int acpi_video_get_brightness(struct backlight_device *bd)
|
||||
@@ -265,30 +263,6 @@ static const struct backlight_ops acpi_backlight_ops = {
|
||||
.update_status = acpi_video_set_brightness,
|
||||
};
|
||||
|
||||
/*video output device sysfs support*/
|
||||
static int acpi_video_output_get(struct output_device *od)
|
||||
{
|
||||
unsigned long long state;
|
||||
struct acpi_video_device *vd =
|
||||
(struct acpi_video_device *)dev_get_drvdata(&od->dev);
|
||||
acpi_video_device_get_state(vd, &state);
|
||||
return (int)state;
|
||||
}
|
||||
|
||||
static int acpi_video_output_set(struct output_device *od)
|
||||
{
|
||||
unsigned long state = od->request_state;
|
||||
struct acpi_video_device *vd=
|
||||
(struct acpi_video_device *)dev_get_drvdata(&od->dev);
|
||||
return acpi_video_device_set_state(vd, state);
|
||||
}
|
||||
|
||||
static struct output_properties acpi_output_properties = {
|
||||
.set_state = acpi_video_output_set,
|
||||
.get_status = acpi_video_output_get,
|
||||
};
|
||||
|
||||
|
||||
/* thermal cooling device callbacks */
|
||||
static int video_get_max_state(struct thermal_cooling_device *cooling_dev, unsigned
|
||||
long *state)
|
||||
@@ -344,34 +318,6 @@ static struct thermal_cooling_device_ops video_cooling_ops = {
|
||||
Video Management
|
||||
-------------------------------------------------------------------------- */
|
||||
|
||||
/* device */
|
||||
|
||||
static int
|
||||
acpi_video_device_get_state(struct acpi_video_device *device,
|
||||
unsigned long long *state)
|
||||
{
|
||||
int status;
|
||||
|
||||
status = acpi_evaluate_integer(device->dev->handle, "_DCS", NULL, state);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
static int
|
||||
acpi_video_device_set_state(struct acpi_video_device *device, int state)
|
||||
{
|
||||
int status;
|
||||
union acpi_object arg0 = { ACPI_TYPE_INTEGER };
|
||||
struct acpi_object_list args = { 1, &arg0 };
|
||||
unsigned long long ret;
|
||||
|
||||
|
||||
arg0.integer.value = state;
|
||||
status = acpi_evaluate_integer(device->dev->handle, "_DSS", &args, &ret);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
static int
|
||||
acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
|
||||
union acpi_object **levels)
|
||||
@@ -766,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;
|
||||
}
|
||||
|
||||
@@ -831,15 +779,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
|
||||
if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DDC", &h_dummy1))) {
|
||||
device->cap._DDC = 1;
|
||||
}
|
||||
if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DCS", &h_dummy1))) {
|
||||
device->cap._DCS = 1;
|
||||
}
|
||||
if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DGS", &h_dummy1))) {
|
||||
device->cap._DGS = 1;
|
||||
}
|
||||
if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DSS", &h_dummy1))) {
|
||||
device->cap._DSS = 1;
|
||||
}
|
||||
|
||||
if (acpi_video_backlight_support()) {
|
||||
struct backlight_properties props;
|
||||
@@ -904,21 +843,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
|
||||
printk(KERN_ERR PREFIX "Create sysfs link\n");
|
||||
|
||||
}
|
||||
|
||||
if (acpi_video_display_switch_support()) {
|
||||
|
||||
if (device->cap._DCS && device->cap._DSS) {
|
||||
static int count;
|
||||
char *name;
|
||||
name = kasprintf(GFP_KERNEL, "acpi_video%d", count);
|
||||
if (!name)
|
||||
return;
|
||||
count++;
|
||||
device->output_dev = video_output_register(name,
|
||||
NULL, device, &acpi_output_properties);
|
||||
kfree(name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1360,6 +1284,9 @@ int acpi_video_get_edid(struct acpi_device *device, int type, int device_id,
|
||||
if (!video_device)
|
||||
continue;
|
||||
|
||||
if (!video_device->cap._DDC)
|
||||
continue;
|
||||
|
||||
if (type) {
|
||||
switch (type) {
|
||||
case ACPI_VIDEO_DISPLAY_CRT:
|
||||
@@ -1452,7 +1379,6 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
|
||||
thermal_cooling_device_unregister(device->cooling_dev);
|
||||
device->cooling_dev = NULL;
|
||||
}
|
||||
video_output_unregister(device->output_dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Verwijs in nieuw issue
Block a user