Merge branch 'video' into release

Conflicts: Documentation/kernel-parameters.txt Signed-off-by: Len Brown <len.brown@intel.com>

Merge branch 'video' into release
Conflicts: Documentation/kernel-parameters.txt Signed-off-by: Len Brown <len.brown@intel.com>
Len Brown
2 parents 9b5a56ddfd 2dba1b5d87
Showing 16 changed files Side-by-side Diff
Documentation/kernel-parameters.txt
drivers/acpi/Makefile
drivers/acpi/glue.c
drivers/acpi/scan.c
drivers/acpi/video.c
drivers/acpi/video_detect.c
drivers/misc/acer-wmi.c
drivers/misc/asus-laptop.c
drivers/misc/compal-laptop.c
drivers/misc/eeepc-laptop.c
drivers/misc/fujitsu-laptop.c
drivers/misc/msi-laptop.c
drivers/misc/sony-laptop.c
drivers/misc/thinkpad_acpi.c
include/acpi/acpi_bus.h
include/linux/acpi.h
@@ -198,6 +198,18 @@
 			that require a timer override, but don't have
 			HPET
  
+	acpi_backlight=	[HW,ACPI]
+			acpi_backlight=vendor
+			acpi_backlight=video
+			If set to vendor, prefer vendor specific driver
+			(e.g. thinkpad_acpi, sony_acpi, etc.) instead
+			of the ACPI video.ko driver.
+
+	acpi_display_output=	[HW,ACPI]
+			acpi_display_output=vendor
+			acpi_display_output=video
+			See above.
+
 	acpi.debug_layer=	[HW,ACPI,ACPI_DEBUG]
 	acpi.debug_level=	[HW,ACPI,ACPI_DEBUG]
 			Format: <int>
@@ -46,6 +46,10 @@
 obj-$(CONFIG_ACPI_FAN)		+= fan.o
 obj-$(CONFIG_ACPI_DOCK)		+= dock.o
 obj-$(CONFIG_ACPI_VIDEO)	+= video.o
+ifdef CONFIG_ACPI_VIDEO
+obj-y				+= video_detect.o
+endif
+
 obj-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
 obj-$(CONFIG_ACPI_PCI_SLOT)	+= pci_slot.o
 obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o
@@ -140,6 +140,46 @@
  
 EXPORT_SYMBOL(acpi_get_physical_device);
  
+/* ToDo: When a PCI bridge is found, return the PCI device behind the bridge
+ *       This should work in general, but did not on a Lenovo T61 for the
+ *	 graphics card. But this must be fixed when the PCI device is
+ *       bound and the kernel device struct is attached to the acpi device
+ * Note: A success call will increase reference count by one
+ *       Do call put_device(dev) on the returned device then
+ */
+struct device *acpi_get_physical_pci_device(acpi_handle handle)
+{
+	struct device *dev;
+	long long device_id;
+	acpi_status status;
+
+	status =
+		acpi_evaluate_integer(handle, "_ADR", NULL, &device_id);
+
+	if (ACPI_FAILURE(status))
+		return NULL;
+
+	/* 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 device in the host bridge */
+	if (device_id >= 0x10000) {
+		/* It looks like a PCI device. Does it exist? */
+		dev = acpi_get_physical_device(handle);
+	} else {
+		/* It doesn't look like a PCI device. Does its parent
+		   exist? */
+		acpi_handle phandle;
+		if (acpi_get_parent(handle, &phandle))
+			return NULL;
+		dev = acpi_get_physical_device(phandle);
+	}
+	if (!dev)
+		return NULL;
+	return dev;
+}
+EXPORT_SYMBOL(acpi_get_physical_pci_device);
+
 static int acpi_bind_one(struct device *dev, acpi_handle handle)
 {
 	struct acpi_device *acpi_dev;
@@ -919,36 +919,6 @@
 	}
 }
  
-static int
-acpi_video_bus_match(struct acpi_device *device)
-{
-	acpi_handle h_dummy;
-
-	if (!device)
-		return -EINVAL;
-
-	/* Since there is no HID, CID for ACPI Video drivers, we have
-	 * to check well known required nodes for each feature we support.
-	 */
-
-	/* Does this device able to support video switching ? */
-	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) &&
-	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy)))
-		return 0;
-
-	/* Does this device able to retrieve a video ROM ? */
-	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy)))
-		return 0;
-
-	/* Does this device able to configure which video head to be POSTed ? */
-	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) &&
-	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) &&
-	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy)))
-		return 0;
-
-	return -ENODEV;
-}
-
 /*
  * acpi_bay_match - see if a device is an ejectable driver bay
  *
@@ -1031,7 +1001,7 @@
 		   will get autoloaded and the device might still match
 		   against another driver.
 		*/
-		if (ACPI_SUCCESS(acpi_video_bus_match(device)))
+		if (acpi_is_video_device(device))
 			cid_add = ACPI_VIDEO_HID;
 		else if (ACPI_SUCCESS(acpi_bay_match(device)))
 			cid_add = ACPI_BAY_HID;
@@ -738,7 +738,8 @@
 		device->cap._DSS = 1;
 	}
  
-	max_level = acpi_video_init_brightness(device);
+	if (acpi_video_backlight_support())
+		max_level = acpi_video_init_brightness(device);
  
 	if (device->cap._BCL && device->cap._BCM && max_level > 0) {
 		int result;
  
@@ -784,18 +785,21 @@
 			printk(KERN_ERR PREFIX "Create sysfs link\n");
  
 	}
