diff options
| author | Len Brown <len.brown@intel.com> | 2010-01-20 01:14:41 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-01-20 01:14:41 -0500 |
| commit | 093e2961fea5b3b1075dce5b0112c676206988da (patch) | |
| tree | 95beed94e888cc12e6f59b4e9100b960842680d7 | |
| parent | 9c6a6b3cbcbbe39a018aba7f1b2b76e67cba0e9f (diff) | |
| parent | c504f8cb68eb0d6cde53ba043daff8cb34586493 (diff) | |
| download | linux-3.10-093e2961fea5b3b1075dce5b0112c676206988da.tar.gz linux-3.10-093e2961fea5b3b1075dce5b0112c676206988da.tar.bz2 linux-3.10-093e2961fea5b3b1075dce5b0112c676206988da.zip | |
Merge branch 'bugzilla-13577-video' into release
| -rw-r--r-- | drivers/acpi/video.c | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 72e76b4b653..b765790b32b 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -78,6 +78,13 @@ MODULE_LICENSE("GPL"); static int brightness_switch_enabled = 1; module_param(brightness_switch_enabled, bool, 0644); +/* + * By default, we don't allow duplicate ACPI video bus devices + * under the same VGA controller + */ +static int allow_duplicates; +module_param(allow_duplicates, 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); @@ -2239,11 +2246,47 @@ static int acpi_video_resume(struct acpi_device *device) return AE_OK; } +static acpi_status +acpi_video_bus_match(acpi_handle handle, u32 level, void *context, + void **return_value) +{ + struct acpi_device *device = context; + struct acpi_device *sibling; + int result; + + if (handle == device->handle) + return AE_CTRL_TERMINATE; + + result = acpi_bus_get_device(handle, &sibling); + if (result) + return AE_OK; + + if (!strcmp(acpi_device_name(sibling), ACPI_VIDEO_BUS_NAME)) + return AE_ALREADY_EXISTS; + + return AE_OK; +} + static int acpi_video_bus_add(struct acpi_device *device) { struct acpi_video_bus *video; struct input_dev *input; int error; + acpi_status status; + + status = acpi_walk_namespace(ACPI_TYPE_DEVICE, + device->parent->handle, 1, + acpi_video_bus_match, NULL, + device, NULL); + if (status == AE_ALREADY_EXISTS) { + printk(KERN_WARNING FW_BUG + "Duplicate ACPI video bus devices for the" + " same VGA controller, please try module " + "parameter \"video.allow_duplicates=1\"" + "if the current driver doesn't work.\n"); + if (!allow_duplicates) + return -ENODEV; + } video = kzalloc(sizeof(struct acpi_video_bus), GFP_KERNEL); if (!video) |