diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-01-23 03:08:06 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-01-23 03:08:06 +0000 |
| commit | 7e81c95dd9b00ab7744282f4b43d9ab1d7f4e37f (patch) | |
| tree | 8daaca154b289f9d0540d1ff86b8c78bbdd4eb1b /sys/dev/pci | |
| parent | ca20b95c91d5ab977adbf9ec5d6856a9ac8659a4 (diff) | |
drm/i915: Revert hdmi HDP pin checks
From Daniel Vetter
7bc9870ca4220c18c854edf8d9ececdd1566efe7 in ubuntu 3.8
202adf4b9f5957b26a1cb97267d78e0edb319c5e in mainline linux
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_hdmi.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/sys/dev/pci/drm/i915/intel_hdmi.c b/sys/dev/pci/drm/i915/intel_hdmi.c index d80586388f1..8c9bb6b6591 100644 --- a/sys/dev/pci/drm/i915/intel_hdmi.c +++ b/sys/dev/pci/drm/i915/intel_hdmi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_hdmi.c,v 1.6 2014/01/22 05:16:55 kettenis Exp $ */ +/* $OpenBSD: intel_hdmi.c,v 1.7 2014/01/23 03:08:05 jsg Exp $ */ /* * Copyright 2006 Dave Airlie <airlied@linux.ie> * Copyright © 2006-2009 Intel Corporation @@ -767,27 +767,6 @@ bool intel_hdmi_mode_fixup(struct drm_encoder *encoder, return true; } -static bool g4x_hdmi_connected(struct intel_hdmi *intel_hdmi) -{ - struct drm_device *dev = intel_hdmi_to_dev(intel_hdmi); - struct drm_i915_private *dev_priv = dev->dev_private; - uint32_t bit; - - switch (intel_hdmi->sdvox_reg) { - case SDVOB: - bit = HDMIB_HOTPLUG_LIVE_STATUS; - break; - case SDVOC: - bit = HDMIC_HOTPLUG_LIVE_STATUS; - break; - default: - bit = 0; - break; - } - - return I915_READ(PORT_HOTPLUG_STAT) & bit; -} - static enum drm_connector_status intel_hdmi_detect(struct drm_connector *connector, bool force) { @@ -799,9 +778,6 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) struct edid *edid; enum drm_connector_status status = connector_status_disconnected; - if (IS_G4X(connector->dev) && !g4x_hdmi_connected(intel_hdmi)) - return status; - intel_hdmi->has_hdmi_sink = false; intel_hdmi->has_audio = false; edid = drm_get_edid(connector, |