-	if (device->cap._DCS && device->cap._DSS){
-		static int count = 0;
-		char *name;
-		name = kzalloc(MAX_NAME_LEN, GFP_KERNEL);
-		if (!name)
-			return;
-		sprintf(name, "acpi_video%d", count++);
-		device->output_dev = video_output_register(name,
-				NULL, device, &acpi_output_properties);
-		kfree(name);
+
+	if (acpi_video_display_switch_support()) {
+
+		if (device->cap._DCS && device->cap._DSS) {
+			static int count;
+			char *name;
+			name = kzalloc(MAX_NAME_LEN, GFP_KERNEL);
+			if (!name)
+				return;
+			sprintf(name, "acpi_video%d", count++);
+			device->output_dev = video_output_register(name,
+					NULL, device, &acpi_output_properties);
+			kfree(name);
+		}
 	}
-	return;
 }
  
 /*
  
  
@@ -841,10 +845,15 @@
 static int acpi_video_bus_check(struct acpi_video_bus *video)
 {
 	acpi_status status = -ENOENT;
+	struct device *dev;
  
-
 	if (!video)
 		return -EINVAL;
+
+	dev = acpi_get_physical_pci_device(video->device->handle);
+	if (!dev)
+		return -ENODEV;
+	put_device(dev);
  
 	/* Since there is no HID, CID and so on for VGA driver, we have
 	 * to check well known required nodes.
+/*
+ *  Copyright (C) 2008       SuSE Linux Products GmbH
+ *                           Thomas Renninger <trenn@suse.de>
+ *
+ *  May be copied or modified under the terms of the GNU General Public License
+ *
+ * video_detect.c:
+ * Provides acpi_is_video_device() for early scanning of ACPI devices in scan.c
+ * There a Linux specific (Spec does not provide a HID for video devices) is
+ * assinged
+ *
+ * After PCI devices are glued with ACPI devices
+ * acpi_get_physical_pci_device() can be called to identify ACPI graphics
+ * devices for which a real graphics card is plugged in
+ *
+ * Now acpi_video_get_capabilities() can be called to check which
+ * capabilities the graphics cards plugged in support. The check for general
+ * video capabilities will be triggered by the first caller of
+ * acpi_video_get_capabilities(NULL); which will happen when the first
+ * backlight (or display output) switching supporting driver calls:
+ * acpi_video_backlight_support();
+ *
+ * Depending on whether ACPI graphics extensions (cmp. ACPI spec Appendix B)
+ * are available, video.ko should be used to handle the device.
+ *
+ * Otherwise vendor specific drivers like thinkpad_acpi, asus_acpi,
+ * sony_acpi,... can take care about backlight brightness and display output
+ * switching.
+ *
+ * If CONFIG_ACPI_VIDEO is neither set as "compiled in" (y) nor as a module (m)
+ * this file will not be compiled, acpi_video_get_capabilities() and
+ * acpi_video_backlight_support() will always return 0 and vendor specific
+ * drivers always can handle backlight.
+ *
+ */
+
+#include <linux/acpi.h>
+#include <linux/dmi.h>
+
+ACPI_MODULE_NAME("video");
+#define _COMPONENT		ACPI_VIDEO_COMPONENT
+
+static long acpi_video_support;
+static bool acpi_video_caps_checked;
+
+static acpi_status
+acpi_backlight_cap_match(acpi_handle handle, u32 level, void *context,
+			  void **retyurn_value)
+{
+	long *cap = context;
+	acpi_handle h_dummy;
+
+	if (ACPI_SUCCESS(acpi_get_handle(handle, "_BCM", &h_dummy)) &&
+	    ACPI_SUCCESS(acpi_get_handle(handle, "_BCL", &h_dummy))) {
+		ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found generic backlight "
+				  "support\n"));
+		*cap |= ACPI_VIDEO_BACKLIGHT;
+		/* We have backlight support, no need to scan further */
+		return AE_CTRL_TERMINATE;
+	}
+	return 0;
+}
+
+/* Returns true if the device is a video device which can be handled by
+ * video.ko.
+ * The device will get a Linux specific CID added in scan.c to
+ * identify the device as an ACPI graphics device
+ * Be aware that the graphics device may not be physically present
+ * Use acpi_video_get_capabilities() to detect general ACPI video
+ * capabilities of present cards
+ */
+long acpi_is_video_device(struct acpi_device *device)
+{
+	acpi_handle h_dummy;
+	long video_caps = 0;
+
+	if (!device)
+		return 0;
+
+	/* Does this device able to support video switching ? */
+	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) &&
+	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy)))
+		video_caps |= ACPI_VIDEO_OUTPUT_SWITCHING;
+
+	/* Does this device able to retrieve a video ROM ? */
+	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy)))
+		video_caps |= ACPI_VIDEO_ROM_AVAILABLE;
+
+	/* Does this device able to configure which video head to be POSTed ? */
+	if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) &&
+	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) &&
+	    ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy)))
+		video_caps |= ACPI_VIDEO_DEVICE_POSTING;
+
+	/* Only check for backlight functionality if one of the above hit. */
+	if (video_caps)
+		acpi_walk_namespace(ACPI_TYPE_DEVICE, device->handle,
+				    ACPI_UINT32_MAX, acpi_backlight_cap_match,
+				    &video_caps, NULL);
+
+	return video_caps;
+}
+EXPORT_SYMBOL(acpi_is_video_device);
+
+static acpi_status
+find_video(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+	long *cap = context;
+	struct device *dev;
+	struct acpi_device *acpi_dev;
+
+	const struct acpi_device_id video_ids[] = {
+		{ACPI_VIDEO_HID, 0},
+		{"", 0},
+	};
+	if (acpi_bus_get_device(handle, &acpi_dev))
+		return AE_OK;
+
+	if (!acpi_match_device_ids(acpi_dev, video_ids)) {
+		dev = acpi_get_physical_pci_device(handle);
+		if (!dev)
+			return AE_OK;
+		put_device(dev);
+		*cap |= acpi_is_video_device(acpi_dev);
+	}
+	return AE_OK;
+}
+
+/*
+ * Returns the video capabilities of a specific ACPI graphics device
+ *
+ * if NULL is passed as argument all ACPI devices are enumerated and
+ * all graphics capabilities of physically present devices are
+ * summerized and returned. This is cached and done only once.
+ */
+long acpi_video_get_capabilities(acpi_handle graphics_handle)
+{
+	long caps = 0;
+	struct acpi_device *tmp_dev;
+	acpi_status status;
+
+	if (acpi_video_caps_checked && graphics_handle == NULL)
+		return acpi_video_support;
+
+	if (!graphics_handle) {
+		/* Only do the global walk through all graphics devices once */
+		acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+				    ACPI_UINT32_MAX, find_video,
+				    &caps, NULL);
+		/* There might be boot param flags set already... */
+		acpi_video_support |= caps;
+		acpi_video_caps_checked = 1;
+		/* Add blacklists here. Be careful to use the right *DMI* bits
+		 * to still be able to override logic via boot params, e.g.:
+		 *
+		 *   if (dmi_name_in_vendors("XY")) {
+		 *	acpi_video_support |=
+		 *		ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VENDOR;
+		 *	acpi_video_support |=
+		 *		ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;
+		 *}
+		 */
+	} else {
+		status = acpi_bus_get_device(graphics_handle, &tmp_dev);
+		if (ACPI_FAILURE(status)) {
+			ACPI_EXCEPTION((AE_INFO, status, "Invalid device"));
+			return 0;
+		}
+		acpi_walk_namespace(ACPI_TYPE_DEVICE, graphics_handle,
+				    ACPI_UINT32_MAX, find_video,
+				    &caps, NULL);
+	}
+	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "We have 0x%lX video support %s %s\n",
+			  graphics_handle ? caps : acpi_video_support,
+			  graphics_handle ? "on device " : "in general",
+			  graphics_handle ? acpi_device_bid(tmp_dev) : ""));
+	return caps;
+}
+EXPORT_SYMBOL(acpi_video_get_capabilities);
+
+/* Returns true if video.ko can do backlight switching */
+int acpi_video_backlight_support(void)
+{
+	/*
+	 * We must check whether the ACPI graphics device is physically plugged
+	 * in. Therefore this must be called after binding PCI and ACPI devices
+	 */
+	if (!acpi_video_caps_checked)
+		acpi_video_get_capabilities(NULL);
+
+	/* First check for boot param -> highest prio */
+	if (acpi_video_support & ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR)
+		return 0;
+	else if (acpi_video_support & ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO)
+		return 1;
+
+	/* Then check for DMI blacklist -> second highest prio */
+	if (acpi_video_support & ACPI_VIDEO_BACKLIGHT_DMI_VENDOR)
+		return 0;
+	else if (acpi_video_support & ACPI_VIDEO_BACKLIGHT_DMI_VIDEO)
+		return 1;
+
+	/* Then go the default way */
+	return acpi_video_support & ACPI_VIDEO_BACKLIGHT;
+}
+EXPORT_SYMBOL(acpi_video_backlight_support);
+
+/*
+ * Returns true if video.ko can do display output switching.
+ * This does not work well/at all with binary graphics drivers
+ * which disable system io ranges and do it on their own.
+ */
+int acpi_video_display_switch_support(void)
+{
+	if (!acpi_video_caps_checked)
+		acpi_video_get_capabilities(NULL);
+
+	if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR)
+		return 0;
+	else if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO)
+		return 1;
+
+	if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VENDOR)
+		return 0;
+	else if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VIDEO)
+		return 1;
+
+	return acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING;
+}
+EXPORT_SYMBOL(acpi_video_display_switch_support);
+
+/*
+ * Use acpi_display_output=vendor/video or acpi_backlight=vendor/video
+ * To force that backlight or display output switching is processed by vendor
+ * specific acpi drivers or video.ko driver.
+ */
+int __init acpi_backlight(char *str)
+{
+	if (str == NULL || *str == '\0')
+		return 1;
+	else {
+		if (!strcmp("vendor", str))
+			acpi_video_support |=
+				ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR;
+		if (!strcmp("video", str))
+			acpi_video_support |=
+				ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
+	}
+	return 1;
+}
+__setup("acpi_backlight=", acpi_backlight);
+
+int __init acpi_display_output(char *str)
+{
+	if (str == NULL || *str == '\0')
+		return 1;
+	else {
+		if (!strcmp("vendor", str))
+			acpi_video_support |=
+				ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR;
+		if (!strcmp("video", str))
+			acpi_video_support |=
+				ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
+	}
+	return 1;
+}
+__setup("acpi_display_output=", acpi_display_output);
@@ -1297,6 +1297,12 @@
  
 	set_quirks();
  
