Attachment 124269 Details for Bug 96321 – [PATCH] drm/i915: Check VBT for port presence in addition to the strap on VLV/CHV

[patch] [PATCH] drm/i915: Check VBT for port presence in addition to the strap on VLV/CHV

0001-drm-i915-Check-VBT-for-port-presence-in-addition-to-.patch (text/plain), 6.59 KB, created by Ville Syrjala on 2016-06-02 14:31:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Syrjala

Created: 2016-06-02 14:31:33 UTC

Size: 6.59 KB

patch

obsolete

>From cf2a3bc80adee58bf70712641a641f9f0daa2446 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
>Date: Thu, 2 Jun 2016 16:50:49 +0300
>Subject: [PATCH] drm/i915: Check VBT for port presence in addition to the
> strap on VLV/CHV
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Apparently some CHV boards failed to hook up the port presence straps
>for HDMI ports as well (earlier we assumed this problem only affected
>eDP ports). So let's check the VBT in addition to the strap, and if
>either one claims that the port is present go ahead and register the
>relevant connector.
>
>Also print a debug message when we register a HDMI connector to aid
>in diagnosing missing/incorrect ports. We already had such a print for
>DP/eDP.
>
>Cc: Radoslav Duda <radosd@radosd.com>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96321
>Signed-off-by: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>---
> drivers/gpu/drm/i915/i915_drv.h      |  1 +
> drivers/gpu/drm/i915/intel_bios.c    | 39 ++++++++++++++++++++++++++++++++++++
> drivers/gpu/drm/i915/intel_display.c | 28 +++++++++++++++++---------
> drivers/gpu/drm/i915/intel_hdmi.c    |  3 +++
> 4 files changed, 62 insertions(+), 9 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>index 96d5034830f0..be9a6390b435 100644
>--- a/drivers/gpu/drm/i915/i915_drv.h
>+++ b/drivers/gpu/drm/i915/i915_drv.h
>@@ -3619,6 +3619,7 @@ int intel_bios_init(struct drm_i915_private *dev_priv);
> bool intel_bios_is_valid_vbt(const void *buf, size_t size);
> bool intel_bios_is_tv_present(struct drm_i915_private *dev_priv);
> bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin);
>+bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port port);
> bool intel_bios_is_port_edp(struct drm_i915_private *dev_priv, enum port port);
> bool intel_bios_is_port_dp_dual_mode(struct drm_i915_private *dev_priv, enum port port);
> bool intel_bios_is_dsi_present(struct drm_i915_private *dev_priv, enum port *port);
>diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
>index 713a02db378a..da5ed4a850b9 100644
>--- a/drivers/gpu/drm/i915/intel_bios.c
>+++ b/drivers/gpu/drm/i915/intel_bios.c
>@@ -1570,6 +1570,45 @@ bool intel_bios_is_lvds_present(struct drm_i915_private *dev_priv, u8 *i2c_pin)
> }
> 
> /**
>+ * intel_bios_is_port_present - is the specified digital port present
>+ * @dev_priv:	i915 device instance
>+ * @port:	port to check
>+ *
>+ * Return true if the device in %port is present.
>+ */
>+bool intel_bios_is_port_present(struct drm_i915_private *dev_priv, enum port port)
>+{
>+	static const struct {
>+		u16 dp, hdmi;
>+	} port_mapping[] = {
>+		[PORT_B] = { DVO_PORT_DPB, DVO_PORT_HDMIB, },
>+		[PORT_C] = { DVO_PORT_DPC, DVO_PORT_HDMIC, },
>+		[PORT_D] = { DVO_PORT_DPD, DVO_PORT_HDMID, },
>+		[PORT_E] = { DVO_PORT_DPE, DVO_PORT_HDMIE, },
>+	};
>+	int i;
>+
>+	/* FIXME maybe deal with port A as well? */
>+	if (WARN_ON(port == PORT_A) || port >= ARRAY_SIZE(port_mapping))
>+		return false;
>+
>+	if (!dev_priv->vbt.child_dev_num)
>+		return false;
>+
>+	for (i = 0; i < dev_priv->vbt.child_dev_num; i++) {
>+		const union child_device_config *p_child =
>+			&dev_priv->vbt.child_dev[i];
>+		if ((p_child->common.dvo_port == port_mapping[port].dp ||
>+		     p_child->common.dvo_port == port_mapping[port].hdmi) &&
>+		    (p_child->common.device_type & (DEVICE_TYPE_TMDS_DVI_SIGNALING |
>+						    DEVICE_TYPE_DISPLAYPORT_OUTPUT)))
>+			return true;
>+	}
>+
>+	return false;
>+}
>+
>+/**
>  * intel_bios_is_port_edp - is the device in given port eDP
>  * @dev_priv:	i915 device instance
>  * @port:	port to check
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 60cba1956c0d..a22512a18ac8 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -14702,7 +14702,7 @@ static void intel_setup_outputs(struct drm_device *dev)
> 		if (I915_READ(PCH_DP_D) & DP_DETECTED)
> 			intel_dp_init(dev, PCH_DP_D, PORT_D);
> 	} else if (IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) {
>-		bool has_edp;
>+		bool has_edp, has_port;
> 
> 		/*
> 		 * The DP_DETECTED bit is the latched state of the DDC
>@@ -14712,25 +14712,35 @@ static void intel_setup_outputs(struct drm_device *dev)
> 		 * Thus we can't rely on the DP_DETECTED bit alone to detect
> 		 * eDP ports. Consult the VBT as well as DP_DETECTED to
> 		 * detect eDP ports.
>+		 *
>+		 * Sadly the straps seem to be missing sometimes even for HDMI
>+		 * ports (eg. on Voyo V3 - CHT x7-Z8700), so check both strap
>+		 * and VBT for the presence of the port.
> 		 */
> 		has_edp = intel_dp_is_edp(dev, PORT_B);
>-		if (I915_READ(VLV_DP_B) & DP_DETECTED || has_edp)
>+		has_port = intel_bios_is_port_present(dev_priv, PORT_B);
>+		if (I915_READ(VLV_DP_B) & DP_DETECTED || has_port)
> 			has_edp &= intel_dp_init(dev, VLV_DP_B, PORT_B);
>-		if (I915_READ(VLV_HDMIB) & SDVO_DETECTED && !has_edp)
>+		if ((I915_READ(VLV_HDMIB) & SDVO_DETECTED || has_port) && !has_edp)
> 			intel_hdmi_init(dev, VLV_HDMIB, PORT_B);
> 
> 		has_edp = intel_dp_is_edp(dev, PORT_C);
>-		if (I915_READ(VLV_DP_C) & DP_DETECTED || has_edp)
>+		has_port = intel_bios_is_port_present(dev_priv, PORT_C);
>+		if (I915_READ(VLV_DP_C) & DP_DETECTED || has_port)
> 			has_edp &= intel_dp_init(dev, VLV_DP_C, PORT_C);
>-		if (I915_READ(VLV_HDMIC) & SDVO_DETECTED && !has_edp)
>+		if ((I915_READ(VLV_HDMIC) & SDVO_DETECTED || has_port) && !has_edp)
> 			intel_hdmi_init(dev, VLV_HDMIC, PORT_C);
> 
> 		if (IS_CHERRYVIEW(dev)) {
>-			/* eDP not supported on port D, so don't check VBT */
>-			if (I915_READ(CHV_HDMID) & SDVO_DETECTED)
>-				intel_hdmi_init(dev, CHV_HDMID, PORT_D);
>-			if (I915_READ(CHV_DP_D) & DP_DETECTED)
>+			/*
>+			 * eDP not supported on port D,
>+			 * so no need to worry about it
>+			 */
>+			has_port = intel_bios_is_port_present(dev_priv, PORT_D);
>+			if (I915_READ(CHV_DP_D) & DP_DETECTED || has_port)
> 				intel_dp_init(dev, CHV_DP_D, PORT_D);
>+			if (I915_READ(CHV_HDMID) & SDVO_DETECTED || has_port)
>+				intel_hdmi_init(dev, CHV_HDMID, PORT_D);
> 		}
> 
> 		intel_dsi_init(dev);
>diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>index eb455ea6ea92..ae153b6f093e 100644
>--- a/drivers/gpu/drm/i915/intel_hdmi.c
>+++ b/drivers/gpu/drm/i915/intel_hdmi.c
>@@ -1810,6 +1810,9 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
> 	enum port port = intel_dig_port->port;
> 	uint8_t alternate_ddc_pin;
> 
>+	DRM_DEBUG_KMS("Adding HDMI connector on port %c\n",
>+		      port_name(port));
>+
> 	if (WARN(intel_dig_port->max_lanes < 4,
> 		 "Not enough lanes (%d) for HDMI on port %c\n",
> 		 intel_dig_port->max_lanes, port_name(port)))
>-- 
>2.7.4
>

Actions: View | Splinter Review

Attachments on bug 96321: 124255 | 124256 | 124257 | 124258 | 124264 | 124269 | 124301

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.