Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 367615
b: refs/heads/master
c: 91e13aa
h: refs/heads/master
i:
  367613: ec5e4c9
  367611: abfb22d
  367607: 8675b97
  367599: 014658f
  367583: 8425690
  367551: d49d9d8
  367487: 9186cc3
  367359: 066e864
  367103: ca901e4
  366591: 93d68ee
v: v3
  • Loading branch information
Aaron Lu authored and Rafael J. Wysocki committed Apr 25, 2013
1 parent 138ad5f commit 2f1afb9
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 78 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a6432ded299726f123b93d0132fead200551535c
refs/heads/master: 91e13aa37023437c260c85a3f17308052bbfbfa2
143 changes: 66 additions & 77 deletions trunk/drivers/acpi/video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ struct acpi_video_device_flags {
u8 dvi:1;
u8 bios:1;
u8 unknown:1;
u8 reserved:2;
u8 notify:1;
u8 reserved:1;
};

struct acpi_video_device_cap {
Expand Down Expand Up @@ -1074,53 +1075,51 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
struct acpi_video_device *data;
struct acpi_video_device_attrib* attribute;

if (!device || !video)
return -EINVAL;

status =
acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
if (ACPI_SUCCESS(status)) {

data = kzalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
if (!data)
return -ENOMEM;

strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
device->driver_data = data;

data->device_id = device_id;
data->video = video;
data->dev = device;
/* Some device omits _ADR, we skip them instead of fail */
if (ACPI_FAILURE(status))
return 0;

attribute = acpi_video_get_device_attr(video, device_id);
data = kzalloc(sizeof(struct acpi_video_device), GFP_KERNEL);
if (!data)
return -ENOMEM;

if((attribute != NULL) && attribute->device_id_scheme) {
switch (attribute->display_type) {
case ACPI_VIDEO_DISPLAY_CRT:
data->flags.crt = 1;
break;
case ACPI_VIDEO_DISPLAY_TV:
data->flags.tvout = 1;
break;
case ACPI_VIDEO_DISPLAY_DVI:
data->flags.dvi = 1;
break;
case ACPI_VIDEO_DISPLAY_LCD:
data->flags.lcd = 1;
break;
default:
data->flags.unknown = 1;
break;
}
if(attribute->bios_can_detect)
data->flags.bios = 1;
} else {
/* Check for legacy IDs */
device_type = acpi_video_get_device_type(video,
device_id);
/* Ignore bits 16 and 18-20 */
switch (device_type & 0xffe2ffff) {
strcpy(acpi_device_name(device), ACPI_VIDEO_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_VIDEO_CLASS);
device->driver_data = data;

data->device_id = device_id;
data->video = video;
data->dev = device;

attribute = acpi_video_get_device_attr(video, device_id);

if((attribute != NULL) && attribute->device_id_scheme) {
switch (attribute->display_type) {
case ACPI_VIDEO_DISPLAY_CRT:
data->flags.crt = 1;
break;
case ACPI_VIDEO_DISPLAY_TV:
data->flags.tvout = 1;
break;
case ACPI_VIDEO_DISPLAY_DVI:
data->flags.dvi = 1;
break;
case ACPI_VIDEO_DISPLAY_LCD:
data->flags.lcd = 1;
break;
default:
data->flags.unknown = 1;
break;
}
if(attribute->bios_can_detect)
data->flags.bios = 1;
} else {
/* Check for legacy IDs */
device_type = acpi_video_get_device_type(video, device_id);
/* Ignore bits 16 and 18-20 */
switch (device_type & 0xffe2ffff) {
case ACPI_VIDEO_DISPLAY_LEGACY_MONITOR:
data->flags.crt = 1;
break;
Expand All @@ -1132,34 +1131,24 @@ acpi_video_bus_get_one_device(struct acpi_device *device,
break;
default:
data->flags.unknown = 1;
}
}
}

acpi_video_device_bind(video, data);
acpi_video_device_find_cap(data);

status = acpi_install_notify_handler(device->handle,
ACPI_DEVICE_NOTIFY,
acpi_video_device_notify,
data);
if (ACPI_FAILURE(status)) {
printk(KERN_ERR PREFIX
"Error installing notify handler\n");
if(data->brightness)
kfree(data->brightness->levels);
kfree(data->brightness);
kfree(data);
return -ENODEV;
}
acpi_video_device_bind(video, data);
acpi_video_device_find_cap(data);

mutex_lock(&video->device_list_lock);
list_add_tail(&data->entry, &video->video_device_list);
mutex_unlock(&video->device_list_lock);
status = acpi_install_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
acpi_video_device_notify, data);
if (ACPI_FAILURE(status))
dev_err(&device->dev, "Error installing notify handler\n");
else
data->flags.notify = 1;

return 0;
}
mutex_lock(&video->device_list_lock);
list_add_tail(&data->entry, &video->video_device_list);
mutex_unlock(&video->device_list_lock);

return -ENOENT;
return status;
}

/*
Expand Down Expand Up @@ -1452,9 +1441,8 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video,

status = acpi_video_bus_get_one_device(dev, video);
if (status) {
printk(KERN_WARNING PREFIX
"Can't attach device\n");
continue;
dev_err(&dev->dev, "Can't attach device\n");
break;
}
}
return status;
Expand All @@ -1467,13 +1455,14 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device)
if (!device || !device->video)
return -ENOENT;

status = acpi_remove_notify_handler(device->dev->handle,
ACPI_DEVICE_NOTIFY,
acpi_video_device_notify);
if (ACPI_FAILURE(status)) {
printk(KERN_WARNING PREFIX
"Can't remove video notify handler\n");
if (device->flags.notify) {
status = acpi_remove_notify_handler(device->dev->handle,
ACPI_DEVICE_NOTIFY, acpi_video_device_notify);
if (ACPI_FAILURE(status))
dev_err(&device->dev->dev,
"Can't remove video notify handler\n");
}

if (device->backlight) {
backlight_device_unregister(device->backlight);
device->backlight = NULL;
Expand Down Expand Up @@ -1755,7 +1744,7 @@ static int acpi_video_bus_add(struct acpi_device *device)

error = acpi_video_bus_get_devices(video, device);
if (error)
goto err_free_video;
goto err_put_video;

video->input = input = input_allocate_device();
if (!input) {
Expand Down

0 comments on commit 2f1afb9

Please sign in to comment.