Attachment 37324 Details for Bug 28739 – patch 2/2 of upstream submission

[patch] patch 2/2 of upstream submission

0002-drm-i915-make-sure-eDP-panel-is-turned-on.patch (text/plain), 3.25 KB, created by Jesse Barnes on 2010-07-22 13:21:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Barnes

Created: 2010-07-22 13:21:49 UTC

Size: 3.25 KB

patch

obsolete

>From 04a02021f1906912c9dcc42eee5cc3de6b9ff933 Mon Sep 17 00:00:00 2001
>From: Jesse Barnes <jbarnes@virtuousgeek.org>
>Date: Thu, 22 Jul 2010 13:14:11 -0700
>Subject: [PATCH 2/2] drm/i915: make sure eDP panel is turned on
>
>When enabling the eDP port, we need to make sure the panel is turned on
>after training the link.  If we don't, it likely won't come back after
>suspend or may not come up at all.
>
>For unknown reasons, unlocking the panel regs before initiating a power
>on sequence is necessary.  There are known bugs in the PCH panel
>sequencing logic, apparently this is one possible workaround.
>
>Fixes https://bugs.freedesktop.org/show_bug.cgi?id=28739.
>
>Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>---
> drivers/gpu/drm/i915/intel_dp.c |   53 +++++++++++++++++++++++++++++++++++++-
> 1 files changed, 51 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
>index 06a400d..5a11a2b 100644
>--- a/drivers/gpu/drm/i915/intel_dp.c
>+++ b/drivers/gpu/drm/i915/intel_dp.c
>@@ -744,6 +744,51 @@ intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
> 	}
> }
> 
>+static void ironlake_edp_panel_on (struct drm_device *dev)
>+{
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+	unsigned long timeout = jiffies + msecs_to_jiffies(5000);
>+	u32 pp, pp_status;
>+
>+	pp_status = I915_READ(PCH_PP_STATUS);
>+	if (pp_status & PP_ON)
>+		return;
>+
>+	pp = I915_READ(PCH_PP_CONTROL);
>+	pp |= PANEL_UNLOCK_REGS | POWER_TARGET_ON;
>+	I915_WRITE(PCH_PP_CONTROL, pp);
>+	do {
>+		pp_status = I915_READ(PCH_PP_STATUS);
>+	} while (((pp_status & PP_ON) == 0) && !time_after(jiffies, timeout));
>+
>+	if (time_after(jiffies, timeout))
>+		DRM_DEBUG_KMS("panel on wait timed out: 0x%08x\n", pp_status);
>+
>+	pp &= ~(PANEL_UNLOCK_REGS | EDP_FORCE_VDD);
>+	I915_WRITE(PCH_PP_CONTROL, pp);
>+}
>+
>+static void ironlake_edp_panel_off (struct drm_device *dev)
>+{
>+	struct drm_i915_private *dev_priv = dev->dev_private;
>+	unsigned long timeout = jiffies + msecs_to_jiffies(5000);
>+	u32 pp, pp_status;
>+
>+	pp = I915_READ(PCH_PP_CONTROL);
>+	pp &= ~POWER_TARGET_ON;
>+	I915_WRITE(PCH_PP_CONTROL, pp);
>+	do {
>+		pp_status = I915_READ(PCH_PP_STATUS);
>+	} while ((pp_status & PP_ON) && !time_after(jiffies, timeout));
>+
>+	if (time_after(jiffies, timeout))
>+		DRM_DEBUG_KMS("panel off wait timed out\n");
>+
>+	/* Make sure VDD is enabled so DP AUX will work */
>+	pp |= EDP_FORCE_VDD;
>+	I915_WRITE(PCH_PP_CONTROL, pp);
>+}
>+
> static void ironlake_edp_backlight_on (struct drm_device *dev)
> {
> 	struct drm_i915_private *dev_priv = dev->dev_private;
>@@ -778,14 +823,18 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode)
> 	if (mode != DRM_MODE_DPMS_ON) {
> 		if (dp_reg & DP_PORT_EN) {
> 			intel_dp_link_down(intel_encoder, dp_priv->DP);
>-			if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv))
>+			if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) {
> 				ironlake_edp_backlight_off(dev);
>+				ironlake_edp_panel_off(dev);
>+			}
> 		}
> 	} else {
> 		if (!(dp_reg & DP_PORT_EN)) {
> 			intel_dp_link_train(intel_encoder, dp_priv->DP, dp_priv->link_configuration);
>-			if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv))
>+			if (IS_eDP(intel_encoder) || IS_PCH_eDP(dp_priv)) {
>+				ironlake_edp_panel_on(dev);
> 				ironlake_edp_backlight_on(dev);
>+			}
> 		}
> 	}
> 	dp_priv->dpms_mode = mode;
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 28739: 36456 | 36457 | 36458 | 36459 | 36677 | 36678 | 36785 | 36786 | 37049 | 37323 | 37324

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.