The patch titled
acpi: ignore ACPI video devices that aren't present in hardware
has been removed from the -mm tree. Its filename was
acpi-ignore-acpi-video-devices-that-arent-present-in-hardware.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: acpi: ignore ACPI video devices that aren't present in hardware
From: Matthew Garrett <mjg59@xxxxxxxxxxxxx>
Vendors often ship machines with a choice of integrated or discrete
graphics, and use the same DSDT for both. As a result, the ACPI video
module will locate devices that may not exist on this specific platform.
Attempt to determine whether the device exists or not, and abort the device
creation if it doesn't.
Signed-off-by: Matthew Garrett <mjg59@xxxxxxxxxxxxx>
Cc: Thomas Renninger <trenn@xxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: "Li, Shaohua" <shaohua.li@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/video.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff -puN drivers/acpi/video.c~acpi-ignore-acpi-video-devices-that-arent-present-in-hardware drivers/acpi/video.c
--- a/drivers/acpi/video.c~acpi-ignore-acpi-video-devices-that-arent-present-in-hardware
+++ a/drivers/acpi/video.c
@@ -1268,8 +1268,37 @@ acpi_video_bus_write_DOS(struct file *fi
static int acpi_video_bus_add_fs(struct acpi_device *device)
{
+ long device_id;
+ int status;
struct proc_dir_entry *entry = NULL;
struct acpi_video_bus *video;
+ struct device *dev;
+
+ status =
+ acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
+
+ if (!ACPI_SUCCESS(status))
+ return -ENODEV;
+
+ /* We need to attempt to determine whether the _ADR refers to a
+ PCI device or not. There's no terribly good way to do this,
+ so the best we can hope for is to assume that there'll never
+ be a video device in the host bridge */
+ if (device_id >= 0x10000) {
+ /* It looks like a PCI device. Does it exist? */
+ dev = acpi_get_physical_device(device->handle);
+ } else {
+ /* It doesn't look like a PCI device. Does its parent
+ exist? */
+ acpi_handle phandle;
+ if (acpi_get_parent(device->handle, &phandle))
+ return -ENODEV;
+ dev = acpi_get_physical_device(phandle);
+ }
+ if (!dev)
+ return -ENODEV;
+ put_device(dev);
+
video = acpi_driver_data(device);
_
Patches currently in -mm which might be from mjg59@xxxxxxxxxxxxx are
git-acpi.patch
acpi-backlight-reset-brightness-on-resume.patch
acpi-backlight-reset-brightness-on-resume-checkpatch-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
