Skip to contentSkip to conversation

drm/i915/bxt: PORT_PLL_REF_SEL bit should be set for all BXT variations.

PATCH In review Dongwon Kim 3 participants 3 messages Apr 14, 2016 – Apr 15, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/bxt: PORT_PLL_REF_SEL bit should be set for all BXT variations.

This patch is to correct one thing in this commit:

commit 25a56705332add0363e47b3a0eca001d6fbd5bec

Author: Dongwon Kim <[email protected]>
Date:   Wed Mar 16 18:06:13 2016 -0700

drm/i915/bxt: Reversed polarity of PORT_PLL_REF_SEL bit

For BXT, description of polarities of PORT_PLL_REF_SEL has been reversed for newer Gen9LP steppings according to the recent update in Bspec. This bit now should be set for "Non-SSC" mode for all Gen9LP starting from B0 stepping.

v2: Only B0 and newer stepping should be affected by this change.

This reversed bit polarity is actually common for all BXT and APL SoCs. Therefore, revision checking in the original commit should be removed to make the bit set regardless of revision ID of GFX block.

---
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_dpll_mgr.c +2 -10
index 0bde6a4..7fc39ab 100644
@@ -1295,17 +1295,9 @@ static void bxt_ddi_pll_enable(struct drm_i915_private *dev_priv,
 	uint32_t temp;
 	enum port port = (enum port)pll->id;	/* 1:1 port->PLL mapping */
 
-	temp = I915_READ(BXT_PORT_PLL_ENABLE(port));
-	/*
-	 * Definition of each bit polarity has been changed
-	 * after A1 stepping
-	 */
-	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
-		temp &= ~PORT_PLL_REF_SEL;
-	else
-		temp |= PORT_PLL_REF_SEL;
-
 	/* Non-SSC reference */
+	temp = I915_READ(BXT_PORT_PLL_ENABLE(port));
+	temp |= PORT_PLL_REF_SEL;
 	I915_WRITE(BXT_PORT_PLL_ENABLE(port), temp);
 
 	/* Disable 10 bit clock */
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for drm/i915/bxt: PORT_PLL_REF_SEL bit should be set for all BXT variations.

== Series Details ==

== Series Details ==

Series: drm/i915/bxt: PORT_PLL_REF_SEL bit should be set for all BXT variations.
URL : https://patchwork.freedesktop.org/series/5751/
State : success

== Summary ==

Series 5751v1 drm/i915/bxt: PORT_PLL_REF_SEL bit should be set for all BXT variations.
http://patchwork.freedesktop.org/api/1.0/series/5751/revisions/1/mbox/

bdw-ultra        total:203  pass:179  dwarn:0   dfail:0   fail:1   skip:23 
bsw-nuc-2        total:202  pass:162  dwarn:0   dfail:0   fail:1   skip:39 
byt-nuc          total:202  pass:163  dwarn:0   dfail:0   fail:1   skip:38 
hsw-brixbox      total:203  pass:178  dwarn:0   dfail:0   fail:1   skip:24 
hsw-gt2          total:203  pass:183  dwarn:0   dfail:0   fail:1   skip:19 
ilk-hp8440p      total:203  pass:134  dwarn:0   dfail:0   fail:1   skip:68 
ivb-t430s        total:203  pass:174  dwarn:0   dfail:0   fail:1   skip:28 
skl-i7k-2        total:203  pass:177  dwarn:0   dfail:0   fail:1   skip:25 
skl-nuci5        total:203  pass:191  dwarn:0   dfail:0   fail:1   skip:11 
snb-dellxps      total:203  pass:164  dwarn:0   dfail:0   fail:1   skip:38 
snb-x220t        total:203  pass:164  dwarn:0   dfail:0   fail:2   skip:37 

Results at /archive/results/CI_IGT_test/Patchwork_1909/

93007879016173240c35d81572d1fec8c8376f07 drm-intel-nightly: 2016y-04m-15d-07h-43m-11s UTC integration manifest 75a98f0 drm/i915/bxt: PORT_PLL_REF_SEL bit should be set for all BXT variations.

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/1
#2 lore raw
In reply to Dongwon Kim
Quoted 16 lines · Dongwon Kim

This patch is to correct one thing in this commit:

commit 25a56705332add0363e47b3a0eca001d6fbd5bec
Author: Dongwon Kim <[email protected]> Date:   Wed Mar 16 18:06:13 2016 -0700

    drm/i915/bxt: Reversed polarity of PORT_PLL_REF_SEL bit

    For BXT, description of polarities of PORT_PLL_REF_SEL has been reversed for newer Gen9LP steppings according to the recent update in Bspec. This bit now should be set for "Non-SSC" mode for all Gen9LP starting from B0 stepping.

    v2: Only B0 and newer stepping should be affected by this change.

Quoted 6 lines

This reversed bit polarity is actually common for all BXT and APL SoCs. Therefore, revision checking in the original commit should be removed to make the bit set regardless of revision ID of GFX block.

Thanks for the patch I pushed it to -dinq.

Nitpick: no need to quote whole commit messages, it's enough to include the part up to the subject line. I fixed this up now while merging.

Also would've been nice to get this right in the first version by waiting for the clarification about the stepping detail. I applied that early since it fixed problems for people with B stepping. I tried the patch now on A stepping too and it seems to be the right thing to do there too: the HDMI output blanks out if we clear the select bit and recovers by setting it again. I should've done this earlier.

--Imre

Quoted 28 lines

---
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 12 ++----------

 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/intel_dpll_mgr.c +0 -0
index 0bde6a4..7fc39ab 100644
@@ -1295,17 +1295,9 @@ static void bxt_ddi_pll_enable(struct
 drm_i915_private *dev_priv,
  	uint32_t temp;

  enum port port = (enum port)pll->id; /* 1:1 port->PLL
mapping */

drivers/gpu/drm/i915/intel_dpll_mgr.c +0 -10
-	temp = I915_READ(BXT_PORT_PLL_ENABLE(port));
-	/*
-	 * Definition of each bit polarity has been changed
-	 * after A1 stepping
-	 */
-	if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
-		temp &= ~PORT_PLL_REF_SEL;
-	else
-		temp |= PORT_PLL_REF_SEL;
-

  /* Non-SSC reference */

drivers/gpu/drm/i915/intel_dpll_mgr.c +2 -0
+	temp = I915_READ(BXT_PORT_PLL_ENABLE(port));
+	temp |= PORT_PLL_REF_SEL;
Quoted 3 lines

  I915_WRITE(BXT_PORT_PLL_ENABLE(port), temp);
  /* Disable 10 bit clock */

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx