Commit bcd5023c authored by Dave Airlie's avatar Dave Airlie

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: default avatarDave Airlie <airlied@redhat.com>
parent 34db18ab
...@@ -248,18 +248,24 @@ void intel_panel_setup_backlight(struct drm_device *dev) ...@@ -248,18 +248,24 @@ void intel_panel_setup_backlight(struct drm_device *dev)
enum drm_connector_status enum drm_connector_status
intel_panel_detect(struct drm_device *dev) intel_panel_detect(struct drm_device *dev)
{ {
#if 0
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
#endif
if (i915_panel_ignore_lid) if (i915_panel_ignore_lid)
return i915_panel_ignore_lid > 0 ? return i915_panel_ignore_lid > 0 ?
connector_status_connected : connector_status_connected :
connector_status_disconnected; 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... */ /* Assume that the BIOS does not lie through the OpRegion... */
if (dev_priv->opregion.lid_state) if (dev_priv->opregion.lid_state)
return ioread32(dev_priv->opregion.lid_state) & 0x1 ? return ioread32(dev_priv->opregion.lid_state) & 0x1 ?
connector_status_connected : connector_status_connected :
connector_status_disconnected; connector_status_disconnected;
#endif
return connector_status_unknown; return connector_status_unknown;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment