Attachment 124211 Details for Bug 96288 – Only ignore active eDP ports

[patch] Only ignore active eDP ports

0001-drm-i915-Only-ignore-eDP-ports-that-are-connected.patch (text/plain), 4.71 KB, created by Chris Wilson on 2016-05-31 11:38:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2016-05-31 11:38:06 UTC

Size: 4.71 KB

patch

obsolete

>From dafce1caad419517ddf0032872c7d2fb388e8563 Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Tue, 31 May 2016 12:33:00 +0100
>Subject: [PATCH] drm/i915: Only ignore eDP ports that are connected
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>If the VBT says that a certain port should be eDP (and hence fused off
>from HDMI), but in reality it isn't, we need to try and acquire the HDMI
>connection instead. So only trust the VBT edp setting if we can connect
>to an eDP device on that port.
>
>Fixes: d2182a6608 (drm/i915: Don't register HDMI connectors for eDP ports on VLV/CHV)
>References: https://bugs.freedesktop.org/show_bug.cgi?id=96288
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>Cc: Ville SyrjÃ¤lÃ¤ <ville.syrjala@linux.intel.com>
>Cc: Jani Nikula <jani.nikula@intel.com>
>Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
>---
> drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++----------
> drivers/gpu/drm/i915/intel_dp.c      | 13 ++++++-------
> drivers/gpu/drm/i915/intel_drv.h     |  2 +-
> 3 files changed, 17 insertions(+), 18 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index 82796d1a87d7..0be8cede60e3 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -14642,6 +14642,8 @@ 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;
>+
> 		/*
> 		 * The DP_DETECTED bit is the latched state of the DDC
> 		 * SDA pin at boot. However since eDP doesn't require DDC
>@@ -14651,19 +14653,17 @@ static void intel_setup_outputs(struct drm_device *dev)
> 		 * eDP ports. Consult the VBT as well as DP_DETECTED to
> 		 * detect eDP ports.
> 		 */
>-		if (I915_READ(VLV_HDMIB) & SDVO_DETECTED &&
>-		    !intel_dp_is_edp(dev, PORT_B))
>+		has_edp = intel_dp_is_edp(dev, PORT_B);
>+		if (I915_READ(VLV_DP_B) & DP_DETECTED || has_edp)
>+			has_edp &= intel_dp_init(dev, VLV_DP_B, PORT_B);
>+		if (I915_READ(VLV_HDMIB) & SDVO_DETECTED && !has_edp)
> 			intel_hdmi_init(dev, VLV_HDMIB, PORT_B);
>-		if (I915_READ(VLV_DP_B) & DP_DETECTED ||
>-		    intel_dp_is_edp(dev, PORT_B))
>-			intel_dp_init(dev, VLV_DP_B, PORT_B);
> 
>-		if (I915_READ(VLV_HDMIC) & SDVO_DETECTED &&
>-		    !intel_dp_is_edp(dev, PORT_C))
>+		has_edp = intel_dp_is_edp(dev, PORT_C);
>+		if (I915_READ(VLV_DP_C) & DP_DETECTED || has_edp)
>+			has_edp &= intel_dp_init(dev, VLV_DP_C, PORT_C);
>+		if (I915_READ(VLV_HDMIC) & SDVO_DETECTED && !has_edp)
> 			intel_hdmi_init(dev, VLV_HDMIC, PORT_C);
>-		if (I915_READ(VLV_DP_C) & DP_DETECTED ||
>-		    intel_dp_is_edp(dev, PORT_C))
>-			intel_dp_init(dev, VLV_DP_C, PORT_C);
> 
> 		if (IS_CHERRYVIEW(dev)) {
> 			/* eDP not supported on port D, so don't check VBT */
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index 1d3824721c0a..d043b1384345 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -5565,9 +5565,9 @@ fail:
> 	return false;
> }
> 
>-void
>-intel_dp_init(struct drm_device *dev,
>-	      i915_reg_t output_reg, enum port port)
>+bool intel_dp_init(struct drm_device *dev,
>+		   i915_reg_t output_reg,
>+		   enum port port)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
> 	struct intel_digital_port *intel_dig_port;
>@@ -5577,7 +5577,7 @@ intel_dp_init(struct drm_device *dev,
> 
> 	intel_dig_port = kzalloc(sizeof(*intel_dig_port), GFP_KERNEL);
> 	if (!intel_dig_port)
>-		return;
>+		return false;
> 
> 	intel_connector = intel_connector_alloc();
> 	if (!intel_connector)
>@@ -5634,7 +5634,7 @@ intel_dp_init(struct drm_device *dev,
> 	if (!intel_dp_init_connector(intel_dig_port, intel_connector))
> 		goto err_init_connector;
> 
>-	return;
>+	return true;
> 
> err_init_connector:
> 	drm_encoder_cleanup(encoder);
>@@ -5642,8 +5642,7 @@ err_encoder_init:
> 	kfree(intel_connector);
> err_connector_alloc:
> 	kfree(intel_dig_port);
>-
>-	return;
>+	return false;
> }
> 
> void intel_dp_mst_suspend(struct drm_device *dev)
>diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
>index bef4ee90ca67..cb9dc596fb7e 100644
>--- a/drivers/gpu/drm/i915/intel_drv.h
>+++ b/drivers/gpu/drm/i915/intel_drv.h
>@@ -1328,7 +1328,7 @@ void intel_csr_ucode_suspend(struct drm_i915_private *);
> void intel_csr_ucode_resume(struct drm_i915_private *);
> 
> /* intel_dp.c */
>-void intel_dp_init(struct drm_device *dev, i915_reg_t output_reg, enum port port);
>+bool intel_dp_init(struct drm_device *dev, i915_reg_t output_reg, enum port port);
> bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
> 			     struct intel_connector *intel_connector);
> void intel_dp_set_link_params(struct intel_dp *intel_dp,
>-- 
>2.8.1
>

Actions: View | Splinter Review

Attachments on bug 96288: 124208 | 124211 | 124224

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.