+	if (!acpi_video_backlight_support() && has_cap(ACER_CAP_BRIGHTNESS)) {
+		interface->capability &= ~ACER_CAP_BRIGHTNESS;
+		printk(ACER_INFO "Brightness must be controlled by "
+		       "generic video driver\n");
+	}
+
 	if (platform_driver_register(&acer_platform_driver)) {
 		printk(ACER_ERR "Unable to register platform driver.\n");
 		goto error_platform_register;
@@ -1208,9 +1208,13 @@
  
 	dev = acpi_get_physical_device(hotk->device->handle);
  
-	result = asus_backlight_init(dev);
-	if (result)
-		goto fail_backlight;
+	if (!acpi_video_backlight_support()) {
+		result = asus_backlight_init(dev);
+		if (result)
+			goto fail_backlight;
+	} else
+		printk(ASUS_INFO "Brightness ignored, must be controlled by "
+		       "ACPI video driver\n");
  
 	result = asus_led_init(dev);
 	if (result)
@@ -326,12 +326,14 @@
  
 	/* Register backlight stuff */
  
-	compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
-						&compalbl_ops);
-	if (IS_ERR(compalbl_device))
-		return PTR_ERR(compalbl_device);
+	if (!acpi_video_backlight_support()) {
+		compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
+							    &compalbl_ops);
+		if (IS_ERR(compalbl_device))
+			return PTR_ERR(compalbl_device);
  
