summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-03-14 05:17:55 +0100
committerDave Airlie <airlied@redhat.com>2011-03-14 05:37:41 +0100
commitbcd5023c961a44c7149936553b6929b2b233dd27 (patch)
tree98a2e35423aac2b963909b38a1263c2b812c8697 /drivers/gpu
parentMerge remote branch 'intel/drm-intel-next' of ../drm-next into drm-core-next (diff)
downloadlinux-bcd5023c961a44c7149936553b6929b2b233dd27.tar.xz
linux-bcd5023c961a44c7149936553b6929b2b233dd27.zip
drm/i915: disable opregion lid detection for now.
At least on my HP 2540p this is wrong at bootup, fine at any other time once a lid event has occured. This is due to _REG vs _INI ordering in the ACPI tables. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_panel.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 18391b3ec2c1..4e5ff593413d 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -248,18 +248,24 @@ void intel_panel_setup_backlight(struct drm_device *dev)
enum drm_connector_status
intel_panel_detect(struct drm_device *dev)
{
+#if 0
struct drm_i915_private *dev_priv = dev->dev_private;
+#endif
if (i915_panel_ignore_lid)
return i915_panel_ignore_lid > 0 ?
connector_status_connected :
connector_status_disconnected;
+ /* opregion lid state on HP 2540p is wrong at boot up,
+ * appears to be either the BIOS or Linux ACPI fault */
+#if 0
/* Assume that the BIOS does not lie through the OpRegion... */
if (dev_priv->opregion.lid_state)
return ioread32(dev_priv->opregion.lid_state) & 0x1 ?
connector_status_connected :
connector_status_disconnected;
+#endif
return connector_status_unknown;
}