From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 9 Mar 2010 00:08:16 +0000 (-0800)
Subject: forgot to add the .33 patch...
X-Git-Tag: v2.6.32.10~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b70303edd71ebba24204030d015ceb8673cf4b0d;p=thirdparty%2Fkernel%2Fstable-queue.git

forgot to add the .33 patch...
---

diff --git a/queue-2.6.33/drm-i915-give-up-on-8xx-lid-status.patch b/queue-2.6.33/drm-i915-give-up-on-8xx-lid-status.patch
new file mode 100644
index 00000000000..8f5e35b690f
--- /dev/null
+++ b/queue-2.6.33/drm-i915-give-up-on-8xx-lid-status.patch
@@ -0,0 +1,41 @@
+From 7b9c5abee98c54f85bcc04bd4d7ec8d5094c73f4 Mon Sep 17 00:00:00 2001
+From: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Fri, 12 Feb 2010 09:30:00 -0800
+Subject: drm/i915: give up on 8xx lid status
+
+From: Jesse Barnes <jbarnes@virtuousgeek.org>
+
+commit 7b9c5abee98c54f85bcc04bd4d7ec8d5094c73f4 upstream.
+
+These old machines more often than not lie about their lid state.  So
+don't use it to detect LVDS presence, but leave the event handler to
+deal with lid open/close, when we might need to reset the mode.
+
+Fixes kernel bug #15248
+
+Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+Signed-off-by: Eric Anholt <eric@anholt.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/gpu/drm/i915/intel_lvds.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/gpu/drm/i915/intel_lvds.c
++++ b/drivers/gpu/drm/i915/intel_lvds.c
+@@ -655,8 +655,15 @@ static const struct dmi_system_id bad_li
+  */
+ static enum drm_connector_status intel_lvds_detect(struct drm_connector *connector)
+ {
++	struct drm_device *dev = connector->dev;
+ 	enum drm_connector_status status = connector_status_connected;
+ 
++	/* ACPI lid methods were generally unreliable in this generation, so
++	 * don't even bother.
++	 */
++	if (IS_I8XX(dev))
++		return connector_status_connected;
++
+ 	if (!dmi_check_system(bad_lid_status) && !acpi_lid_open())
+ 		status = connector_status_disconnected;
+