-	compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
+		compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
+	}
  
 	ret = platform_driver_register(&compal_driver);
 	if (ret)
@@ -825,9 +825,15 @@
 		return -ENODEV;
 	}
 	dev = acpi_get_physical_device(ehotk->device->handle);
-	result = eeepc_backlight_init(dev);
-	if (result)
-		goto fail_backlight;
+
+	if (!acpi_video_backlight_support()) {
+		result = eeepc_backlight_init(dev);
+		if (result)
+			goto fail_backlight;
+	} else
+		printk(EEEPC_INFO "Backlight controlled by ACPI video "
+		       "driver\n");
+
 	result = eeepc_hwmon_init(dev);
 	if (result)
 		goto fail_hwmon;
@@ -1005,17 +1005,17 @@
  
 	/* Register backlight stuff */
  
-	fujitsu->bl_device =
-	    backlight_device_register("fujitsu-laptop", NULL, NULL,
-				      &fujitsubl_ops);
-	if (IS_ERR(fujitsu->bl_device))
-		return PTR_ERR(fujitsu->bl_device);
+	if (!acpi_video_backlight_support()) {
+		fujitsu->bl_device =
+			backlight_device_register("fujitsu-laptop", NULL, NULL,
+						  &fujitsubl_ops);
+		if (IS_ERR(fujitsu->bl_device))
+			return PTR_ERR(fujitsu->bl_device);
+		max_brightness = fujitsu->max_brightness;
+		fujitsu->bl_device->props.max_brightness = max_brightness - 1;
+		fujitsu->bl_device->props.brightness = fujitsu->brightness_level;
+	}
  
-	max_brightness = fujitsu->max_brightness;
-
-	fujitsu->bl_device->props.max_brightness = max_brightness - 1;
-	fujitsu->bl_device->props.brightness = fujitsu->brightness_level;
-
 	ret = platform_driver_register(&fujitsupf_driver);
 	if (ret)
 		goto fail_backlight;
@@ -1050,7 +1050,8 @@
  
 fail_backlight:
  
-	backlight_device_unregister(fujitsu->bl_device);
+	if (fujitsu->bl_device)
+		backlight_device_unregister(fujitsu->bl_device);
  
 fail_platform_device2:
  
@@ -1077,7 +1078,8 @@
 			   &fujitsupf_attribute_group);
 	platform_device_unregister(fujitsu->pf_device);
 	platform_driver_unregister(&fujitsupf_driver);
-	backlight_device_unregister(fujitsu->bl_device);
+	if (fujitsu->bl_device)
+		backlight_device_unregister(fujitsu->bl_device);
  
 	acpi_bus_unregister_driver(&acpi_fujitsu_driver);
  
@@ -347,12 +347,16 @@
  
 	/* Register backlight stuff */
  
-	msibl_device = backlight_device_register("msi-laptop-bl", NULL, NULL,
-						&msibl_ops);
-	if (IS_ERR(msibl_device))
-		return PTR_ERR(msibl_device);
-
-	msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1;
+	if (acpi_video_backlight_support()) {
+		printk(KERN_INFO "MSI: Brightness ignored, must be controlled "
+		       "by ACPI video driver\n");
+	} else {
+		msibl_device = backlight_device_register("msi-laptop-bl", NULL,
+							 NULL, &msibl_ops);
+		if (IS_ERR(msibl_device))
+			return PTR_ERR(msibl_device);
+		msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1;
+	}
  
 	ret = platform_driver_register(&msipf_driver);
 	if (ret)
@@ -1038,7 +1038,11 @@
 		goto outinput;
 	}
  
-	if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT", &handle))) {
+	if (!acpi_video_backlight_support()) {
+		printk(KERN_INFO DRV_PFX "Sony: Brightness ignored, must be "
+		       "controlled by ACPI video driver\n");
+	} else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT",
+						&handle))) {
 		sony_backlight_device = backlight_device_register("sony", NULL,
 								  NULL,
 								  &sony_backlight_ops);
@@ -4932,16 +4932,25 @@
 	 */
 	b = tpacpi_check_std_acpi_brightness_support();
 	if (b > 0) {
-		if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO) {
-			printk(TPACPI_NOTICE
-			       "Lenovo BIOS switched to ACPI backlight "
-			       "control mode\n");
-		}
-		if (brightness_enable > 1) {
-			printk(TPACPI_NOTICE
-			       "standard ACPI backlight interface "
-			       "available, not loading native one...\n");
-			return 1;
+
+		if (acpi_video_backlight_support()) {
+			if (brightness_enable > 1) {
+				printk(TPACPI_NOTICE
+				       "Standard ACPI backlight interface "
+				       "available, not loading native one.\n");
+				return 1;
+			} else if (brightness_enable == 1) {
+				printk(TPACPI_NOTICE
+				       "Backlight control force enabled, even if standard "
+				       "ACPI backlight interface is available\n");
+			}
+		} else {
+			if (brightness_enable > 1) {
+				printk(TPACPI_NOTICE
+				       "Standard ACPI backlight interface not "
+				       "available, thinkpad_acpi native "
+				       "brightness control enabled\n");
+			}
 		}
 	}
  
@@ -380,6 +380,8 @@
 int register_acpi_bus_type(struct acpi_bus_type *);
 int unregister_acpi_bus_type(struct acpi_bus_type *);
 struct device *acpi_get_physical_device(acpi_handle);
+struct device *acpi_get_physical_pci_device(acpi_handle);
+
 /* helper */
 acpi_handle acpi_get_child(acpi_handle, acpi_integer);
 acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int);
@@ -190,6 +190,50 @@
  
 #endif	/* CONFIG_ACPI_WMI */
  
