Attachment 138930 Details for Bug 105949 – Attempt to fix CDCLK PLL lock failure

[patch] Attempt to fix CDCLK PLL lock failure

0001-drm-i915-Apply-display-WA-1183-before-disabling-CDCL.patch (text/plain), 2.48 KB, created by Imre Deak on 2018-04-19 16:32:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Imre Deak

Created: 2018-04-19 16:32:09 UTC

Size: 2.48 KB

patch

obsolete

>From 8ae1aa769a16c9d4ba738b697ec28e2195af22fc Mon Sep 17 00:00:00 2001
>From: Imre Deak <imre.deak@intel.com>
>Date: Thu, 19 Apr 2018 18:35:19 +0300
>Subject: [PATCH] drm/i915: Apply display WA #1183 before disabling CDCLK PLL
>
>Signed-off-by: Imre Deak <imre.deak@intel.com>
>---
> drivers/gpu/drm/i915/intel_cdclk.c      | 14 +++++++-------
> drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++------
> 2 files changed, 12 insertions(+), 13 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_cdclk.c b/drivers/gpu/drm/i915/intel_cdclk.c
>index 32d24c69da3c..b691e8da5321 100644
>--- a/drivers/gpu/drm/i915/intel_cdclk.c
>+++ b/drivers/gpu/drm/i915/intel_cdclk.c
>@@ -1026,12 +1026,17 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv,
> 		break;
> 	}
> 
>+	cdclk_ctl = I915_READ(CDCLK_CTL);
>+
>+	/* Wa Display #1183: skl,kbl,cfl */
>+	cdclk_ctl |= CDCLK_DIVMUX_CD_OVERRIDE;
>+	I915_WRITE(CDCLK_CTL, cdclk_ctl);
>+	POSTING_READ(CDCLK_CTL);
>+
> 	if (dev_priv->cdclk.hw.vco != 0 &&
> 	    dev_priv->cdclk.hw.vco != vco)
> 		skl_dpll0_disable(dev_priv);
> 
>-	cdclk_ctl = I915_READ(CDCLK_CTL);
>-
> 	if (dev_priv->cdclk.hw.vco != vco) {
> 		/* Wa Display #1183: skl,kbl,cfl */
> 		cdclk_ctl &= ~(CDCLK_FREQ_SEL_MASK | CDCLK_FREQ_DECIMAL_MASK);
>@@ -1039,11 +1044,6 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv,
> 		I915_WRITE(CDCLK_CTL, cdclk_ctl);
> 	}
> 
>-	/* Wa Display #1183: skl,kbl,cfl */
>-	cdclk_ctl |= CDCLK_DIVMUX_CD_OVERRIDE;
>-	I915_WRITE(CDCLK_CTL, cdclk_ctl);
>-	POSTING_READ(CDCLK_CTL);
>-
> 	if (dev_priv->cdclk.hw.vco != vco)
> 		skl_dpll0_enable(dev_priv, vco);
> 
>diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
>index 53ea564f971e..66de4b2dc8b7 100644
>--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
>+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
>@@ -641,19 +641,18 @@ void skl_enable_dc6(struct drm_i915_private *dev_priv)
> 
> 	DRM_DEBUG_KMS("Enabling DC6\n");
> 
>-	gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6);
>+	/* Wa Display #1183: skl,kbl,cfl */
>+	if (IS_GEN9_BC(dev_priv))
>+		I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) |
>+			   SKL_SELECT_ALTERNATE_DC_EXIT);
> 
>+	gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6);
> }
> 
> void skl_disable_dc6(struct drm_i915_private *dev_priv)
> {
> 	DRM_DEBUG_KMS("Disabling DC6\n");
> 
>-	/* Wa Display #1183: skl,kbl,cfl */
>-	if (IS_GEN9_BC(dev_priv))
>-		I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) |
>-			   SKL_SELECT_ALTERNATE_DC_EXIT);
>-
> 	gen9_set_dc_state(dev_priv, DC_STATE_DISABLE);
> }
> 
>-- 
>2.13.2
>

Actions: View | Splinter Review

Attachments on bug 105949: 138696 | 138707 | 138726 | 138761 | 138906 | 138930 | 139406

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.