From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri, 1 Mar 2013 21:14:31 +0000 (-0800)
Subject: drm/i915/dp: add pre-PCH eDP checking to DP detect for VLV
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=35aad75fd3afed550c42f5f5148d11c8c345f57d;p=linux-beck.git

drm/i915/dp: add pre-PCH eDP checking to DP detect for VLV

Allows us to detect eDP panels that may not have the hotplug pin wired up.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 843f7a502cf0..3921d879a916 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2258,6 +2258,16 @@ g4x_dp_detect(struct intel_dp *intel_dp)
 	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
 	uint32_t bit;
 
+	/* Can't disconnect eDP, but you can close the lid... */
+	if (is_edp(intel_dp)) {
+		enum drm_connector_status status;
+
+		status = intel_panel_detect(dev);
+		if (status == connector_status_unknown)
+			status = connector_status_connected;
+		return status;
+	}
+
 	switch (intel_dig_port->port) {
 	case PORT_B:
 		bit = PORTB_HOTPLUG_LIVE_STATUS;