+#define ACPI_VIDEO_OUTPUT_SWITCHING			0x0001
+#define ACPI_VIDEO_DEVICE_POSTING			0x0002
+#define ACPI_VIDEO_ROM_AVAILABLE			0x0004
+#define ACPI_VIDEO_BACKLIGHT				0x0008
+#define ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR		0x0010
+#define ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO		0x0020
+#define ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR	0x0040
+#define ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO		0x0080
+#define ACPI_VIDEO_BACKLIGHT_DMI_VENDOR			0x0100
+#define ACPI_VIDEO_BACKLIGHT_DMI_VIDEO			0x0200
+#define ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VENDOR		0x0400
+#define ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VIDEO		0x0800
+
+#if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE)
+
+extern long acpi_video_get_capabilities(acpi_handle graphics_dev_handle);
+extern long acpi_is_video_device(struct acpi_device *device);
+extern int acpi_video_backlight_support(void);
+extern int acpi_video_display_switch_support(void);
+
+#else
+
+static inline long acpi_video_get_capabilities(acpi_handle graphics_dev_handle)
+{
+	return 0;
+}
+
+static inline long acpi_is_video_device(struct acpi_device *device)
+{
+	return 0;
+}
+
+static inline int acpi_video_backlight_support(void)
+{
+	return 0;
+}
+
+static inline int acpi_video_display_switch_support(void)
+{
+	return 0;
+}
+
+#endif /* defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) */
+
 extern int acpi_blacklisted(void);
 #ifdef CONFIG_DMI
 extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
...	...	@@ -198,6 +198,18 @@
198	198	that require a timer override, but don't have
199	199	HPET
200	200
	201	+ acpi_backlight= [HW,ACPI]
	202	+ acpi_backlight=vendor
	203	+ acpi_backlight=video
	204	+ If set to vendor, prefer vendor specific driver
	205	+ (e.g. thinkpad_acpi, sony_acpi, etc.) instead
	206	+ of the ACPI video.ko driver.
	207	+
	208	+ acpi_display_output= [HW,ACPI]
	209	+ acpi_display_output=vendor
	210	+ acpi_display_output=video
	211	+ See above.
	212	+
201	213	acpi.debug_layer= [HW,ACPI,ACPI_DEBUG]
202	214	acpi.debug_level= [HW,ACPI,ACPI_DEBUG]
203	215	Format: <int>
...	...	@@ -46,6 +46,10 @@
46	46	obj-$(CONFIG_ACPI_FAN) += fan.o
47	47	obj-$(CONFIG_ACPI_DOCK) += dock.o
48	48	obj-$(CONFIG_ACPI_VIDEO) += video.o
	49	+ifdef CONFIG_ACPI_VIDEO
	50	+obj-y += video_detect.o
	51	+endif
	52	+
49	53	obj-y += pci_root.o pci_link.o pci_irq.o pci_bind.o
50	54	obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o
51	55	obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
...	...	@@ -140,6 +140,46 @@
140	140
141	141	EXPORT_SYMBOL(acpi_get_physical_device);
142	142
	143	+/* ToDo: When a PCI bridge is found, return the PCI device behind the bridge
	144	+ * This should work in general, but did not on a Lenovo T61 for the
	145	+ * graphics card. But this must be fixed when the PCI device is
	146	+ * bound and the kernel device struct is attached to the acpi device
	147	+ * Note: A success call will increase reference count by one
	148	+ * Do call put_device(dev) on the returned device then
	149	+ */
	150	+struct device *acpi_get_physical_pci_device(acpi_handle handle)
	151	+{
	152	+ struct device *dev;
	153	+ long long device_id;
	154	+ acpi_status status;
	155	+
	156	+ status =
	157	+ acpi_evaluate_integer(handle, "_ADR", NULL, &device_id);
	158	+
	159	+ if (ACPI_FAILURE(status))
	160	+ return NULL;
	161	+
	162	+ /* We need to attempt to determine whether the _ADR refers to a
	163	+ PCI device or not. There's no terribly good way to do this,
	164	+ so the best we can hope for is to assume that there'll never
	165	+ be a device in the host bridge */
	166	+ if (device_id >= 0x10000) {
	167	+ /* It looks like a PCI device. Does it exist? */
	168	+ dev = acpi_get_physical_device(handle);
	169	+ } else {
	170	+ /* It doesn't look like a PCI device. Does its parent
	171	+ exist? */
	172	+ acpi_handle phandle;
	173	+ if (acpi_get_parent(handle, &phandle))
	174	+ return NULL;
	175	+ dev = acpi_get_physical_device(phandle);
	176	+ }
	177	+ if (!dev)
	178	+ return NULL;
	179	+ return dev;
	180	+}
	181	+EXPORT_SYMBOL(acpi_get_physical_pci_device);
	182	+
143	183	static int acpi_bind_one(struct device *dev, acpi_handle handle)
144	184	{
145	185	struct acpi_device *acpi_dev;
...	...	@@ -919,36 +919,6 @@
919	919	}
920	920	}
921	921
922		-static int
923		-acpi_video_bus_match(struct acpi_device *device)
924		-{
925		- acpi_handle h_dummy;
926		-
927		- if (!device)
928		- return -EINVAL;
929		-
930		- /* Since there is no HID, CID for ACPI Video drivers, we have
931		- * to check well known required nodes for each feature we support.
932		- */
933		-
934		- /* Does this device able to support video switching ? */
935		- if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) &&
936		- ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy)))
937		- return 0;
938		-
939		- /* Does this device able to retrieve a video ROM ? */
940		- if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy)))
941		- return 0;
942		-
943		- /* Does this device able to configure which video head to be POSTed ? */
944		- if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) &&
945		- ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) &&
946		- ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy)))
947		- return 0;
948		-
949		- return -ENODEV;
950		-}
951		-
952	922	/*
953	923	* acpi_bay_match - see if a device is an ejectable driver bay
954	924	*
...	...	@@ -1031,7 +1001,7 @@
1031	1001	will get autoloaded and the device might still match
1032	1002	against another driver.
1033	1003	*/
1034		- if (ACPI_SUCCESS(acpi_video_bus_match(device)))
	1004	+ if (acpi_is_video_device(device))
1035	1005	cid_add = ACPI_VIDEO_HID;
1036	1006	else if (ACPI_SUCCESS(acpi_bay_match(device)))
1037	1007	cid_add = ACPI_BAY_HID;
...	...	@@ -738,7 +738,8 @@
738	738	device->cap._DSS = 1;
739	739	}
740	740
741		- max_level = acpi_video_init_brightness(device);
	741	+ if (acpi_video_backlight_support())
	742	+ max_level = acpi_video_init_brightness(device);
742	743
743	744	if (device->cap._BCL && device->cap._BCM && max_level > 0) {
744	745	int result;
745	746
...	...	@@ -784,18 +785,21 @@
784	785	printk(KERN_ERR PREFIX "Create sysfs link\n");
785	786
786	787	}
787		- if (device->cap._DCS && device->cap._DSS){
788		- static int count = 0;
789		- char *name;
790		- name = kzalloc(MAX_NAME_LEN, GFP_KERNEL);
791		- if (!name)
792		- return;
793		- sprintf(name, "acpi_video%d", count++);
794		- device->output_dev = video_output_register(name,
795		- NULL, device, &acpi_output_properties);
796		- kfree(name);
	788	+
	789	+ if (acpi_video_display_switch_support()) {
	790	+
	791	+ if (device->cap._DCS && device->cap._DSS) {
	792	+ static int count;
	793	+ char *name;
	794	+ name = kzalloc(MAX_NAME_LEN, GFP_KERNEL);
	795	+ if (!name)
	796	+ return;
	797	+ sprintf(name, "acpi_video%d", count++);
	798	+ device->output_dev = video_output_register(name,
	799	+ NULL, device, &acpi_output_properties);
	800	+ kfree(name);
	801	+ }
797	802	}
798		- return;
799	803	}
800	804
801	805	/*
802	806
803	807
...	...	@@ -841,10 +845,15 @@
841	845	static int acpi_video_bus_check(struct acpi_video_bus *video)
842	846	{
843	847	acpi_status status = -ENOENT;
	848	+ struct device *dev;
844	849
845		-
846	850	if (!video)
847	851	return -EINVAL;
	852	+
	853	+ dev = acpi_get_physical_pci_device(video->device->handle);
	854	+ if (!dev)
	855	+ return -ENODEV;
	856	+ put_device(dev);
848	857
849	858	/* Since there is no HID, CID and so on for VGA driver, we have
850	859	* to check well known required nodes.
	1	+/*
	2	+ * Copyright (C) 2008 SuSE Linux Products GmbH
	3	+ * Thomas Renninger <trenn@suse.de>
	4	+ *
	5	+ * May be copied or modified under the terms of the GNU General Public License
	6	+ *
	7	+ * video_detect.c:
	8	+ * Provides acpi_is_video_device() for early scanning of ACPI devices in scan.c
	9	+ * There a Linux specific (Spec does not provide a HID for video devices) is
	10	+ * assinged
	11	+ *
	12	+ * After PCI devices are glued with ACPI devices
	13	+ * acpi_get_physical_pci_device() can be called to identify ACPI graphics
	14	+ * devices for which a real graphics card is plugged in
	15	+ *
	16	+ * Now acpi_video_get_capabilities() can be called to check which
	17	+ * capabilities the graphics cards plugged in support. The check for general
	18	+ * video capabilities will be triggered by the first caller of
	19	+ * acpi_video_get_capabilities(NULL); which will happen when the first
	20	+ * backlight (or display output) switching supporting driver calls:
	21	+ * acpi_video_backlight_support();
	22	+ *
	23	+ * Depending on whether ACPI graphics extensions (cmp. ACPI spec Appendix B)
	24	+ * are available, video.ko should be used to handle the device.
	25	+ *
	26	+ * Otherwise vendor specific drivers like thinkpad_acpi, asus_acpi,
	27	+ * sony_acpi,... can take care about backlight brightness and display output
	28	+ * switching.
	29	+ *
	30	+ * If CONFIG_ACPI_VIDEO is neither set as "compiled in" (y) nor as a module (m)
	31	+ * this file will not be compiled, acpi_video_get_capabilities() and
	32	+ * acpi_video_backlight_support() will always return 0 and vendor specific
	33	+ * drivers always can handle backlight.
	34	+ *
	35	+ */
	36	+
	37	+#include <linux/acpi.h>
	38	+#include <linux/dmi.h>
	39	+
	40	+ACPI_MODULE_NAME("video");
	41	+#define _COMPONENT ACPI_VIDEO_COMPONENT
	42	+
	43	+static long acpi_video_support;
	44	+static bool acpi_video_caps_checked;
	45	+
	46	+static acpi_status
	47	+acpi_backlight_cap_match(acpi_handle handle, u32 level, void *context,
	48	+ void **retyurn_value)
	49	+{
	50	+ long *cap = context;
	51	+ acpi_handle h_dummy;
	52	+
	53	+ if (ACPI_SUCCESS(acpi_get_handle(handle, "_BCM", &h_dummy)) &&
	54	+ ACPI_SUCCESS(acpi_get_handle(handle, "_BCL", &h_dummy))) {
	55	+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found generic backlight "
	56	+ "support\n"));
	57	+ *cap \|= ACPI_VIDEO_BACKLIGHT;
	58	+ /* We have backlight support, no need to scan further */
	59	+ return AE_CTRL_TERMINATE;
	60	+ }
	61	+ return 0;
	62	+}
	63	+
	64	+/* Returns true if the device is a video device which can be handled by
	65	+ * video.ko.
	66	+ * The device will get a Linux specific CID added in scan.c to
	67	+ * identify the device as an ACPI graphics device
	68	+ * Be aware that the graphics device may not be physically present
	69	+ * Use acpi_video_get_capabilities() to detect general ACPI video
	70	+ * capabilities of present cards
	71	+ */
	72	+long acpi_is_video_device(struct acpi_device *device)
	73	+{
	74	+ acpi_handle h_dummy;
	75	+ long video_caps = 0;
	76	+
	77	+ if (!device)
	78	+ return 0;
	79	+
	80	+ /* Does this device able to support video switching ? */
	81	+ if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOD", &h_dummy)) &&
	82	+ ACPI_SUCCESS(acpi_get_handle(device->handle, "_DOS", &h_dummy)))
	83	+ video_caps \|= ACPI_VIDEO_OUTPUT_SWITCHING;
	84	+
	85	+ /* Does this device able to retrieve a video ROM ? */
	86	+ if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_ROM", &h_dummy)))
	87	+ video_caps \|= ACPI_VIDEO_ROM_AVAILABLE;
	88	+
	89	+ /* Does this device able to configure which video head to be POSTed ? */
	90	+ if (ACPI_SUCCESS(acpi_get_handle(device->handle, "_VPO", &h_dummy)) &&
	91	+ ACPI_SUCCESS(acpi_get_handle(device->handle, "_GPD", &h_dummy)) &&
	92	+ ACPI_SUCCESS(acpi_get_handle(device->handle, "_SPD", &h_dummy)))
	93	+ video_caps \|= ACPI_VIDEO_DEVICE_POSTING;
	94	+
	95	+ /* Only check for backlight functionality if one of the above hit. */
	96	+ if (video_caps)
	97	+ acpi_walk_namespace(ACPI_TYPE_DEVICE, device->handle,
	98	+ ACPI_UINT32_MAX, acpi_backlight_cap_match,
	99	+ &video_caps, NULL);
	100	+
	101	+ return video_caps;
	102	+}
	103	+EXPORT_SYMBOL(acpi_is_video_device);
	104	+
	105	+static acpi_status
	106	+find_video(acpi_handle handle, u32 lvl, void context, void *rv)
	107	+{
	108	+ long *cap = context;
	109	+ struct device *dev;
	110	+ struct acpi_device *acpi_dev;
	111	+
	112	+ const struct acpi_device_id video_ids[] = {
	113	+ {ACPI_VIDEO_HID, 0},
	114	+ {"", 0},
	115	+ };
	116	+ if (acpi_bus_get_device(handle, &acpi_dev))
	117	+ return AE_OK;
	118	+
	119	+ if (!acpi_match_device_ids(acpi_dev, video_ids)) {
	120	+ dev = acpi_get_physical_pci_device(handle);
	121	+ if (!dev)
	122	+ return AE_OK;
	123	+ put_device(dev);
	124	+ *cap \|= acpi_is_video_device(acpi_dev);
	125	+ }
	126	+ return AE_OK;
	127	+}
	128	+
	129	+/*
	130	+ * Returns the video capabilities of a specific ACPI graphics device
	131	+ *
	132	+ * if NULL is passed as argument all ACPI devices are enumerated and
	133	+ * all graphics capabilities of physically present devices are
	134	+ * summerized and returned. This is cached and done only once.
	135	+ */
	136	+long acpi_video_get_capabilities(acpi_handle graphics_handle)
	137	+{
	138	+ long caps = 0;
	139	+ struct acpi_device *tmp_dev;
	140	+ acpi_status status;
	141	+
	142	+ if (acpi_video_caps_checked && graphics_handle == NULL)
	143	+ return acpi_video_support;
	144	+
	145	+ if (!graphics_handle) {
	146	+ /* Only do the global walk through all graphics devices once */
	147	+ acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
	148	+ ACPI_UINT32_MAX, find_video,
	149	+ &caps, NULL);
	150	+ /* There might be boot param flags set already... */
	151	+ acpi_video_support \|= caps;
	152	+ acpi_video_caps_checked = 1;
	153	+ /* Add blacklists here. Be careful to use the right DMI bits
	154	+ * to still be able to override logic via boot params, e.g.:
	155	+ *
	156	+ * if (dmi_name_in_vendors("XY")) {
	157	+ * acpi_video_support \|=
	158	+ * ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VENDOR;
	159	+ * acpi_video_support \|=
	160	+ * ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;
	161	+ *}
	162	+ */
	163	+ } else {
	164	+ status = acpi_bus_get_device(graphics_handle, &tmp_dev);
	165	+ if (ACPI_FAILURE(status)) {
	166	+ ACPI_EXCEPTION((AE_INFO, status, "Invalid device"));
	167	+ return 0;
	168	+ }
	169	+ acpi_walk_namespace(ACPI_TYPE_DEVICE, graphics_handle,
	170	+ ACPI_UINT32_MAX, find_video,
	171	+ &caps, NULL);
	172	+ }
	173	+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "We have 0x%lX video support %s %s\n",
	174	+ graphics_handle ? caps : acpi_video_support,
	175	+ graphics_handle ? "on device " : "in general",
	176	+ graphics_handle ? acpi_device_bid(tmp_dev) : ""));
	177	+ return caps;
	178	+}
	179	+EXPORT_SYMBOL(acpi_video_get_capabilities);
	180	+
	181	+/* Returns true if video.ko can do backlight switching */
	182	+int acpi_video_backlight_support(void)
	183	+{
	184	+ /*
	185	+ * We must check whether the ACPI graphics device is physically plugged
	186	+ * in. Therefore this must be called after binding PCI and ACPI devices
	187	+ */
	188	+ if (!acpi_video_caps_checked)
	189	+ acpi_video_get_capabilities(NULL);
	190	+
	191	+ /* First check for boot param -> highest prio */
	192	+ if (acpi_video_support & ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR)
	193	+ return 0;
	194	+ else if (acpi_video_support & ACPI_VIDEO_BACKLIGHT_FORCE_VIDEO)
	195	+ return 1;
	196	+
	197	+ /* Then check for DMI blacklist -> second highest prio */
	198	+ if (acpi_video_support & ACPI_VIDEO_BACKLIGHT_DMI_VENDOR)
	199	+ return 0;
	200	+ else if (acpi_video_support & ACPI_VIDEO_BACKLIGHT_DMI_VIDEO)
	201	+ return 1;
	202	+
	203	+ /* Then go the default way */
	204	+ return acpi_video_support & ACPI_VIDEO_BACKLIGHT;
	205	+}
	206	+EXPORT_SYMBOL(acpi_video_backlight_support);
	207	+
	208	+/*
	209	+ * Returns true if video.ko can do display output switching.
	210	+ * This does not work well/at all with binary graphics drivers
	211	+ * which disable system io ranges and do it on their own.
	212	+ */
	213	+int acpi_video_display_switch_support(void)
	214	+{
	215	+ if (!acpi_video_caps_checked)
	216	+ acpi_video_get_capabilities(NULL);
	217	+
	218	+ if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR)
	219	+ return 0;
	220	+ else if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO)
	221	+ return 1;
	222	+
	223	+ if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VENDOR)
	224	+ return 0;
	225	+ else if (acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING_DMI_VIDEO)
	226	+ return 1;
	227	+
	228	+ return acpi_video_support & ACPI_VIDEO_OUTPUT_SWITCHING;
	229	+}
	230	+EXPORT_SYMBOL(acpi_video_display_switch_support);
	231	+
	232	+/*
	233	+ * Use acpi_display_output=vendor/video or acpi_backlight=vendor/video
	234	+ * To force that backlight or display output switching is processed by vendor
	235	+ * specific acpi drivers or video.ko driver.
	236	+ */
	237	+int __init acpi_backlight(char *str)
	238	+{
	239	+ if (str == NULL \|\| *str == '\0')
	240	+ return 1;
	241	+ else {
	242	+ if (!strcmp("vendor", str))
	243	+ acpi_video_support \|=
	244	+ ACPI_VIDEO_BACKLIGHT_FORCE_VENDOR;
	245	+ if (!strcmp("video", str))
	246	+ acpi_video_support \|=
	247	+ ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
	248	+ }
	249	+ return 1;
	250	+}
	251	+__setup("acpi_backlight=", acpi_backlight);
	252	+
	253	+int __init acpi_display_output(char *str)
	254	+{
	255	+ if (str == NULL \|\| *str == '\0')
	256	+ return 1;
	257	+ else {
	258	+ if (!strcmp("vendor", str))
	259	+ acpi_video_support \|=
	260	+ ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VENDOR;
	261	+ if (!strcmp("video", str))
	262	+ acpi_video_support \|=
	263	+ ACPI_VIDEO_OUTPUT_SWITCHING_FORCE_VIDEO;
	264	+ }
	265	+ return 1;
	266	+}
	267	+__setup("acpi_display_output=", acpi_display_output);
...	...	@@ -1297,6 +1297,12 @@
1297	1297
1298	1298	set_quirks();
1299	1299
	1300	+ if (!acpi_video_backlight_support() && has_cap(ACER_CAP_BRIGHTNESS)) {
	1301	+ interface->capability &= ~ACER_CAP_BRIGHTNESS;
	1302	+ printk(ACER_INFO "Brightness must be controlled by "
	1303	+ "generic video driver\n");
	1304	+ }
	1305	+
1300	1306	if (platform_driver_register(&acer_platform_driver)) {
1301	1307	printk(ACER_ERR "Unable to register platform driver.\n");
1302	1308	goto error_platform_register;
...	...	@@ -1208,9 +1208,13 @@
1208	1208
1209	1209	dev = acpi_get_physical_device(hotk->device->handle);
1210	1210
1211		- result = asus_backlight_init(dev);
1212		- if (result)
1213		- goto fail_backlight;
	1211	+ if (!acpi_video_backlight_support()) {
	1212	+ result = asus_backlight_init(dev);
	1213	+ if (result)
	1214	+ goto fail_backlight;
	1215	+ } else
	1216	+ printk(ASUS_INFO "Brightness ignored, must be controlled by "
	1217	+ "ACPI video driver\n");
1214	1218
1215	1219	result = asus_led_init(dev);
1216	1220	if (result)
...	...	@@ -326,12 +326,14 @@
326	326
327	327	/* Register backlight stuff */
328	328
329		- compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
330		- &compalbl_ops);
331		- if (IS_ERR(compalbl_device))
332		- return PTR_ERR(compalbl_device);
	329	+ if (!acpi_video_backlight_support()) {
	330	+ compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
	331	+ &compalbl_ops);
	332	+ if (IS_ERR(compalbl_device))
	333	+ return PTR_ERR(compalbl_device);
333	334
334		- compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
	335	+ compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
	336	+ }
335	337
336	338	ret = platform_driver_register(&compal_driver);
337	339	if (ret)
...	...	@@ -825,9 +825,15 @@
825	825	return -ENODEV;
826	826	}
827	827	dev = acpi_get_physical_device(ehotk->device->handle);
828		- result = eeepc_backlight_init(dev);
829		- if (result)
830		- goto fail_backlight;
	828	+
	829	+ if (!acpi_video_backlight_support()) {
	830	+ result = eeepc_backlight_init(dev);
	831	+ if (result)
	832	+ goto fail_backlight;
	833	+ } else
	834	+ printk(EEEPC_INFO "Backlight controlled by ACPI video "
	835	+ "driver\n");
	836	+
831	837	result = eeepc_hwmon_init(dev);
832	838	if (result)
833	839	goto fail_hwmon;