Skip to contentSkip to conversation

Broxton ddi phy refactoring

PATCH In review Ander Conselvan de Oliveira 6 participants 24 messages Oct 6, 2016 – Oct 28, 2016

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

v2 cover Broxton ddi phy refactoring

Update series with review addressed. Changes since v1:

- Use lockdep_assert_help() in bxt_ddi_phy_init().
- Fix mangled patch.
- Pass enum dpio_phy instead of mmio base to macroc.

Thanks,
Ander

Ander Conselvan de Oliveira (9):
drm/i915: Rename struct i915_power_well field data to id drm/i915: Explicitly map broxton DPIO power wells to phys drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask() drm/i915: Move broxton phy code to intel_dpio_phy.c drm/i915: Move DPIO phy documentation section to intel_dpio_phy.c drm/i915: Move broxton vswing sequence to intel_dpio_phy.c drm/i915: Create a struct to hold information about the broxton phys drm/i915: Add location of the Rcomp resistor to bxt_ddi_phy_info drm/i915: Address broxton phy registers based on phy and channel number

 Documentation/gpu/i915.rst              |   2 +-
 drivers/gpu/drm/i915/i915_drv.h         |  23 +-
 drivers/gpu/drm/i915/i915_reg.h         | 237 +++-------
 drivers/gpu/drm/i915/intel_ddi.c        | 362 +---------------
 drivers/gpu/drm/i915/intel_dpio_phy.c   | 588 +++++++++++++++++++++++++-
 drivers/gpu/drm/i915/intel_dpll_mgr.c   |  84 ++--
 drivers/gpu/drm/i915/intel_drv.h        |   6 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c | 145 ++----
 8 files changed, 806 insertions(+), 641 deletions(-)
Signature · 5 lines
git-series 0.8.10
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH v2 1/9 drm/i915: Rename struct i915_power_well field data to id

Calling it data seems to imply arbitrary data can be associated with the power well. However, that field is used for look ups and expected to be unique, so rename it.

---
 drivers/gpu/drm/i915/i915_drv.h         |   3 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c | 112 ++++++++++++-------------
 2 files changed, 58 insertions(+), 57 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
index 4613f03..5bd3f59 100644
@@ -1316,7 +1316,8 @@ struct i915_power_well {
 	/* cached hw enabled state */
 	bool hw_enabled;
 	unsigned long domains;
-	unsigned long data;
+	/* unique identifier for this power well */
+	unsigned long id;
 	const struct i915_power_well_ops *ops;
 };
 
drivers/gpu/drm/i915/intel_runtime_pm.c +56 -56

396 lines not on this page · raw message

Signature · 5 lines
git-series 0.8.10
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH v2 2/9 drm/i915: Explicitly map broxton DPIO power wells to phys

In reply to Ander Conselvan de Oliveira

The mapping from the BXT_DPIO_CMN_* power wells to their respective phys required a detour implemented in the bxt_power_well_to_phy() function. Instead, embed that information directly into the power_well struct, by resurrecting the data field.

---
 drivers/gpu/drm/i915/i915_drv.h         |  5 +++++
 drivers/gpu/drm/i915/intel_runtime_pm.c | 22 +++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +5 -0
index 5bd3f59..93c90b9 100644
@@ -1318,6 +1318,11 @@ struct i915_power_well {
 	unsigned long domains;
 	/* unique identifier for this power well */
 	unsigned long id;
+	/*
+	 * Arbitraty data associated with this power well. Platform and power
+	 * well specific.
+	 */
+	unsigned long data;
 	const struct i915_power_well_ops *ops;
 };
 
drivers/gpu/drm/i915/intel_runtime_pm.c +7 -15
index 4ecaf6a..d41fd46 100644
@@ -846,13 +846,6 @@ static void skl_power_well_disable(struct drm_i915_private *dev_priv,
 	skl_set_power_well(dev_priv, power_well, false);
 }
 
-static enum dpio_phy bxt_power_well_to_phy(struct i915_power_well *power_well)
-{
-	enum skl_disp_power_wells power_well_id = power_well->id;
-
-	return power_well_id == BXT_DPIO_CMN_A ? DPIO_PHY1 : DPIO_PHY0;
-}
-
 static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,
 					   struct i915_power_well *power_well)
 {
@@ -868,7 +861,7 @@ static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,
 		intel_power_well_get(dev_priv, cmn_a_well);
 	}
 
-	bxt_ddi_phy_init(dev_priv, bxt_power_well_to_phy(power_well));
+	bxt_ddi_phy_init(dev_priv, power_well->data);
 
 	if (cmn_a_well)
 		intel_power_well_put(dev_priv, cmn_a_well);
@@ -877,14 +870,13 @@ static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,
 static void bxt_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,
 					    struct i915_power_well *power_well)
 {
-	bxt_ddi_phy_uninit(dev_priv, bxt_power_well_to_phy(power_well));
+	bxt_ddi_phy_uninit(dev_priv, power_well->data);
 }
 
 static bool bxt_dpio_cmn_power_well_enabled(struct drm_i915_private *dev_priv,
 					    struct i915_power_well *power_well)
 {
-	return bxt_ddi_phy_is_enabled(dev_priv,
-				      bxt_power_well_to_phy(power_well));
+	return bxt_ddi_phy_is_enabled(dev_priv, power_well->data);
 }
 
 static void bxt_dpio_cmn_power_well_sync_hw(struct drm_i915_private *dev_priv,
@@ -903,13 +895,11 @@ static void bxt_verify_ddi_phy_power_wells(struct drm_i915_private *dev_priv)
 
 	power_well = lookup_power_well(dev_priv, BXT_DPIO_CMN_A);
 	if (power_well->count > 0)
-		bxt_ddi_phy_verify_state(dev_priv,
-					 bxt_power_well_to_phy(power_well));
+		bxt_ddi_phy_verify_state(dev_priv, power_well->data);
 
 	power_well = lookup_power_well(dev_priv, BXT_DPIO_CMN_BC);
 	if (power_well->count > 0)
-		bxt_ddi_phy_verify_state(dev_priv,
-					 bxt_power_well_to_phy(power_well));
+		bxt_ddi_phy_verify_state(dev_priv, power_well->data);
 }
 
 static bool gen9_dc_off_power_well_enabled(struct drm_i915_private *dev_priv,
@@ -2163,12 +2153,14 @@ static struct i915_power_well bxt_power_wells[] = {
 		.domains = BXT_DPIO_CMN_A_POWER_DOMAINS,
 		.ops = &bxt_dpio_cmn_power_well_ops,
 		.id = BXT_DPIO_CMN_A,
+		.data = DPIO_PHY1,
 	},
 	{
 		.name = "dpio-common-bc",
 		.domains = BXT_DPIO_CMN_BC_POWER_DOMAINS,
 		.ops = &bxt_dpio_cmn_power_well_ops,
 		.id = BXT_DPIO_CMN_BC,
+		.data = DPIO_PHY0,
 	},
 };
 
Signature · 5 lines
git-series 0.8.10
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

PATCH v2 3/9 drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask()

In reply to Ander Conselvan de Oliveira

Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask() instead of having it extract that number from a pipe_config to decouple the phy code from intel_crtc_state.

---
 drivers/gpu/drm/i915/intel_ddi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +4 -4
index 35f0b7c..1dc7543 100644
@@ -2120,9 +2120,9 @@ bool bxt_ddi_phy_verify_state(struct drm_i915_private *dev_priv,
 
 static uint8_t
 bxt_ddi_phy_calc_lane_lat_optim_mask(struct intel_encoder *encoder,
-				     struct intel_crtc_state *pipe_config)
+				     uint8_t lane_count)
 {
-	switch (pipe_config->lane_count) {
+	switch (lane_count) {
 	case 1:
 		return 0;
 	case 2:
@@ -2130,7 +2130,7 @@ bxt_ddi_phy_calc_lane_lat_optim_mask(struct intel_encoder *encoder,
 	case 4:
 		return BIT(3) | BIT(2) | BIT(0);
 	default:
-		MISSING_CASE(pipe_config->lane_count);
+		MISSING_CASE(lane_count);
 
 		return 0;
 	}
@@ -2347,7 +2347,7 @@ static bool intel_ddi_compute_config(struct intel_encoder *encoder,
 	if (IS_BROXTON(dev_priv) && ret)
 		pipe_config->lane_lat_optim_mask =
 			bxt_ddi_phy_calc_lane_lat_optim_mask(encoder,
-							     pipe_config);
+							     pipe_config->lane_count);
 
 	return ret;
 
Signature · 5 lines
git-series 0.8.10
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

PATCH v2 4/9 drm/i915: Move broxton phy code to intel_dpio_phy.c

In reply to Ander Conselvan de Oliveira

The phy in broxton is also a dpio phy, similar to cherryview but with programming through MMIO. So move the code together with the other similar phys.

---
 drivers/gpu/drm/i915/i915_drv.h       |  12 +-
 drivers/gpu/drm/i915/intel_ddi.c      | 322 +---------------------------
 drivers/gpu/drm/i915/intel_dpio_phy.c | 327 +++++++++++++++++++++++++++-
 drivers/gpu/drm/i915/intel_drv.h      |   6 +-
 4 files changed, 341 insertions(+), 326 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +12 -0
index 93c90b9..8bdbbb5 100644
@@ -3735,6 +3735,18 @@ u32 vlv_flisdsi_read(struct drm_i915_private *dev_priv, u32 reg);
 void vlv_flisdsi_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);
 
 /* intel_dpio_phy.c */
+void bxt_ddi_phy_init(struct drm_i915_private *dev_priv, enum dpio_phy phy);
+void bxt_ddi_phy_uninit(struct drm_i915_private *dev_priv, enum dpio_phy phy);
+bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,
+			    enum dpio_phy phy);
+bool bxt_ddi_phy_verify_state(struct drm_i915_private *dev_priv,
+			      enum dpio_phy phy);
+uint8_t bxt_ddi_phy_calc_lane_lat_optim_mask(struct intel_encoder *encoder,
+					     uint8_t lane_count);
+void bxt_ddi_phy_set_lane_optim_mask(struct intel_encoder *encoder,
+				     uint8_t lane_lat_optim_mask);
+uint8_t bxt_ddi_phy_get_lane_lat_optim_mask(struct intel_encoder *encoder);
+
 void chv_set_phy_signal_level(struct intel_encoder *encoder,
 			      u32 deemph_reg_value, u32 margin_reg_value,
 			      bool uniq_trans_scale);
drivers/gpu/drm/i915/intel_ddi.c +2 -320

334 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpio_phy.c +327 -0

333 lines not on this page · raw message

drivers/gpu/drm/i915/intel_drv.h +0 -6
index f48e79a..c150807 100644
@@ -1328,12 +1328,6 @@ void hsw_enable_pc8(struct drm_i915_private *dev_priv);
 void hsw_disable_pc8(struct drm_i915_private *dev_priv);
 void bxt_init_cdclk(struct drm_i915_private *dev_priv);
 void bxt_uninit_cdclk(struct drm_i915_private *dev_priv);
-void bxt_ddi_phy_init(struct drm_i915_private *dev_priv, enum dpio_phy phy);
-void bxt_ddi_phy_uninit(struct drm_i915_private *dev_priv, enum dpio_phy phy);
-bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,
-			    enum dpio_phy phy);
-bool bxt_ddi_phy_verify_state(struct drm_i915_private *dev_priv,
-			      enum dpio_phy phy);
 void gen9_sanitize_dc_state(struct drm_i915_private *dev_priv);
 void bxt_enable_dc9(struct drm_i915_private *dev_priv);
 void bxt_disable_dc9(struct drm_i915_private *dev_priv);
Signature · 5 lines
git-series 0.8.10
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

PATCH v2 5/9 drm/i915: Move DPIO phy documentation section to intel_dpio_phy.c

In reply to Ander Conselvan de Oliveira

Move the DPIO phy documentation section to intel_dpio_phy.c, since that is a more suitable place now that there is a source file dedicated for those phys.

---
 Documentation/gpu/i915.rst            |  2 +-
 drivers/gpu/drm/i915/i915_reg.h       | 91 +----------------------------
 drivers/gpu/drm/i915/intel_dpio_phy.c | 91 ++++++++++++++++++++++++++++-
 3 files changed, 93 insertions(+), 91 deletions(-)
Documentation/gpu/i915.rst +1 -1
index 87aaffc..8cecae1 100644
@@ -180,7 +180,7 @@ Display Refresh Rate Switching (DRRS)
 DPIO
 ----
 
-.. kernel-doc:: drivers/gpu/drm/i915/i915_reg.h
+.. kernel-doc:: drivers/gpu/drm/i915/intel_dpio_phy.c
    :doc: DPIO
 
 CSR firmware support for DMC
drivers/gpu/drm/i915/i915_reg.h +1 -90

97 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpio_phy.c +91 -0

97 lines not on this page · raw message

Signature · 5 lines
git-series 0.8.10
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

PATCH v2 6/9 drm/i915: Move broxton vswing sequence to intel_dpio_phy.c

In reply to Ander Conselvan de Oliveira

The vswing sequence is related to the DPIO phy, so move it closer to the rest of DPIO phy related code.

---
 drivers/gpu/drm/i915/i915_drv.h       |  3 ++-
 drivers/gpu/drm/i915/intel_ddi.c      | 38 +++------------------------
 drivers/gpu/drm/i915/intel_dpio_phy.c | 39 ++++++++++++++++++++++++++++-
 3 files changed, 47 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -0
index 8bdbbb5..77f1374 100644
@@ -3735,6 +3735,9 @@ u32 vlv_flisdsi_read(struct drm_i915_private *dev_priv, u32 reg);
 void vlv_flisdsi_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);
 
 /* intel_dpio_phy.c */
+void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
+				  enum port port, u32 margin, u32 scale,
+				  u32 enable, u32 deemphasis);
 void bxt_ddi_phy_init(struct drm_i915_private *dev_priv, enum dpio_phy phy);
 void bxt_ddi_phy_uninit(struct drm_i915_private *dev_priv, enum dpio_phy phy);
 bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_ddi.c +5 -33
index d69d231..f27cd67 100644
@@ -1477,7 +1477,6 @@ static void bxt_ddi_vswing_sequence(struct drm_i915_private *dev_priv,
 {
 	const struct bxt_ddi_buf_trans *ddi_translations;
 	u32 n_entries, i;
-	uint32_t val;
 
 	if (type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp.low_vswing) {
 		n_entries = ARRAY_SIZE(bxt_ddi_translations_edp);
@@ -1506,38 +1505,11 @@ static void bxt_ddi_vswing_sequence(struct drm_i915_private *dev_priv,
 		}
 	}
 
-	/*
-	 * While we write to the group register to program all lanes at once we
-	 * can read only lane registers and we pick lanes 0/1 for that.
-	 */
-	val = I915_READ(BXT_PORT_PCS_DW10_LN01(port));
-	val &= ~(TX2_SWING_CALC_INIT | TX1_SWING_CALC_INIT);
-	I915_WRITE(BXT_PORT_PCS_DW10_GRP(port), val);
-
-	val = I915_READ(BXT_PORT_TX_DW2_LN0(port));
-	val &= ~(MARGIN_000 | UNIQ_TRANS_SCALE);
-	val |= ddi_translations[level].margin << MARGIN_000_SHIFT |
-	       ddi_translations[level].scale << UNIQ_TRANS_SCALE_SHIFT;
-	I915_WRITE(BXT_PORT_TX_DW2_GRP(port), val);
-
-	val = I915_READ(BXT_PORT_TX_DW3_LN0(port));
-	val &= ~SCALE_DCOMP_METHOD;
-	if (ddi_translations[level].enable)
-		val |= SCALE_DCOMP_METHOD;
-
-	if ((val & UNIQUE_TRANGE_EN_METHOD) && !(val & SCALE_DCOMP_METHOD))
-		DRM_ERROR("Disabled scaling while ouniqetrangenmethod was set");
-
-	I915_WRITE(BXT_PORT_TX_DW3_GRP(port), val);
-
-	val = I915_READ(BXT_PORT_TX_DW4_LN0(port));
-	val &= ~DE_EMPHASIS;
-	val |= ddi_translations[level].deemphasis << DEEMPH_SHIFT;
-	I915_WRITE(BXT_PORT_TX_DW4_GRP(port), val);
-
-	val = I915_READ(BXT_PORT_PCS_DW10_LN01(port));
-	val |= TX2_SWING_CALC_INIT | TX1_SWING_CALC_INIT;
-	I915_WRITE(BXT_PORT_PCS_DW10_GRP(port), val);
+	bxt_ddi_phy_set_signal_level(dev_priv, port,
+				     ddi_translations[level].margin,
+				     ddi_translations[level].scale,
+				     ddi_translations[level].enable,
+				     ddi_translations[level].deemphasis);
 }
 
 static uint32_t translate_signal_level(int signal_levels)
drivers/gpu/drm/i915/intel_dpio_phy.c +39 -0
index 6806296..2a18724 100644
@@ -114,6 +114,45 @@
  *     -----------------
  */
 
+void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
+				  enum port port, u32 margin, u32 scale,
+				  u32 enable, u32 deemphasis)
+{
+	u32 val;
+
+	/*
+	 * While we write to the group register to program all lanes at once we
+	 * can read only lane registers and we pick lanes 0/1 for that.
+	 */
+	val = I915_READ(BXT_PORT_PCS_DW10_LN01(port));
+	val &= ~(TX2_SWING_CALC_INIT | TX1_SWING_CALC_INIT);
+	I915_WRITE(BXT_PORT_PCS_DW10_GRP(port), val);
+
+	val = I915_READ(BXT_PORT_TX_DW2_LN0(port));
+	val &= ~(MARGIN_000 | UNIQ_TRANS_SCALE);
+	val |= margin << MARGIN_000_SHIFT | scale << UNIQ_TRANS_SCALE_SHIFT;
+	I915_WRITE(BXT_PORT_TX_DW2_GRP(port), val);
+
+	val = I915_READ(BXT_PORT_TX_DW3_LN0(port));
+	val &= ~SCALE_DCOMP_METHOD;
+	if (enable)
+		val |= SCALE_DCOMP_METHOD;
+
+	if ((val & UNIQUE_TRANGE_EN_METHOD) && !(val & SCALE_DCOMP_METHOD))
+		DRM_ERROR("Disabled scaling while ouniqetrangenmethod was set");
+
+	I915_WRITE(BXT_PORT_TX_DW3_GRP(port), val);
+
+	val = I915_READ(BXT_PORT_TX_DW4_LN0(port));
+	val &= ~DE_EMPHASIS;
+	val |= deemphasis << DEEMPH_SHIFT;
+	I915_WRITE(BXT_PORT_TX_DW4_GRP(port), val);
+
+	val = I915_READ(BXT_PORT_PCS_DW10_LN01(port));
+	val |= TX2_SWING_CALC_INIT | TX1_SWING_CALC_INIT;
+	I915_WRITE(BXT_PORT_PCS_DW10_GRP(port), val);
+}
+
 bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,
 			    enum dpio_phy phy)
 {
Signature · 5 lines
git-series 0.8.10
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

PATCH v2 7/9 drm/i915: Create a struct to hold information about the broxton phys

In reply to Ander Conselvan de Oliveira

Information about which phy is dual channel is hardcoded in the phy init sequence. Split that to a separate struct so the init sequence is more generic.

v2: Restore mangled part that ended up in following patch. (Imre)

---
 drivers/gpu/drm/i915/i915_reg.h       |  9 +++-
 drivers/gpu/drm/i915/intel_dpio_phy.c | 65 +++++++++++++++++++++++-----
 2 files changed, 62 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +7 -2
index f6d29fb..d3802c6 100644
@@ -1308,8 +1308,13 @@ enum skl_disp_power_wells {
 #define BXT_PORT_CL1CM_DW30(phy)	_BXT_PHY((phy), _PORT_CL1CM_DW30_BC, \
 							_PORT_CL1CM_DW30_A)
 
-/* Defined for PHY0 only */
-#define BXT_PORT_CL2CM_DW6_BC		_MMIO(0x6C358)
+/* The spec defines this only for BXT PHY0, but lets assume that this
+ * would exist for PHY1 too if it had a second channel.
+ */
+#define _PORT_CL2CM_DW6_A		0x162358
+#define _PORT_CL2CM_DW6_BC		0x6C358
+#define BXT_PORT_CL2CM_DW6(phy)		_BXT_PHY((phy), _PORT_CL2CM_DW6_BC, \
+							_PORT_CL2CM_DW6_A)
 #define   DW6_OLDO_DYN_PWR_DOWN_EN	(1 << 28)
 
 /* BXT PHY Ref registers */
drivers/gpu/drm/i915/intel_dpio_phy.c +55 -10

115 lines not on this page · raw message

Signature · 5 lines
git-series 0.8.10
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

PATCH v2 8/9 drm/i915: Add location of the Rcomp resistor to bxt_ddi_phy_info

In reply to Ander Conselvan de Oliveira

Use struct bxt_ddi_phy_info to hold information of where the Rcomp resistor is located, instead of hard coding it in the init sequence.

Note that this moves the enabling of the phy with the Rcomp resistor out of the power well enable code. That should be safe since bxt_ddi_phy_init() is called while the power domains lock is held, and that is the only way that function gets called, so there is no possibility of a concurrent phy enable caused by a power domain get call.

v2: Replace comment about lock with lockdep_assert_held() (Imre)

---
 drivers/gpu/drm/i915/intel_dpio_phy.c   | 72 +++++++++++++++++++-------
 drivers/gpu/drm/i915/intel_runtime_pm.c | 15 +-----
 2 files changed, 55 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/intel_dpio_phy.c +55 -17
index 1b1fba1..6711e3a 100644
@@ -124,6 +124,13 @@ struct bxt_ddi_phy_info {
 	bool dual_channel;
 
 	/**
+	 * @rcomp_phy: If -1, indicates this phy has its own rcomp resistor.
+	 * Otherwise the GRC value will be copied from the phy indicated by
+	 * this field.
+	 */
+	enum dpio_phy rcomp_phy;
+
+	/**
 	 * @channel: struct containing per channel information.
 	 */
 	struct {
@@ -137,6 +144,7 @@ struct bxt_ddi_phy_info {
 static const struct bxt_ddi_phy_info bxt_ddi_phy_info[] = {
 	[DPIO_PHY0] = {
 		.dual_channel = true,
+		.rcomp_phy = DPIO_PHY1,
 
 		.channel = {
 			[DPIO_CH0] = { .port = PORT_B },
@@ -145,6 +153,7 @@ static const struct bxt_ddi_phy_info bxt_ddi_phy_info[] = {
 	},
 	[DPIO_PHY1] = {
 		.dual_channel = false,
+		.rcomp_phy = -1,
 
 		.channel = {
 			[DPIO_CH0] = { .port = PORT_A },
@@ -214,9 +223,10 @@ bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,
 		return false;
 	}
 
-	if (phy == DPIO_PHY1 &&
-	    !(I915_READ(BXT_PORT_REF_DW3(DPIO_PHY1)) & GRC_DONE)) {
-		DRM_DEBUG_DRIVER("DDI PHY 1 powered, but GRC isn't done\n");
+	if (phy_info->rcomp_phy == -1 &&
+	    !(I915_READ(BXT_PORT_REF_DW3(phy)) & GRC_DONE)) {
+		DRM_DEBUG_DRIVER("DDI PHY %d powered, but GRC isn't done\n",
+				 phy);
 
 		return false;
 	}
@@ -261,14 +271,15 @@ static void bxt_phy_wait_grc_done(struct drm_i915_private *dev_priv,
 		DRM_ERROR("timeout waiting for PHY%d GRC\n", phy);
 }
 
-void bxt_ddi_phy_init(struct drm_i915_private *dev_priv, enum dpio_phy phy)
+static void _bxt_ddi_phy_init(struct drm_i915_private *dev_priv,
+			      enum dpio_phy phy)
 {
 	const struct bxt_ddi_phy_info *phy_info = &bxt_ddi_phy_info[phy];
 	u32 val;
 
 	if (bxt_ddi_phy_is_enabled(dev_priv, phy)) {
 		/* Still read out the GRC value for state verification */
-		if (phy == DPIO_PHY0)
+		if (phy_info->rcomp_phy != -1)
 			dev_priv->bxt_phy_grc = bxt_get_grc(dev_priv, phy);
 
 		if (bxt_ddi_phy_verify_state(dev_priv, phy)) {
@@ -338,30 +349,32 @@ void bxt_ddi_phy_init(struct drm_i915_private *dev_priv, enum dpio_phy phy)
 		val |= OCL2_LDOFUSE_PWR_DIS;
 	I915_WRITE(BXT_PORT_CL1CM_DW30(phy), val);
 
-	if (phy == DPIO_PHY0) {
+	if (phy_info->rcomp_phy != -1) {
 		uint32_t grc_code;
 		/*
 		 * PHY0 isn't connected to an RCOMP resistor so copy over
 		 * the corresponding calibrated value from PHY1, and disable
 		 * the automatic calibration on PHY0.
 		 */
-		val = dev_priv->bxt_phy_grc = bxt_get_grc(dev_priv, DPIO_PHY1);
+		val = dev_priv->bxt_phy_grc = bxt_get_grc(dev_priv,
+							  phy_info->rcomp_phy);
 		grc_code = val << GRC_CODE_FAST_SHIFT |
 			   val << GRC_CODE_SLOW_SHIFT |
 			   val;
-		I915_WRITE(BXT_PORT_REF_DW6(DPIO_PHY0), grc_code);
+		I915_WRITE(BXT_PORT_REF_DW6(phy), grc_code);
 
-		val = I915_READ(BXT_PORT_REF_DW8(DPIO_PHY0));
+		val = I915_READ(BXT_PORT_REF_DW8(phy));
 		val |= GRC_DIS | GRC_RDY_OVRD;
-		I915_WRITE(BXT_PORT_REF_DW8(DPIO_PHY0), val);
+		I915_WRITE(BXT_PORT_REF_DW8(phy), val);
 	}
 
 	val = I915_READ(BXT_PHY_CTL_FAMILY(phy));
 	val |= COMMON_RESET_DIS;
 	I915_WRITE(BXT_PHY_CTL_FAMILY(phy), val);
 
-	if (phy == DPIO_PHY1)
-		bxt_phy_wait_grc_done(dev_priv, DPIO_PHY1);
+	if (phy_info->rcomp_phy == -1)
+		bxt_phy_wait_grc_done(dev_priv, phy);
+
 }
 
 void bxt_ddi_phy_uninit(struct drm_i915_private *dev_priv, enum dpio_phy phy)
@@ -377,6 +390,31 @@ void bxt_ddi_phy_uninit(struct drm_i915_private *dev_priv, enum dpio_phy phy)
 	I915_WRITE(BXT_P_CR_GT_DISP_PWRON, val);
 }
 
+void bxt_ddi_phy_init(struct drm_i915_private *dev_priv, enum dpio_phy phy)
+{
+	const struct bxt_ddi_phy_info *phy_info = &bxt_ddi_phy_info[phy];
+	enum dpio_phy rcomp_phy = phy_info->rcomp_phy;
+	bool was_enabled;
+
+	lockdep_assert_held(&dev_priv->power_domains.lock);
+
+	if (rcomp_phy != -1) {
+		was_enabled = bxt_ddi_phy_is_enabled(dev_priv, rcomp_phy);
+
+		/*
+		 * We need to copy the GRC calibration value from rcomp_phy,
+		 * so make sure it's powered up.
+		 */
+		if (!was_enabled)
+			_bxt_ddi_phy_init(dev_priv, rcomp_phy);
+	}
+
+	_bxt_ddi_phy_init(dev_priv, phy);
+
+	if (rcomp_phy != -1 && !was_enabled)
+		bxt_ddi_phy_uninit(dev_priv, phy_info->rcomp_phy);
+}
+
 static bool __printf(6, 7)
 __phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy,
 		       i915_reg_t reg, u32 mask, u32 expected,
@@ -443,7 +481,7 @@ bool bxt_ddi_phy_verify_state(struct drm_i915_private *dev_priv,
 	 * at least on stepping A this bit is read-only and fixed at 0.
 	 */
 
-	if (phy == DPIO_PHY0) {
+	if (phy_info->rcomp_phy != -1) {
 		u32 grc_code = dev_priv->bxt_phy_grc;
 
 		grc_code = grc_code << GRC_CODE_FAST_SHIFT |
@@ -451,12 +489,12 @@ bool bxt_ddi_phy_verify_state(struct drm_i915_private *dev_priv,
 			   grc_code;
 		mask = GRC_CODE_FAST_MASK | GRC_CODE_SLOW_MASK |
 		       GRC_CODE_NOM_MASK;
-		ok &= _CHK(BXT_PORT_REF_DW6(DPIO_PHY0), mask, grc_code,
-			    "BXT_PORT_REF_DW6(%d)", DPIO_PHY0);
+		ok &= _CHK(BXT_PORT_REF_DW6(phy), mask, grc_code,
+			    "BXT_PORT_REF_DW6(%d)", phy);
 
 		mask = GRC_DIS | GRC_RDY_OVRD;
-		ok &= _CHK(BXT_PORT_REF_DW8(DPIO_PHY0), mask, mask,
-			    "BXT_PORT_REF_DW8(%d)", DPIO_PHY0);
+		ok &= _CHK(BXT_PORT_REF_DW8(phy), mask, mask,
+			    "BXT_PORT_REF_DW8(%d)", phy);
 	}
 
 	return ok;
drivers/gpu/drm/i915/intel_runtime_pm.c +0 -15
index d41fd46..3b38998 100644
@@ -849,22 +849,7 @@ static void skl_power_well_disable(struct drm_i915_private *dev_priv,
 static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,
 					   struct i915_power_well *power_well)
 {
-	enum skl_disp_power_wells power_well_id = power_well->id;
-	struct i915_power_well *cmn_a_well = NULL;
-
-	if (power_well_id == BXT_DPIO_CMN_BC) {
-		/*
-		 * We need to copy the GRC calibration value from the eDP PHY,
-		 * so make sure it's powered up.
-		 */
-		cmn_a_well = lookup_power_well(dev_priv, BXT_DPIO_CMN_A);
-		intel_power_well_get(dev_priv, cmn_a_well);
-	}
-
 	bxt_ddi_phy_init(dev_priv, power_well->data);
-
-	if (cmn_a_well)
-		intel_power_well_put(dev_priv, cmn_a_well);
 }
 
 static void bxt_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,
Signature · 5 lines
git-series 0.8.10
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw

PATCH v2 9/9 drm/i915: Address broxton phy registers based on phy and channel number

In reply to Ander Conselvan de Oliveira

The port registers related to the phys in broxton map to different channels and specific phys. Make that mapping explicit.

v2: Pass enum dpio_phy to macros instead of mmio base. (Imre)

---
 drivers/gpu/drm/i915/i915_drv.h       |   2 +-
 drivers/gpu/drm/i915/i915_reg.h       | 141 +++++++++++++--------------
 drivers/gpu/drm/i915/intel_dpio_phy.c |  80 ++++++++++++---
 drivers/gpu/drm/i915/intel_dpll_mgr.c |  84 ++++++++--------
 4 files changed, 185 insertions(+), 122 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
index 77f1374..c3fa29a 100644
@@ -3735,6 +3735,8 @@ u32 vlv_flisdsi_read(struct drm_i915_private *dev_priv, u32 reg);
 void vlv_flisdsi_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);
 
 /* intel_dpio_phy.c */
+void bxt_port_to_phy_channel(enum port port,
+			     u32 *phy, enum dpio_channel *ch);
 void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
 				  enum port port, u32 margin, u32 scale,
 				  u32 enable, u32 deemphasis);
drivers/gpu/drm/i915/i915_reg.h +73 -68

256 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpio_phy.c +64 -16

156 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpll_mgr.c +46 -38

188 lines not on this page · raw message

Signature · 5 lines
git-series 0.8.10
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#10 lore raw

PATCH v3 9/9 drm/i915: Address broxton phy registers based on phy and channel number

The port registers related to the phys in broxton map to different channels and specific phys. Make that mapping explicit.

v2: Pass enum dpio_phy to macros instead of mmio base. (Imre)

v3: Fix typo in macros. (Imre)

---
 drivers/gpu/drm/i915/i915_drv.h       |   2 +
 drivers/gpu/drm/i915/i915_reg.h       | 141 ++++++++++++++++++----------------
 drivers/gpu/drm/i915/intel_dpio_phy.c |  80 +++++++++++++++----
 drivers/gpu/drm/i915/intel_dpll_mgr.c |  84 +++++++++++---------
 4 files changed, 185 insertions(+), 122 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
index 77f1374..c3fa29a 100644
@@ -3735,6 +3735,8 @@ u32 vlv_flisdsi_read(struct drm_i915_private *dev_priv, u32 reg);
 void vlv_flisdsi_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);
 
 /* intel_dpio_phy.c */
+void bxt_port_to_phy_channel(enum port port,
+			     u32 *phy, enum dpio_channel *ch);
 void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
 				  enum port port, u32 margin, u32 scale,
 				  u32 enable, u32 deemphasis);
drivers/gpu/drm/i915/i915_reg.h +73 -68

256 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpio_phy.c +64 -16

156 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpll_mgr.c +46 -38

188 lines not on this page · raw message

Signature · 6 lines
2.5.5

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v3 9/9
#11 lore raw

Re: [PATCH v3 9/9] drm/i915: Address broxton phy registers based on phy and channel number

Quoted 23 lines · Ander Conselvan de Oliveira

The port registers related to the phys in broxton map to different channels and specific phys. Make that mapping explicit.

v2: Pass enum dpio_phy to macros instead of mmio base. (Imre)

v3: Fix typo in macros. (Imre)

Signed-off-by Ander Conselvan de Oliveira

---
 drivers/gpu/drm/i915/i915_drv.h       |   2 + drivers/gpu/drm/i915/i915_reg.h       | 141 ++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_dpio_phy.c |  80 +++++++++++++++---- drivers/gpu/drm/i915/intel_dpll_mgr.c |  84 +++++++++++---------

 4 files changed, 185 insertions(+), 122 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -0
index 77f1374..c3fa29a 100644
@@ -3735,6 +3735,8 @@ u32 vlv_flisdsi_read(struct drm_i915_private *dev_priv, u32 reg);
  void vlv_flisdsi_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);


 /* intel_dpio_phy.c */

drivers/gpu/drm/i915/i915_drv.h u32 vlv_flisdsi_read(struct drm_i915_private *dev_priv, u32 reg); · line 3739

Quoted 2 lines
drivers/gpu/drm/i915/i915_drv.h +2 -0
+void bxt_port_to_phy_channel(enum port port,
+			     u32 *phy, enum dpio_channel *ch);

Type of phy doesn't match the function definition, should be enum dpio_phy.

Quoted 315 lines

 void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv, enum port port, u32 margin, u32 scale, u32 enable, u32 deemphasis);

drivers/gpu/drm/i915/i915_reg.h +0 -0
index d3802c6..8f4612c 100644
@@ -1187,7 +1187,19 @@ enum skl_disp_power_wells {
  #define   DPIO_UPAR_SHIFT		30


 /* BXT PHY registers */

drivers/gpu/drm/i915/i915_reg.h +13 -1
-#define _BXT_PHY(phy, a, b)		_MMIO_PIPE((phy), (a), (b))
+#define _BXT_PHY0_BASE			0x6C000
+#define _BXT_PHY1_BASE			0x162000
+#define BXT_PHY_BASE(phy)		_PIPE((phy), _BXT_PHY0_BASE, \
+						     _BXT_PHY1_BASE)
+
+#define _BXT_PHY(phy, reg)						\
+	_MMIO(BXT_PHY_BASE(phy) - _BXT_PHY0_BASE + (reg))
+
+#define _BXT_PHY_CH(phy, ch, reg_ch0, reg_ch1)		\
+	(BXT_PHY_BASE(phy) + _PIPE((ch), (reg_ch0) - _BXT_PHY0_BASE,	\
+					 (reg_ch1) - _BXT_PHY0_BASE))
+#define _MMIO_BXT_PHY_CH(phy, ch, reg_ch0, reg_ch1)		\
+	_MMIO(_BXT_PHY_CH(phy, ch, reg_ch0, reg_ch1))


 #define BXT_P_CR_GT_DISP_PWRON _MMIO(0x138090)
 #define   GT_DISPLAY_POWER_ON(phy) (1 << (phy))

drivers/gpu/drm/i915/i915_reg.h +2 -2
@@ -1204,8 +1216,8 @@ enum skl_disp_power_wells {
  #define _PHY_CTL_FAMILY_EDP		0x64C80
  #define _PHY_CTL_FAMILY_DDI		0x64C90
  #define   COMMON_RESET_DIS		(1 << 31)
-#define BXT_PHY_CTL_FAMILY(phy)		_BXT_PHY((phy), _PHY_CTL_FAMILY_DDI, \
-							_PHY_CTL_FAMILY_EDP)
+#define BXT_PHY_CTL_FAMILY(phy)		_MMIO_PIPE((phy), _PHY_CTL_FAMILY_DDI, \
+							  _PHY_CTL_FAMILY_EDP)


 /* BXT PHY PLL registers */
 #define _PORT_PLL_A 0x46074

drivers/gpu/drm/i915/i915_reg.h +3 -3
@@ -1225,18 +1237,18 @@ enum skl_disp_power_wells {
  #define   PORT_PLL_P2_SHIFT		8
  #define   PORT_PLL_P2_MASK		(0x1f << PORT_PLL_P2_SHIFT)
  #define   PORT_PLL_P2(x)		((x)  << PORT_PLL_P2_SHIFT)
-#define BXT_PORT_PLL_EBB_0(port)	_MMIO_PORT3(port, _PORT_PLL_EBB_0_A, \
-						_PORT_PLL_EBB_0_B,	\
-						_PORT_PLL_EBB_0_C)
+#define BXT_PORT_PLL_EBB_0(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_PLL_EBB_0_B, \
+							 _PORT_PLL_EBB_0_C)


 #define _PORT_PLL_EBB_4_A 0x162038
 #define _PORT_PLL_EBB_4_B 0x6C038
 #define _PORT_PLL_EBB_4_C 0x6C344
 #define   PORT_PLL_10BIT_CLK_ENABLE (1 << 13)
 #define   PORT_PLL_RECALIBRATE (1 << 14)

drivers/gpu/drm/i915/i915_reg.h +3 -3
-#define BXT_PORT_PLL_EBB_4(port)	_MMIO_PORT3(port, _PORT_PLL_EBB_4_A, \
-						_PORT_PLL_EBB_4_B,	\
-						_PORT_PLL_EBB_4_C)
+#define BXT_PORT_PLL_EBB_4(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_PLL_EBB_4_B, \
+							 _PORT_PLL_EBB_4_C)


 #define _PORT_PLL_0_A 0x162100
 #define _PORT_PLL_0_B 0x6C100

drivers/gpu/drm/i915/i915_reg.h +5 -4
@@ -1267,62 +1279,56 @@ enum skl_disp_power_wells {
  #define  PORT_PLL_DCO_AMP_DEFAULT	15
  #define  PORT_PLL_DCO_AMP_MASK		0x3c00
  #define  PORT_PLL_DCO_AMP(x)		((x)<<10)
-#define _PORT_PLL_BASE(port)		_PORT3(port, _PORT_PLL_0_A,	\
-						_PORT_PLL_0_B,		\
-						_PORT_PLL_0_C)
-#define BXT_PORT_PLL(port, idx)		_MMIO(_PORT_PLL_BASE(port) + (idx) * 4)
+#define _PORT_PLL_BASE(phy, ch)		_BXT_PHY_CH(phy, ch, \
+						    _PORT_PLL_0_B, \
+						    _PORT_PLL_0_C)
+#define BXT_PORT_PLL(phy, ch, idx)	_MMIO(_PORT_PLL_BASE(phy, ch) + \
+					      (idx) * 4)


 /* BXT PHY common lane registers */
 #define _PORT_CL1CM_DW0_A 0x162000
 #define _PORT_CL1CM_DW0_BC 0x6C000
 #define   PHY_POWER_GOOD (1 << 16)
 #define   PHY_RESERVED (1 << 7)

drivers/gpu/drm/i915/i915_reg.h +1 -2
-#define BXT_PORT_CL1CM_DW0(phy)		_BXT_PHY((phy), _PORT_CL1CM_DW0_BC, \
-							_PORT_CL1CM_DW0_A)
+#define BXT_PORT_CL1CM_DW0(phy)		_BXT_PHY((phy), _PORT_CL1CM_DW0_BC)


 #define _PORT_CL1CM_DW9_A 0x162024
 #define _PORT_CL1CM_DW9_BC 0x6C024
 #define   IREF0RC_OFFSET_SHIFT 8
 #define   IREF0RC_OFFSET_MASK (0xFF << IREF0RC_OFFSET_SHIFT)

drivers/gpu/drm/i915/i915_reg.h +1 -2
-#define BXT_PORT_CL1CM_DW9(phy)		_BXT_PHY((phy), _PORT_CL1CM_DW9_BC, \
-							_PORT_CL1CM_DW9_A)
+#define BXT_PORT_CL1CM_DW9(phy)		_BXT_PHY((phy), _PORT_CL1CM_DW9_BC)


 #define _PORT_CL1CM_DW10_A 0x162028
 #define _PORT_CL1CM_DW10_BC 0x6C028
 #define   IREF1RC_OFFSET_SHIFT 8
 #define   IREF1RC_OFFSET_MASK (0xFF << IREF1RC_OFFSET_SHIFT)

drivers/gpu/drm/i915/i915_reg.h +1 -2
-#define BXT_PORT_CL1CM_DW10(phy)	_BXT_PHY((phy), _PORT_CL1CM_DW10_BC, \
-							_PORT_CL1CM_DW10_A)
+#define BXT_PORT_CL1CM_DW10(phy)	_BXT_PHY((phy), _PORT_CL1CM_DW10_BC)


 #define _PORT_CL1CM_DW28_A 0x162070
 #define _PORT_CL1CM_DW28_BC 0x6C070
 #define   OCL1_POWER_DOWN_EN (1 << 23)
 #define   DW28_OLDO_DYN_PWR_DOWN_EN (1 << 22)
 #define   SUS_CLK_CONFIG 0x3

drivers/gpu/drm/i915/i915_reg.h +1 -2
-#define BXT_PORT_CL1CM_DW28(phy)	_BXT_PHY((phy), _PORT_CL1CM_DW28_BC, \
-							_PORT_CL1CM_DW28_A)
+#define BXT_PORT_CL1CM_DW28(phy)	_BXT_PHY((phy), _PORT_CL1CM_DW28_BC)


 #define _PORT_CL1CM_DW30_A 0x162078
 #define _PORT_CL1CM_DW30_BC 0x6C078
 #define   OCL2_LDOFUSE_PWR_DIS (1 << 6)

drivers/gpu/drm/i915/i915_reg.h +1 -2
-#define BXT_PORT_CL1CM_DW30(phy)	_BXT_PHY((phy), _PORT_CL1CM_DW30_BC, \
-							_PORT_CL1CM_DW30_A)
+#define BXT_PORT_CL1CM_DW30(phy)	_BXT_PHY((phy), _PORT_CL1CM_DW30_BC)


 /* The spec defines this only for BXT PHY0, but lets assume that this
  * would exist for PHY1 too if it had a second channel.
  */
 #define _PORT_CL2CM_DW6_A 0x162358
 #define _PORT_CL2CM_DW6_BC 0x6C358

drivers/gpu/drm/i915/i915_reg.h +1 -2
-#define BXT_PORT_CL2CM_DW6(phy)		_BXT_PHY((phy), _PORT_CL2CM_DW6_BC, \
-							_PORT_CL2CM_DW6_A)
+#define BXT_PORT_CL2CM_DW6(phy)		_BXT_PHY((phy), _PORT_CL2CM_DW6_BC)

 #define   DW6_OLDO_DYN_PWR_DOWN_EN (1 << 28)

 /* BXT PHY Ref registers */
 #define _PORT_REF_DW3_A 0x16218C
 #define _PORT_REF_DW3_BC 0x6C18C
 #define   GRC_DONE (1 << 22)

drivers/gpu/drm/i915/i915_reg.h +1 -2
-#define BXT_PORT_REF_DW3(phy)		_BXT_PHY((phy), _PORT_REF_DW3_BC, \
-							_PORT_REF_DW3_A)
+#define BXT_PORT_REF_DW3(phy)		_BXT_PHY((phy), _PORT_REF_DW3_BC)


 #define _PORT_REF_DW6_A 0x162198
 #define _PORT_REF_DW6_BC 0x6C198

drivers/gpu/drm/i915/i915_reg.h +1 -2
@@ -1333,15 +1339,13 @@ enum skl_disp_power_wells {
  #define   GRC_CODE_SLOW_SHIFT		8
  #define   GRC_CODE_SLOW_MASK		(0xFF << GRC_CODE_SLOW_SHIFT)
  #define   GRC_CODE_NOM_MASK		0xFF
-#define BXT_PORT_REF_DW6(phy)		_BXT_PHY((phy), _PORT_REF_DW6_BC,	\
-						      _PORT_REF_DW6_A)
+#define BXT_PORT_REF_DW6(phy)		_BXT_PHY((phy), _PORT_REF_DW6_BC)


 #define _PORT_REF_DW8_A 0x1621A0
 #define _PORT_REF_DW8_BC 0x6C1A0
 #define   GRC_DIS (1 << 15)
 #define   GRC_RDY_OVRD (1 << 1)

drivers/gpu/drm/i915/i915_reg.h +1 -2
-#define BXT_PORT_REF_DW8(phy)		_BXT_PHY((phy), _PORT_REF_DW8_BC,	\
-						      _PORT_REF_DW8_A)
+#define BXT_PORT_REF_DW8(phy)		_BXT_PHY((phy), _PORT_REF_DW8_BC)


 /* BXT PHY PCS registers */
 #define _PORT_PCS_DW10_LN01_A 0x162428

drivers/gpu/drm/i915/i915_reg.h +7 -6
@@ -1350,12 +1354,13 @@ enum skl_disp_power_wells {
  #define _PORT_PCS_DW10_GRP_A		0x162C28
  #define _PORT_PCS_DW10_GRP_B		0x6CC28
  #define _PORT_PCS_DW10_GRP_C		0x6CE28
-#define BXT_PORT_PCS_DW10_LN01(port)	_MMIO_PORT3(port, _PORT_PCS_DW10_LN01_A, \
-						     _PORT_PCS_DW10_LN01_B, \
-						     _PORT_PCS_DW10_LN01_C)
-#define BXT_PORT_PCS_DW10_GRP(port)	_MMIO_PORT3(port, _PORT_PCS_DW10_GRP_A,  \
-						     _PORT_PCS_DW10_GRP_B,  \
-						     _PORT_PCS_DW10_GRP_C)
+#define BXT_PORT_PCS_DW10_LN01(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_PCS_DW10_LN01_B, \
+							 _PORT_PCS_DW10_LN01_C)
+#define BXT_PORT_PCS_DW10_GRP(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_PCS_DW10_GRP_B, \
+							 _PORT_PCS_DW10_GRP_C)
+
  #define   TX2_SWING_CALC_INIT		(1 << 31)
  #define   TX1_SWING_CALC_INIT		(1 << 30)

drivers/gpu/drm/i915/i915_reg.h +9 -9
@@ -1370,15 +1375,15 @@ enum skl_disp_power_wells {
  #define _PORT_PCS_DW12_GRP_C		0x6CE30
  #define   LANESTAGGER_STRAP_OVRD	(1 << 6)
  #define   LANE_STAGGER_MASK		0x1F
-#define BXT_PORT_PCS_DW12_LN01(port)	_MMIO_PORT3(port, _PORT_PCS_DW12_LN01_A, \
-						     _PORT_PCS_DW12_LN01_B, \
-						     _PORT_PCS_DW12_LN01_C)
-#define BXT_PORT_PCS_DW12_LN23(port)	_MMIO_PORT3(port, _PORT_PCS_DW12_LN23_A, \
-						     _PORT_PCS_DW12_LN23_B, \
-						     _PORT_PCS_DW12_LN23_C)
-#define BXT_PORT_PCS_DW12_GRP(port)	_MMIO_PORT3(port, _PORT_PCS_DW12_GRP_A, \
-						     _PORT_PCS_DW12_GRP_B, \
-						     _PORT_PCS_DW12_GRP_C)
+#define BXT_PORT_PCS_DW12_LN01(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_PCS_DW12_LN01_B, \
+							 _PORT_PCS_DW12_LN01_C)
+#define BXT_PORT_PCS_DW12_LN23(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_PCS_DW12_LN23_B, \
+							 _PORT_PCS_DW12_LN23_C)
+#define BXT_PORT_PCS_DW12_GRP(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_PCS_DW12_GRP_B, \
+							 _PORT_PCS_DW12_GRP_C)


 /* BXT PHY TX registers */
 #define _BXT_LANE_OFFSET(lane)           (((lane) >> 1) * 0x200 + \

drivers/gpu/drm/i915/i915_reg.h +12 -12
@@ -1390,12 +1395,12 @@ enum skl_disp_power_wells {
  #define _PORT_TX_DW2_GRP_A		0x162D08
  #define _PORT_TX_DW2_GRP_B		0x6CD08
  #define _PORT_TX_DW2_GRP_C		0x6CF08
-#define BXT_PORT_TX_DW2_GRP(port)	_MMIO_PORT3(port, _PORT_TX_DW2_GRP_A,  \
-						     _PORT_TX_DW2_GRP_B,  \
-						     _PORT_TX_DW2_GRP_C)
-#define BXT_PORT_TX_DW2_LN0(port)	_MMIO_PORT3(port, _PORT_TX_DW2_LN0_A,  \
-						     _PORT_TX_DW2_LN0_B,  \
-						     _PORT_TX_DW2_LN0_C)
+#define BXT_PORT_TX_DW2_LN0(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_TX_DW2_LN0_B, \
+							 _PORT_TX_DW2_LN0_C)
+#define BXT_PORT_TX_DW2_GRP(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_TX_DW2_GRP_B, \
+							 _PORT_TX_DW2_GRP_C)
  #define   MARGIN_000_SHIFT		16
  #define   MARGIN_000			(0xFF << MARGIN_000_SHIFT)
  #define   UNIQ_TRANS_SCALE_SHIFT	8
@@ -1407,12 +1412,12 @@ enum skl_disp_power_wells {
  #define _PORT_TX_DW3_GRP_A		0x162D0C
  #define _PORT_TX_DW3_GRP_B		0x6CD0C
  #define _PORT_TX_DW3_GRP_C		0x6CF0C
-#define BXT_PORT_TX_DW3_GRP(port)	_MMIO_PORT3(port, _PORT_TX_DW3_GRP_A,  \
-						     _PORT_TX_DW3_GRP_B,  \
-						     _PORT_TX_DW3_GRP_C)
-#define BXT_PORT_TX_DW3_LN0(port)	_MMIO_PORT3(port, _PORT_TX_DW3_LN0_A,  \
-						     _PORT_TX_DW3_LN0_B,  \
-						     _PORT_TX_DW3_LN0_C)
+#define BXT_PORT_TX_DW3_LN0(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_TX_DW3_LN0_B, \
+							 _PORT_TX_DW3_LN0_C)
+#define BXT_PORT_TX_DW3_GRP(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_TX_DW3_GRP_B, \
+							 _PORT_TX_DW3_GRP_C)
  #define   SCALE_DCOMP_METHOD		(1 << 26)
  #define   UNIQUE_TRANGE_EN_METHOD	(1 << 27)

drivers/gpu/drm/i915/i915_reg.h +6 -6
@@ -1422,12 +1427,12 @@ enum skl_disp_power_wells {
  #define _PORT_TX_DW4_GRP_A		0x162D10
  #define _PORT_TX_DW4_GRP_B		0x6CD10
  #define _PORT_TX_DW4_GRP_C		0x6CF10
-#define BXT_PORT_TX_DW4_LN0(port)	_MMIO_PORT3(port, _PORT_TX_DW4_LN0_A,  \
-						     _PORT_TX_DW4_LN0_B,  \
-						     _PORT_TX_DW4_LN0_C)
-#define BXT_PORT_TX_DW4_GRP(port)	_MMIO_PORT3(port, _PORT_TX_DW4_GRP_A,  \
-						     _PORT_TX_DW4_GRP_B,  \
-						     _PORT_TX_DW4_GRP_C)
+#define BXT_PORT_TX_DW4_LN0(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_TX_DW4_LN0_B, \
+							 _PORT_TX_DW4_LN0_C)
+#define BXT_PORT_TX_DW4_GRP(phy, ch)	_MMIO_BXT_PHY_CH(phy, ch, \
+							 _PORT_TX_DW4_GRP_B, \
+							 _PORT_TX_DW4_GRP_C)
  #define   DEEMPH_SHIFT			24
  #define   DE_EMPHASIS			(0xFF << DEEMPH_SHIFT)

drivers/gpu/drm/i915/i915_reg.h +4 -4
@@ -1436,10 +1441,10 @@ enum skl_disp_power_wells {
  #define _PORT_TX_DW14_LN0_C		0x6C938
  #define   LATENCY_OPTIM_SHIFT		30
  #define   LATENCY_OPTIM			(1 << LATENCY_OPTIM_SHIFT)
-#define BXT_PORT_TX_DW14_LN(port, lane)	_MMIO(_PORT3((port), _PORT_TX_DW14_LN0_A,   \
-							_PORT_TX_DW14_LN0_B,   \
-							_PORT_TX_DW14_LN0_C) + \
-					 _BXT_LANE_OFFSET(lane))
+#define BXT_PORT_TX_DW14_LN(phy, ch, lane)				\
+	_MMIO(_BXT_PHY_CH(phy, ch, _PORT_TX_DW14_LN0_B,			\
+				   _PORT_TX_DW14_LN0_C) +		\
+	      _BXT_LANE_OFFSET(lane))


 /* UAIMI scratch pad register 1 */
 #define UAIMI_SPR1 _MMIO(0x4F074)

drivers/gpu/drm/i915/intel_dpio_phy.c +0 -0
index 6711e3a..0d2cb6b 100644
@@ -167,26 +167,58 @@ static u32 bxt_phy_port_mask(const struct bxt_ddi_phy_info *phy_info)
  		BIT(phy_info->channel[DPIO_CH0].port);
  }

drivers/gpu/drm/i915/intel_dpio_phy.c +28 -0
+void bxt_port_to_phy_channel(enum port port,
+			     enum dpio_phy *phy, enum dpio_channel *ch)
+{
+	const struct bxt_ddi_phy_info *phy_info;
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(bxt_ddi_phy_info); i++) {
+		phy_info = &bxt_ddi_phy_info[i];
+
+		if (port == phy_info->channel[DPIO_CH0].port) {
+			*phy = i;
+			*ch = DPIO_CH0;
+			return;
+		}
+
+		if (phy_info->dual_channel &&
+		    port == phy_info->channel[DPIO_CH1].port) {
+			*phy = i;
+			*ch = DPIO_CH1;
+			return;
+		}
+	}
+
+	WARN(1, "PHY not found for PORT %c", port_name(port));
+	*phy = DPIO_PHY0;
+	*ch = DPIO_CH0;
+}
+

 void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv, enum port port, u32 margin, u32 scale, u32 enable, u32 deemphasis) {
  u32 val;

drivers/gpu/drm/i915/intel_dpio_phy.c

Quoted 1 line
drivers/gpu/drm/i915/intel_dpio_phy.c +1 -0
+	u32 phy;

This and similar places should be enum dpio_phy according to the above change.

Quoted 62 lines
drivers/gpu/drm/i915/intel_dpio_phy.c +3 -0
+	enum dpio_channel ch;
+
+	bxt_port_to_phy_channel(port, &phy, &ch);


  /*
   * While we write to the group register to program all lanes at once we
   * can read only lane registers and we pick lanes 0/1 for that. */

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-	val = I915_READ(BXT_PORT_PCS_DW10_LN01(port));
+	val = I915_READ(BXT_PORT_PCS_DW10_LN01(phy, ch));

  val &= ~(TX2_SWING_CALC_INIT | TX1_SWING_CALC_INIT);

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-	I915_WRITE(BXT_PORT_PCS_DW10_GRP(port), val);
+	I915_WRITE(BXT_PORT_PCS_DW10_GRP(phy, ch), val);

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-	val = I915_READ(BXT_PORT_TX_DW2_LN0(port));
+	val = I915_READ(BXT_PORT_TX_DW2_LN0(phy, ch));

  val &= ~(MARGIN_000 | UNIQ_TRANS_SCALE);
  val |= margin << MARGIN_000_SHIFT | scale << UNIQ_TRANS_SCALE_SHIFT;

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-	I915_WRITE(BXT_PORT_TX_DW2_GRP(port), val);
+	I915_WRITE(BXT_PORT_TX_DW2_GRP(phy, ch), val);

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-	val = I915_READ(BXT_PORT_TX_DW3_LN0(port));
+	val = I915_READ(BXT_PORT_TX_DW3_LN0(phy, ch));

  val &= ~SCALE_DCOMP_METHOD;
  if (enable)
  val |= SCALE_DCOMP_METHOD;

drivers/gpu/drm/i915/intel_dpio_phy.c +0 -0
@@ -194,16 +226,16 @@ void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
  	if ((val & UNIQUE_TRANGE_EN_METHOD) && !(val & SCALE_DCOMP_METHOD))
  		DRM_ERROR("Disabled scaling while ouniqetrangenmethod was set");

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-	I915_WRITE(BXT_PORT_TX_DW3_GRP(port), val);
+	I915_WRITE(BXT_PORT_TX_DW3_GRP(phy, ch), val);

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-	val = I915_READ(BXT_PORT_TX_DW4_LN0(port));
+	val = I915_READ(BXT_PORT_TX_DW4_LN0(phy, ch));

  val &= ~DE_EMPHASIS;
  val |= deemphasis << DEEMPH_SHIFT;

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-	I915_WRITE(BXT_PORT_TX_DW4_GRP(port), val);
+	I915_WRITE(BXT_PORT_TX_DW4_GRP(phy, ch), val);

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-	val = I915_READ(BXT_PORT_PCS_DW10_LN01(port));
+	val = I915_READ(BXT_PORT_PCS_DW10_LN01(phy, ch));

  val |= TX2_SWING_CALC_INIT | TX1_SWING_CALC_INIT;

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-	I915_WRITE(BXT_PORT_PCS_DW10_GRP(port), val);
+	I915_WRITE(BXT_PORT_PCS_DW10_GRP(phy, ch), val);

 }

 bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,

drivers/gpu/drm/i915/intel_dpio_phy.c +0 -0
@@ -256,7 +288,11 @@ bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,


 static u32 bxt_get_grc(struct drm_i915_private *dev_priv, enum dpio_phy phy) {

drivers/gpu/drm/i915/intel_dpio_phy.c +5 -1
-	u32 val = I915_READ(BXT_PORT_REF_DW6(phy));
+	const struct bxt_ddi_phy_info *phy_info;
+	u32 val;
+
+	phy_info = &bxt_ddi_phy_info[phy];
+	val = I915_READ(BXT_PORT_REF_DW6(phy));


  return (val & GRC_CODE_MASK) >> GRC_CODE_SHIFT; }

drivers/gpu/drm/i915/intel_dpio_phy.c static u32 bxt_get_grc(struct drm_i915_private *dev_priv, enum dpio_phy phy) · line 306

Quoted 7 lines
drivers/gpu/drm/i915/intel_dpio_phy.c +4 -0
@@ -264,6 +300,10 @@ static u32 bxt_get_grc(struct drm_i915_private *dev_priv, enum dpio_phy phy)
  static void bxt_phy_wait_grc_done(struct drm_i915_private *dev_priv,
  				  enum dpio_phy phy)
  {
+	const struct bxt_ddi_phy_info *phy_info;
+
+	phy_info = &bxt_ddi_phy_info[phy];
+

This isn't used.

drivers/gpu/drm/i915/intel_dpio_phy.c bool bxt_ddi_phy_verify_state(struct drm_i915_private *dev_priv, · line 533

Quoted 11 lines
drivers/gpu/drm/i915/intel_dpio_phy.c +0 -0
  	if (intel_wait_for_register(dev_priv,
  				    BXT_PORT_REF_DW3(phy),
  				    GRC_DONE, GRC_DONE,
@@ -489,8 +529,8 @@ bool bxt_ddi_phy_verify_state(struct drm_i915_private *dev_priv,
  			   grc_code;

  mask = GRC_CODE_FAST_MASK | GRC_CODE_SLOW_MASK | GRC_CODE_NOM_MASK;

drivers/gpu/drm/i915/intel_dpio_phy.c +2 -2
-		ok &= _CHK(BXT_PORT_REF_DW6(phy), mask, grc_code,
-			    "BXT_PORT_REF_DW6(%d)", phy);
+		ok &= _CHK(BXT_PORT_REF_DW6(phy), mask,
+			   grc_code, "BXT_PORT_REF_DW6(%d)", phy);

Redundant w/s change.

With the above fixed this is:

Quoted 242 lines


  mask = GRC_DIS | GRC_RDY_OVRD;
  ok &= _CHK(BXT_PORT_REF_DW8(phy), mask, mask,

drivers/gpu/drm/i915/intel_dpio_phy.c +2 -0
@@ -525,10 +565,14 @@ void bxt_ddi_phy_set_lane_optim_mask(struct intel_encoder *encoder,
  	struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
  	struct drm_i915_private *dev_priv = to_i915(dport->base.base.dev);
  	enum port port = dport->port;
+	u32 phy;
+	enum dpio_channel ch;
  	int lane;

drivers/gpu/drm/i915/intel_dpio_phy.c +2 -0
+	bxt_port_to_phy_channel(port, &phy, &ch);
+

  for (lane = 0; lane < 4; lane++) {

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-		u32 val = I915_READ(BXT_PORT_TX_DW14_LN(port, lane));
+		u32 val = I915_READ(BXT_PORT_TX_DW14_LN(phy, ch, lane));


  /*
   * Note that on CHV this flag is called UPAR, but has

drivers/gpu/drm/i915/intel_dpio_phy.c +0 -0
@@ -538,7 +582,7 @@ void bxt_ddi_phy_set_lane_optim_mask(struct intel_encoder *encoder,
  		if (lane_lat_optim_mask & BIT(lane))
  			val |= LATENCY_OPTIM;

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-		I915_WRITE(BXT_PORT_TX_DW14_LN(port, lane), val);
+		I915_WRITE(BXT_PORT_TX_DW14_LN(phy, ch, lane), val);

  }
 }

drivers/gpu/drm/i915/intel_dpio_phy.c +2 -0
@@ -548,12 +592,16 @@ bxt_ddi_phy_get_lane_lat_optim_mask(struct intel_encoder *encoder)
  	struct intel_digital_port *dport = enc_to_dig_port(&encoder->base);
  	struct drm_i915_private *dev_priv = to_i915(dport->base.base.dev);
  	enum port port = dport->port;
+	u32 phy;
+	enum dpio_channel ch;
  	int lane;
  	uint8_t mask;

drivers/gpu/drm/i915/intel_dpio_phy.c +2 -0
+	bxt_port_to_phy_channel(port, &phy, &ch);
+

  mask = 0;
  for (lane = 0; lane < 4; lane++) {

drivers/gpu/drm/i915/intel_dpio_phy.c +1 -1
-		u32 val = I915_READ(BXT_PORT_TX_DW14_LN(port, lane));
+		u32 val = I915_READ(BXT_PORT_TX_DW14_LN(phy, ch, lane));


  if (val & LATENCY_OPTIM)
  mask |= BIT(lane);

drivers/gpu/drm/i915/intel_dpll_mgr.c +0 -0
index 1c59ca5..a4a9f05 100644
@@ -1371,6 +1371,10 @@ 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 +4 -0
+	u32 phy;
+	enum dpio_channel ch;
+
+	bxt_port_to_phy_channel(port, &phy, &ch);


  /* Non-SSC reference */
  temp = I915_READ(BXT_PORT_PLL_ENABLE(port));

drivers/gpu/drm/i915/intel_dpll_mgr.c +0 -0
@@ -1378,72 +1382,72 @@ static void bxt_ddi_pll_enable(struct drm_i915_private *dev_priv,
  	I915_WRITE(BXT_PORT_PLL_ENABLE(port), temp);


  /* Disable 10 bit clock */

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	temp = I915_READ(BXT_PORT_PLL_EBB_4(port));
+	temp = I915_READ(BXT_PORT_PLL_EBB_4(phy, ch));

  temp &= ~PORT_PLL_10BIT_CLK_ENABLE;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL_EBB_4(port), temp);
+	I915_WRITE(BXT_PORT_PLL_EBB_4(phy, ch), temp);


  /* Write P1 & P2 */

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	temp = I915_READ(BXT_PORT_PLL_EBB_0(port));
+	temp = I915_READ(BXT_PORT_PLL_EBB_0(phy, ch));

  temp &= ~(PORT_PLL_P1_MASK | PORT_PLL_P2_MASK); temp |= pll->config.hw_state.ebb0;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL_EBB_0(port), temp);
+	I915_WRITE(BXT_PORT_PLL_EBB_0(phy, ch), temp);


  /* Write M2 integer */

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	temp = I915_READ(BXT_PORT_PLL(port, 0));
+	temp = I915_READ(BXT_PORT_PLL(phy, ch, 0));

  temp &= ~PORT_PLL_M2_MASK;
  temp |= pll->config.hw_state.pll0;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL(port, 0), temp);
+	I915_WRITE(BXT_PORT_PLL(phy, ch, 0), temp);


  /* Write N */

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	temp = I915_READ(BXT_PORT_PLL(port, 1));
+	temp = I915_READ(BXT_PORT_PLL(phy, ch, 1));

  temp &= ~PORT_PLL_N_MASK;
  temp |= pll->config.hw_state.pll1;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL(port, 1), temp);
+	I915_WRITE(BXT_PORT_PLL(phy, ch, 1), temp);


  /* Write M2 fraction */

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	temp = I915_READ(BXT_PORT_PLL(port, 2));
+	temp = I915_READ(BXT_PORT_PLL(phy, ch, 2));

  temp &= ~PORT_PLL_M2_FRAC_MASK;
  temp |= pll->config.hw_state.pll2;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL(port, 2), temp);
+	I915_WRITE(BXT_PORT_PLL(phy, ch, 2), temp);


  /* Write M2 fraction enable */

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	temp = I915_READ(BXT_PORT_PLL(port, 3));
+	temp = I915_READ(BXT_PORT_PLL(phy, ch, 3));

  temp &= ~PORT_PLL_M2_FRAC_ENABLE;
  temp |= pll->config.hw_state.pll3;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL(port, 3), temp);
+	I915_WRITE(BXT_PORT_PLL(phy, ch, 3), temp);


  /* Write coeff */

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	temp = I915_READ(BXT_PORT_PLL(port, 6));
+	temp = I915_READ(BXT_PORT_PLL(phy, ch, 6));

  temp &= ~PORT_PLL_PROP_COEFF_MASK;
  temp &= ~PORT_PLL_INT_COEFF_MASK;
  temp &= ~PORT_PLL_GAIN_CTL_MASK;
  temp |= pll->config.hw_state.pll6;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL(port, 6), temp);
+	I915_WRITE(BXT_PORT_PLL(phy, ch, 6), temp);


  /* Write calibration val */

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	temp = I915_READ(BXT_PORT_PLL(port, 8));
+	temp = I915_READ(BXT_PORT_PLL(phy, ch, 8));

  temp &= ~PORT_PLL_TARGET_CNT_MASK;
  temp |= pll->config.hw_state.pll8;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL(port, 8), temp);
+	I915_WRITE(BXT_PORT_PLL(phy, ch, 8), temp);

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	temp = I915_READ(BXT_PORT_PLL(port, 9));
+	temp = I915_READ(BXT_PORT_PLL(phy, ch, 9));

  temp &= ~PORT_PLL_LOCK_THRESHOLD_MASK;
  temp |= pll->config.hw_state.pll9;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL(port, 9), temp);
+	I915_WRITE(BXT_PORT_PLL(phy, ch, 9), temp);

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	temp = I915_READ(BXT_PORT_PLL(port, 10));
+	temp = I915_READ(BXT_PORT_PLL(phy, ch, 10));

  temp &= ~PORT_PLL_DCO_AMP_OVR_EN_H;
  temp &= ~PORT_PLL_DCO_AMP_MASK;
  temp |= pll->config.hw_state.pll10;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL(port, 10), temp);
+	I915_WRITE(BXT_PORT_PLL(phy, ch, 10), temp);


  /* Recalibrate with new settings */

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	temp = I915_READ(BXT_PORT_PLL_EBB_4(port));
+	temp = I915_READ(BXT_PORT_PLL_EBB_4(phy, ch));

  temp |= PORT_PLL_RECALIBRATE;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL_EBB_4(port), temp);
+	I915_WRITE(BXT_PORT_PLL_EBB_4(phy, ch), temp);

  temp &= ~PORT_PLL_10BIT_CLK_ENABLE;
  temp |= pll->config.hw_state.ebb4;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	I915_WRITE(BXT_PORT_PLL_EBB_4(port), temp);
+	I915_WRITE(BXT_PORT_PLL_EBB_4(phy, ch), temp);


  /* Enable PLL */
  temp = I915_READ(BXT_PORT_PLL_ENABLE(port));

drivers/gpu/drm/i915/intel_dpll_mgr.c +2 -2
@@ -1459,11 +1463,11 @@ static void bxt_ddi_pll_enable(struct drm_i915_private *dev_priv,
  	 * While we write to the group register to program all lanes at once we
  	 * can read only lane registers and we pick lanes 0/1 for that.
  	 */
-	temp = I915_READ(BXT_PORT_PCS_DW12_LN01(port));
+	temp = I915_READ(BXT_PORT_PCS_DW12_LN01(phy, ch));
  	temp &= ~LANE_STAGGER_MASK;
  	temp &= ~LANESTAGGER_STRAP_OVRD;
  	temp |= pll->config.hw_state.pcsdw12;
-	I915_WRITE(BXT_PORT_PCS_DW12_GRP(port), temp);
+	I915_WRITE(BXT_PORT_PCS_DW12_GRP(phy, ch), temp);
  }


 static void bxt_ddi_pll_disable(struct drm_i915_private *dev_priv,

drivers/gpu/drm/i915/intel_dpll_mgr.c +0 -0
@@ -1485,6 +1489,10 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *dev_priv,

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

drivers/gpu/drm/i915/intel_dpll_mgr.c +4 -0
+	u32 phy;
+	enum dpio_channel ch;
+
+	bxt_port_to_phy_channel(port, &phy, &ch);


  if (!intel_display_power_get_if_enabled(dev_priv, POWER_DOMAIN_PLLS)) return false;

drivers/gpu/drm/i915/intel_dpll_mgr.c +0 -0
@@ -1495,36 +1503,36 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *dev_priv,
  	if (!(val & PORT_PLL_ENABLE))
  		goto out;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	hw_state->ebb0 = I915_READ(BXT_PORT_PLL_EBB_0(port));
+	hw_state->ebb0 = I915_READ(BXT_PORT_PLL_EBB_0(phy, ch));

  hw_state->ebb0 &= PORT_PLL_P1_MASK | PORT_PLL_P2_MASK;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	hw_state->ebb4 = I915_READ(BXT_PORT_PLL_EBB_4(port));
+	hw_state->ebb4 = I915_READ(BXT_PORT_PLL_EBB_4(phy, ch));

  hw_state->ebb4 &= PORT_PLL_10BIT_CLK_ENABLE;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	hw_state->pll0 = I915_READ(BXT_PORT_PLL(port, 0));
+	hw_state->pll0 = I915_READ(BXT_PORT_PLL(phy, ch, 0));

  hw_state->pll0 &= PORT_PLL_M2_MASK;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	hw_state->pll1 = I915_READ(BXT_PORT_PLL(port, 1));
+	hw_state->pll1 = I915_READ(BXT_PORT_PLL(phy, ch, 1));

  hw_state->pll1 &= PORT_PLL_N_MASK;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	hw_state->pll2 = I915_READ(BXT_PORT_PLL(port, 2));
+	hw_state->pll2 = I915_READ(BXT_PORT_PLL(phy, ch, 2));

  hw_state->pll2 &= PORT_PLL_M2_FRAC_MASK;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	hw_state->pll3 = I915_READ(BXT_PORT_PLL(port, 3));
+	hw_state->pll3 = I915_READ(BXT_PORT_PLL(phy, ch, 3));

  hw_state->pll3 &= PORT_PLL_M2_FRAC_ENABLE;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	hw_state->pll6 = I915_READ(BXT_PORT_PLL(port, 6));
+	hw_state->pll6 = I915_READ(BXT_PORT_PLL(phy, ch, 6));

  hw_state->pll6 &= PORT_PLL_PROP_COEFF_MASK | PORT_PLL_INT_COEFF_MASK | PORT_PLL_GAIN_CTL_MASK;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	hw_state->pll8 = I915_READ(BXT_PORT_PLL(port, 8));
+	hw_state->pll8 = I915_READ(BXT_PORT_PLL(phy, ch, 8));

  hw_state->pll8 &= PORT_PLL_TARGET_CNT_MASK;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	hw_state->pll9 = I915_READ(BXT_PORT_PLL(port, 9));
+	hw_state->pll9 = I915_READ(BXT_PORT_PLL(phy, ch, 9));

  hw_state->pll9 &= PORT_PLL_LOCK_THRESHOLD_MASK;

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
-	hw_state->pll10 = I915_READ(BXT_PORT_PLL(port, 10));
+	hw_state->pll10 = I915_READ(BXT_PORT_PLL(phy, ch, 10));

  hw_state->pll10 &= PORT_PLL_DCO_AMP_OVR_EN_H | PORT_PLL_DCO_AMP_MASK;

drivers/gpu/drm/i915/intel_dpll_mgr.c +3 -3
@@ -1533,11 +1541,11 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *dev_priv,
  	 * can read only lane registers. We configure all lanes the same way, so
  	 * here just read out lanes 0/1 and output a note if lanes 2/3 differ.
  	 */
-	hw_state->pcsdw12 = I915_READ(BXT_PORT_PCS_DW12_LN01(port));
-	if (I915_READ(BXT_PORT_PCS_DW12_LN23(port)) != hw_state->pcsdw12)
+	hw_state->pcsdw12 = I915_READ(BXT_PORT_PCS_DW12_LN01(phy, ch));
+	if (I915_READ(BXT_PORT_PCS_DW12_LN23(phy, ch)) != hw_state->pcsdw12)
  		DRM_DEBUG_DRIVER("lane stagger config different for lane 01 (%08x) and 23 (%08x)\n",
  				 hw_state->pcsdw12,
-				 I915_READ(BXT_PORT_PCS_DW12_LN23(port)));
+				 I915_READ(BXT_PORT_PCS_DW12_LN23(phy, ch)));
  	hw_state->pcsdw12 &= LANE_STAGGER_MASK | LANESTAGGER_STRAP_OVRD;
Quoted 2 lines


  ret = true;

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

#12 lore raw

PATCH v4 9/9 drm/i915: Address broxton phy registers based on phy and channel number

The port registers related to the phys in broxton map to different channels and specific phys. Make that mapping explicit.

v2: Pass enum dpio_phy to macros instead of mmio base. (Imre)

v3: Fix typo in macros. (Imre)

v4: Also change variables from u32 to enum dpio_phy. (Imre)
Remove leftovers from previous version. (Imre)

---
 drivers/gpu/drm/i915/i915_drv.h       |   2 +
 drivers/gpu/drm/i915/i915_reg.h       | 141 ++++++++++++++++++----------------
 drivers/gpu/drm/i915/intel_dpio_phy.c |  80 +++++++++++++++----
 drivers/gpu/drm/i915/intel_dpll_mgr.c |  84 +++++++++++---------
 4 files changed, 185 insertions(+), 122 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
index 3120ef5..a3323b7d 100644
@@ -3746,6 +3746,8 @@ u32 vlv_flisdsi_read(struct drm_i915_private *dev_priv, u32 reg);
 void vlv_flisdsi_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);
 
 /* intel_dpio_phy.c */
+void bxt_port_to_phy_channel(enum port port,
+			     enum dpio_phy *phy, enum dpio_channel *ch);
 void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
 				  enum port port, u32 margin, u32 scale,
 				  u32 enable, u32 deemphasis);
drivers/gpu/drm/i915/i915_reg.h +73 -68

256 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpio_phy.c +64 -16

156 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpll_mgr.c +46 -38

188 lines not on this page · raw message

Signature · 6 lines
2.5.5

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

PATCH v5 9/9 drm/i915: Address broxton phy registers based on phy and channel number

In reply to Imre Deak

The port registers related to the phys in broxton map to different channels and specific phys. Make that mapping explicit.

v2: Pass enum dpio_phy to macros instead of mmio base. (Imre)

v3: Fix typo in macros. (Imre)

v4: Also change variables from u32 to enum dpio_phy. (Imre)
Remove leftovers from previous version. (Imre)

v5: Actually git add the changes.

---
 drivers/gpu/drm/i915/i915_drv.h       |   2 +
 drivers/gpu/drm/i915/i915_reg.h       | 141 ++++++++++++++++++----------------
 drivers/gpu/drm/i915/intel_dpio_phy.c |  68 ++++++++++++----
 drivers/gpu/drm/i915/intel_dpll_mgr.c |  84 +++++++++++---------
 4 files changed, 175 insertions(+), 120 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
index 3120ef5..a3323b7d 100644
@@ -3746,6 +3746,8 @@ u32 vlv_flisdsi_read(struct drm_i915_private *dev_priv, u32 reg);
 void vlv_flisdsi_write(struct drm_i915_private *dev_priv, u32 reg, u32 val);
 
 /* intel_dpio_phy.c */
+void bxt_port_to_phy_channel(enum port port,
+			     enum dpio_phy *phy, enum dpio_channel *ch);
 void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,
 				  enum port port, u32 margin, u32 scale,
 				  u32 enable, u32 deemphasis);
drivers/gpu/drm/i915/i915_reg.h +73 -68

256 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpio_phy.c +54 -14

132 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpll_mgr.c +46 -38

188 lines not on this page · raw message

Signature · 6 lines
2.5.5

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

✗ Fi.CI.BAT: warning for Broxton ddi phy refactoring (rev2)

In reply to Ander Conselvan de Oliveira
== Series Details ==

== Series Details ==

Series: Broxton ddi phy refactoring (rev2)
URL : https://patchwork.freedesktop.org/series/13320/
State : warning

== Summary ==

Series 13320v2 Broxton ddi phy refactoring
https://patchwork.freedesktop.org/api/1.0/series/13320/revisions/2/mbox/

Test kms_pipe_crc_basic:

        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-byt-j1900)
Test kms_psr_sink_crc:
        Subgroup psr_basic:
                pass       -> DMESG-WARN (fi-skl-6700hq)
fi-bdw-5557u     total:248  pass:231  dwarn:0   dfail:0   fail:0   skip:17 
fi-bsw-n3050     total:248  pass:204  dwarn:0   dfail:0   fail:0   skip:44 
fi-bxt-t5700     total:248  pass:217  dwarn:0   dfail:0   fail:0   skip:31 
fi-byt-j1900     total:248  pass:214  dwarn:1   dfail:0   fail:1   skip:32 
fi-byt-n2820     total:248  pass:211  dwarn:0   dfail:0   fail:1   skip:36 
fi-hsw-4770      total:248  pass:224  dwarn:0   dfail:0   fail:0   skip:24 
fi-hsw-4770r     total:248  pass:224  dwarn:0   dfail:0   fail:0   skip:24 
fi-ilk-650       total:248  pass:184  dwarn:0   dfail:0   fail:2   skip:62 
fi-ivb-3520m     total:248  pass:221  dwarn:0   dfail:0   fail:0   skip:27 
fi-ivb-3770      total:248  pass:207  dwarn:0   dfail:0   fail:0   skip:41 
fi-kbl-7200u     total:248  pass:222  dwarn:0   dfail:0   fail:0   skip:26 
fi-skl-6260u     total:248  pass:232  dwarn:0   dfail:0   fail:0   skip:16 
fi-skl-6700hq    total:248  pass:223  dwarn:1   dfail:0   fail:0   skip:24 
fi-skl-6700k     total:248  pass:222  dwarn:1   dfail:0   fail:0   skip:25 
fi-skl-6770hq    total:248  pass:230  dwarn:1   dfail:0   fail:1   skip:16 
fi-snb-2520m     total:248  pass:211  dwarn:0   dfail:0   fail:0   skip:37 
fi-snb-2600      total:248  pass:209  dwarn:0   dfail:0   fail:0   skip:39 

Results at /archive/results/CI_IGT_test/Patchwork_2641/

2dff18acaa95a26b882a5f9910d7ded514f18415 drm-intel-nightly: 2016y-10m-05d-13h-58m-08s UTC integration manifest 52a2236 drm/i915: Address broxton phy registers based on phy and channel number
6631150 drm/i915: Add location of the Rcomp resistor to bxt_ddi_phy_info
655bd41 drm/i915: Create a struct to hold information about the broxton phys
3196d4a drm/i915: Move broxton vswing sequence to intel_dpio_phy.c
1d1fb65 drm/i915: Move DPIO phy documentation section to intel_dpio_phy.c
70949cd drm/i915: Move broxton phy code to intel_dpio_phy.c
ca0aaeb drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask()
45aa2bc drm/i915: Explicitly map broxton DPIO power wells to phys
3b2c9f5 drm/i915: Rename struct i915_power_well field data to id

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

#15 lore raw

✗ Fi.CI.BAT: warning for Broxton ddi phy refactoring (rev3)

In reply to Ander Conselvan de Oliveira
== Series Details ==

== Series Details ==

Series: Broxton ddi phy refactoring (rev3)
URL : https://patchwork.freedesktop.org/series/13320/
State : warning

== Summary ==

Series 13320v3 Broxton ddi phy refactoring
https://patchwork.freedesktop.org/api/1.0/series/13320/revisions/3/mbox/

Test kms_pipe_crc_basic:

        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-byt-j1900)
Test vgem_basic:
        Subgroup unload:
                skip       -> PASS       (fi-skl-6700k)
                pass       -> SKIP       (fi-bsw-n3050)
                pass       -> SKIP       (fi-skl-6770hq)
                skip       -> PASS       (fi-ilk-650)
                skip       -> PASS       (fi-hsw-4770)
fi-bdw-5557u     total:248  pass:231  dwarn:0   dfail:0   fail:0   skip:17 
fi-bsw-n3050     total:248  pass:204  dwarn:0   dfail:0   fail:0   skip:44 
fi-bxt-t5700     total:248  pass:217  dwarn:0   dfail:0   fail:0   skip:31 
fi-byt-j1900     total:248  pass:215  dwarn:0   dfail:0   fail:1   skip:32 
fi-byt-n2820     total:248  pass:210  dwarn:0   dfail:0   fail:1   skip:37 
fi-hsw-4770      total:248  pass:225  dwarn:0   dfail:0   fail:0   skip:23 
fi-hsw-4770r     total:248  pass:224  dwarn:0   dfail:0   fail:0   skip:24 
fi-ilk-650       total:248  pass:185  dwarn:0   dfail:0   fail:2   skip:61 
fi-ivb-3520m     total:248  pass:221  dwarn:0   dfail:0   fail:0   skip:27 
fi-ivb-3770      total:248  pass:207  dwarn:0   dfail:0   fail:0   skip:41 
fi-kbl-7200u     total:248  pass:222  dwarn:0   dfail:0   fail:0   skip:26 
fi-skl-6260u     total:248  pass:232  dwarn:0   dfail:0   fail:0   skip:16 
fi-skl-6700hq    total:248  pass:224  dwarn:0   dfail:0   fail:0   skip:24 
fi-skl-6700k     total:248  pass:222  dwarn:1   dfail:0   fail:0   skip:25 
fi-skl-6770hq    total:248  pass:230  dwarn:1   dfail:0   fail:1   skip:16 
fi-snb-2520m     total:248  pass:211  dwarn:0   dfail:0   fail:0   skip:37 
fi-snb-2600      total:248  pass:209  dwarn:0   dfail:0   fail:0   skip:39 

Results at /archive/results/CI_IGT_test/Patchwork_2645/

dcdd1fd23b37325fa6087ecc3309b66a9049ce95 drm-intel-nightly: 2016y-10m-06d-18h-31m-14s UTC integration manifest a8b60e9 drm/i915: Address broxton phy registers based on phy and channel number
93bb172 drm/i915: Add location of the Rcomp resistor to bxt_ddi_phy_info
7edb786 drm/i915: Create a struct to hold information about the broxton phys
ef575d3 drm/i915: Move broxton vswing sequence to intel_dpio_phy.c
b3c1522 drm/i915: Move DPIO phy documentation section to intel_dpio_phy.c
1a5d476 drm/i915: Move broxton phy code to intel_dpio_phy.c
2962656 drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask()
f9132be drm/i915: Explicitly map broxton DPIO power wells to phys
e620770 drm/i915: Rename struct i915_power_well field data to id

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

#16 lore raw

✗ Fi.CI.BAT: warning for Broxton ddi phy refactoring (rev3)

In reply to Ander Conselvan de Oliveira
== Series Details ==

== Series Details ==

Series: Broxton ddi phy refactoring (rev3)
URL : https://patchwork.freedesktop.org/series/13320/
State : warning

== Summary ==

Series 13320v3 Broxton ddi phy refactoring
https://patchwork.freedesktop.org/api/1.0/series/13320/revisions/3/mbox/

Test kms_pipe_crc_basic:

        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-byt-j1900)
Test vgem_basic:
        Subgroup unload:
                pass       -> SKIP       (fi-skl-6770hq)
                skip       -> PASS       (fi-hsw-4770)
                pass       -> SKIP       (fi-bsw-n3050)
                skip       -> PASS       (fi-skl-6700k)
                skip       -> PASS       (fi-ilk-650)
fi-bdw-5557u     total:248  pass:231  dwarn:0   dfail:0   fail:0   skip:17 
fi-bsw-n3050     total:248  pass:204  dwarn:0   dfail:0   fail:0   skip:44 
fi-bxt-t5700     total:248  pass:217  dwarn:0   dfail:0   fail:0   skip:31 
fi-byt-j1900     total:248  pass:215  dwarn:0   dfail:0   fail:1   skip:32 
fi-byt-n2820     total:248  pass:210  dwarn:0   dfail:0   fail:1   skip:37 
fi-hsw-4770      total:248  pass:225  dwarn:0   dfail:0   fail:0   skip:23 
fi-hsw-4770r     total:248  pass:224  dwarn:0   dfail:0   fail:0   skip:24 
fi-ilk-650       total:248  pass:185  dwarn:0   dfail:0   fail:2   skip:61 
fi-ivb-3520m     total:248  pass:221  dwarn:0   dfail:0   fail:0   skip:27 
fi-ivb-3770      total:248  pass:207  dwarn:0   dfail:0   fail:0   skip:41 
fi-kbl-7200u     total:248  pass:222  dwarn:0   dfail:0   fail:0   skip:26 
fi-skl-6260u     total:248  pass:232  dwarn:0   dfail:0   fail:0   skip:16 
fi-skl-6700hq    total:248  pass:224  dwarn:0   dfail:0   fail:0   skip:24 
fi-skl-6700k     total:248  pass:222  dwarn:1   dfail:0   fail:0   skip:25 
fi-skl-6770hq    total:248  pass:230  dwarn:1   dfail:0   fail:1   skip:16 
fi-snb-2520m     total:248  pass:211  dwarn:0   dfail:0   fail:0   skip:37 
fi-snb-2600      total:248  pass:209  dwarn:0   dfail:0   fail:0   skip:39 

Results at /archive/results/CI_IGT_test/Patchwork_2645/

dcdd1fd23b37325fa6087ecc3309b66a9049ce95 drm-intel-nightly: 2016y-10m-06d-18h-31m-14s UTC integration manifest a8b60e9 drm/i915: Address broxton phy registers based on phy and channel number
93bb172 drm/i915: Add location of the Rcomp resistor to bxt_ddi_phy_info
7edb786 drm/i915: Create a struct to hold information about the broxton phys
ef575d3 drm/i915: Move broxton vswing sequence to intel_dpio_phy.c
b3c1522 drm/i915: Move DPIO phy documentation section to intel_dpio_phy.c
1a5d476 drm/i915: Move broxton phy code to intel_dpio_phy.c
2962656 drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask()
f9132be drm/i915: Explicitly map broxton DPIO power wells to phys
e620770 drm/i915: Rename struct i915_power_well field data to id

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

#17 lore raw

✗ Fi.CI.BAT: failure for Broxton ddi phy refactoring (rev5)

In reply to Ander Conselvan de Oliveira
== Series Details ==

== Series Details ==

Series: Broxton ddi phy refactoring (rev5)
URL : https://patchwork.freedesktop.org/series/13320/
State : failure

== Summary ==

Series 13320v5 Broxton ddi phy refactoring
https://patchwork.freedesktop.org/api/1.0/series/13320/revisions/5/mbox/

Test gem_exec_suspend:

        Subgroup basic-s3:
                dmesg-warn -> INCOMPLETE (fi-byt-j1900)
                pass       -> INCOMPLETE (fi-skl-6700k)
Test kms_force_connector_basic:
        Subgroup force-load-detect:
                incomplete -> PASS       (fi-ivb-3520m)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:
                incomplete -> PASS       (fi-skl-6770hq)
                pass       -> INCOMPLETE (fi-skl-6260u)
fi-bdw-5557u     total:246  pass:231  dwarn:0   dfail:0   fail:0   skip:15 
fi-bxt-t5700     total:246  pass:216  dwarn:0   dfail:0   fail:0   skip:30 
fi-byt-j1900     total:76   pass:62   dwarn:0   dfail:0   fail:1   skip:12 
fi-byt-n2820     total:246  pass:209  dwarn:1   dfail:0   fail:1   skip:35 
fi-hsw-4770      total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 
fi-hsw-4770r     total:246  pass:223  dwarn:1   dfail:0   fail:0   skip:22 
fi-ilk-650       total:246  pass:181  dwarn:0   dfail:0   fail:5   skip:60 
fi-ivb-3520m     total:209  pass:187  dwarn:0   dfail:0   fail:0   skip:21 
fi-ivb-3770      total:246  pass:221  dwarn:0   dfail:0   fail:0   skip:25 
fi-kbl-7200u     total:246  pass:222  dwarn:0   dfail:0   fail:0   skip:24 
fi-skl-6260u     total:210  pass:197  dwarn:0   dfail:0   fail:0   skip:12 
fi-skl-6700hq    total:246  pass:222  dwarn:1   dfail:0   fail:0   skip:23 
fi-skl-6700k     total:76   pass:63   dwarn:1   dfail:0   fail:0   skip:11 
fi-skl-6770hq    total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
fi-snb-2520m     total:246  pass:210  dwarn:0   dfail:0   fail:0   skip:36 
fi-snb-2600      total:209  pass:176  dwarn:0   dfail:0   fail:0   skip:32 

Results at /archive/results/CI_IGT_test/Patchwork_2751/

8bbf308ef2835c2b631f339d9d9d26e817934c84 drm-intel-nightly: 2016y-10m-19d-07h-44m-01s UTC integration manifest 55d4673 drm/i915: Address broxton phy registers based on phy and channel number
670ea1c drm/i915: Add location of the Rcomp resistor to bxt_ddi_phy_info
01223bc drm/i915: Create a struct to hold information about the broxton phys
3df3b63 drm/i915: Move broxton vswing sequence to intel_dpio_phy.c
854a16b drm/i915: Move DPIO phy documentation section to intel_dpio_phy.c
0d03fb0 drm/i915: Move broxton phy code to intel_dpio_phy.c
d9b67ff drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask()
a5caa66 drm/i915: Explicitly map broxton DPIO power wells to phys
0b7fb69 drm/i915: Rename struct i915_power_well field data to id

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

#18 lore raw

✗ Fi.CI.BAT: failure for Broxton ddi phy refactoring (rev5)

In reply to Ander Conselvan de Oliveira
== Series Details ==

== Series Details ==

Series: Broxton ddi phy refactoring (rev5)
URL : https://patchwork.freedesktop.org/series/13320/
State : failure

== Summary ==

Series 13320v5 Broxton ddi phy refactoring
https://patchwork.freedesktop.org/api/1.0/series/13320/revisions/5/mbox/

Test drv_module_reload_basic:

                pass       -> DMESG-WARN (fi-skl-6700hq)
Test gem_exec_suspend:
        Subgroup basic-s3:
                dmesg-warn -> PASS       (fi-skl-6700hq)
Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-legacy:
                pass       -> DMESG-WARN (fi-ilk-650)
Test kms_force_connector_basic:
        Subgroup force-load-detect:
                incomplete -> PASS       (fi-byt-j1900)
                pass       -> INCOMPLETE (fi-ivb-3770)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-skl-6700hq)
        Subgroup suspend-read-crc-pipe-b:
                dmesg-warn -> PASS       (fi-skl-6700hq)
        Subgroup suspend-read-crc-pipe-c:
                dmesg-warn -> PASS       (fi-skl-6700hq)
fi-bdw-5557u     total:246  pass:231  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:246  pass:203  dwarn:1   dfail:0   fail:0   skip:42 
fi-bxt-t5700     total:246  pass:216  dwarn:0   dfail:0   fail:0   skip:30 
fi-byt-j1900     total:246  pass:213  dwarn:1   dfail:0   fail:1   skip:31 
fi-byt-n2820     total:246  pass:209  dwarn:1   dfail:0   fail:1   skip:35 
fi-hsw-4770      total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 
fi-hsw-4770r     total:246  pass:223  dwarn:1   dfail:0   fail:0   skip:22 
fi-ilk-650       total:246  pass:159  dwarn:25  dfail:0   fail:2   skip:60 
fi-ivb-3520m     total:246  pass:221  dwarn:0   dfail:0   fail:0   skip:25 
fi-ivb-3770      total:186  pass:164  dwarn:0   dfail:0   fail:0   skip:21 
fi-kbl-7200u     total:246  pass:222  dwarn:0   dfail:0   fail:0   skip:24 
fi-skl-6260u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:246  pass:222  dwarn:1   dfail:0   fail:0   skip:23 
fi-skl-6700k     total:246  pass:221  dwarn:1   dfail:0   fail:0   skip:24 
fi-skl-6770hq    total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
fi-snb-2520m     total:246  pass:210  dwarn:0   dfail:0   fail:0   skip:36 
fi-snb-2600      total:209  pass:176  dwarn:0   dfail:0   fail:0   skip:32 

Results at /archive/results/CI_IGT_test/Patchwork_2762/

21787266bd182df4c0d2067cf1b5c2379f61c24d drm-intel-nightly: 2016y-10m-19d-15h-39m-22s UTC integration manifest b7c7077 drm/i915: Address broxton phy registers based on phy and channel number
88ab5e1 drm/i915: Add location of the Rcomp resistor to bxt_ddi_phy_info
12c0f43 drm/i915: Create a struct to hold information about the broxton phys
6e830b9 drm/i915: Move broxton vswing sequence to intel_dpio_phy.c
df0c1d2 drm/i915: Move DPIO phy documentation section to intel_dpio_phy.c
421e554 drm/i915: Move broxton phy code to intel_dpio_phy.c
125da91 drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask()
cf9f51f drm/i915: Explicitly map broxton DPIO power wells to phys
8f7b31c drm/i915: Rename struct i915_power_well field data to id

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

#19 lore raw

Re: ✗ Fi.CI.BAT: failure for Broxton ddi phy refactoring (rev5)

Quoted 6 lines · Patchwork

== Series Details ==

Series: Broxton ddi phy refactoring (rev5)
URL   : https://patchwork.freedesktop.org/series/13320/
State : failure

Quoted 7 lines

== Summary ==

Series 13320v5 Broxton ddi phy refactoring
https://patchwork.freedesktop.org/api/1.0/series/13320/revisions/5/mbox/

Test drv_module_reload_basic:
                pass       -> DMESG-WARN (fi-skl-6700hq)

[   37.937419] [drm:lspcon_init [i915]] No LSPCON detected, found unknown [   37.937488] [drm:lspcon_init [i915]] *ERROR* Failed to probe lspcon [   37.937569] [drm:intel_ddi_init [i915]] *ERROR* LSPCON init failed on port B

https://bugs.freedesktop.org/show_bug.cgi?id=98353

Quoted 6 lines

Test gem_exec_suspend:
        Subgroup basic-s3:
                dmesg-warn -> PASS       (fi-skl-6700hq) Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-legacy:
                pass       -> DMESG-WARN (fi-ilk-650)

[drm:intel_pch_fifo_underrun_irq_handler [i915]] *ERROR* PCH transcoder B FIFO underrun

Also happened once in CI 1733.

https://bugs.freedesktop.org/show_bug.cgi?id=98251 ?

Quoted 4 lines

Test kms_force_connector_basic:
        Subgroup force-load-detect:
                incomplete -> PASS       (fi-byt-j1900) pass       -> INCOMPLETE (fi-ivb-3770)

BUG: unable to handle kernel NULL pointer dereference at           (null)
[<ffffffffa00aa424>] intel_get_load_detect_pipe+0xe4/0x610 [i915]

Seems to happen sporadically between CI 1726 and 1736 across different machines.

Ander

Quoted 41 lines

Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-skl-6700hq) Subgroup suspend-read-crc-pipe-b:
                dmesg-warn -> PASS       (fi-skl-6700hq) Subgroup suspend-read-crc-pipe-c:
                dmesg-warn -> PASS       (fi-skl-6700hq)

fi-bdw-5557u     total:246  pass:231  dwarn:0   dfail:0   fail:0   skip:15 fi-bsw-n3050     total:246  pass:203  dwarn:1   dfail:0   fail:0   skip:42 fi-bxt-t5700     total:246  pass:216  dwarn:0   dfail:0   fail:0   skip:30 fi-byt-j1900     total:246  pass:213  dwarn:1   dfail:0   fail:1   skip:31 fi-byt-n2820     total:246  pass:209  dwarn:1   dfail:0   fail:1   skip:35 fi-hsw-4770      total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 fi-hsw-4770r     total:246  pass:223  dwarn:1   dfail:0   fail:0   skip:22 fi-ilk-650       total:246  pass:159  dwarn:25  dfail:0   fail:2   skip:60 fi-ivb-3520m     total:246  pass:221  dwarn:0   dfail:0   fail:0   skip:25 fi-ivb-3770      total:186  pass:164  dwarn:0   dfail:0   fail:0   skip:21 fi-kbl-7200u     total:246  pass:222  dwarn:0   dfail:0   fail:0   skip:24 fi-skl-6260u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 fi-skl-6700hq    total:246  pass:222  dwarn:1   dfail:0   fail:0   skip:23 fi-skl-6700k     total:246  pass:221  dwarn:1   dfail:0   fail:0   skip:24 fi-skl-6770hq    total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 fi-snb-2520m     total:246  pass:210  dwarn:0   dfail:0   fail:0   skip:36 fi-snb-2600      total:209  pass:176  dwarn:0   dfail:0   fail:0   skip:32

Results at /archive/results/CI_IGT_test/Patchwork_2762/

21787266bd182df4c0d2067cf1b5c2379f61c24d drm-intel-nightly: 2016y-10m-19d-15h- 39m-22s UTC integration manifest
b7c7077 drm/i915: Address broxton phy registers based on phy and channel number
88ab5e1 drm/i915: Add location of the Rcomp resistor to bxt_ddi_phy_info 12c0f43 drm/i915: Create a struct to hold information about the broxton phys 6e830b9 drm/i915: Move broxton vswing sequence to intel_dpio_phy.c df0c1d2 drm/i915: Move DPIO phy documentation section to intel_dpio_phy.c 421e554 drm/i915: Move broxton phy code to intel_dpio_phy.c 125da91 drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask() cf9f51f drm/i915: Explicitly map broxton DPIO power wells to phys 8f7b31c drm/i915: Rename struct i915_power_well field data to id

Quoted 4 lines

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

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

#20 lore raw

Re: ✗ Fi.CI.BAT: failure for Broxton ddi phy refactoring (rev5)

Quoted 41 lines · Ander Conselvan De Oliveira
Quoted 6 lines · Patchwork

== Series Details ==

Series: Broxton ddi phy refactoring (rev5)
URL   : https://patchwork.freedesktop.org/series/13320/
State : failure

Quoted 7 lines

== Summary ==

Series 13320v5 Broxton ddi phy refactoring
https://patchwork.freedesktop.org/api/1.0/series/13320/revisions/5/mbox/

Test drv_module_reload_basic:
                pass       -> DMESG-WARN (fi-skl-6700hq)

[   37.937419] [drm:lspcon_init [i915]] No LSPCON detected, found unknown [   37.937488] [drm:lspcon_init [i915]] *ERROR* Failed to probe lspcon [   37.937569] [drm:intel_ddi_init [i915]] *ERROR* LSPCON init failed on port B

https://bugs.freedesktop.org/show_bug.cgi?id=98353

Quoted 6 lines

Test gem_exec_suspend:
        Subgroup basic-s3:
                dmesg-warn -> PASS       (fi-skl-6700hq) Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-legacy:
                pass       -> DMESG-WARN (fi-ilk-650)

[drm:intel_pch_fifo_underrun_irq_handler [i915]] *ERROR* PCH transcoder B FIFO underrun

Also happened once in CI 1733.

https://bugs.freedesktop.org/show_bug.cgi?id=98251 ?

Quoted 4 lines

Test kms_force_connector_basic:
        Subgroup force-load-detect:
                incomplete -> PASS       (fi-byt-j1900) pass       -> INCOMPLETE (fi-ivb-3770)

Quoted 4 lines
BUG: unable to handle kernel NULL pointer dereference at           (null)
[<ffffffffa00aa424>] intel_get_load_detect_pipe+0xe4/0x610 [i915]

Seems to happen sporadically between CI 1726 and 1736 across different machines.

https://patchwork.freedesktop.org/patch/116624/

Quoted 53 lines

Ander

Quoted 41 lines

Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-skl-6700hq) Subgroup suspend-read-crc-pipe-b:
                dmesg-warn -> PASS       (fi-skl-6700hq) Subgroup suspend-read-crc-pipe-c:
                dmesg-warn -> PASS       (fi-skl-6700hq)

fi-bdw-5557u     total:246  pass:231  dwarn:0   dfail:0   fail:0   skip:15 fi-bsw-n3050     total:246  pass:203  dwarn:1   dfail:0   fail:0   skip:42 fi-bxt-t5700     total:246  pass:216  dwarn:0   dfail:0   fail:0   skip:30 fi-byt-j1900     total:246  pass:213  dwarn:1   dfail:0   fail:1   skip:31 fi-byt-n2820     total:246  pass:209  dwarn:1   dfail:0   fail:1   skip:35 fi-hsw-4770      total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 fi-hsw-4770r     total:246  pass:223  dwarn:1   dfail:0   fail:0   skip:22 fi-ilk-650       total:246  pass:159  dwarn:25  dfail:0   fail:2   skip:60 fi-ivb-3520m     total:246  pass:221  dwarn:0   dfail:0   fail:0   skip:25 fi-ivb-3770      total:186  pass:164  dwarn:0   dfail:0   fail:0   skip:21 fi-kbl-7200u     total:246  pass:222  dwarn:0   dfail:0   fail:0   skip:24 fi-skl-6260u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 fi-skl-6700hq    total:246  pass:222  dwarn:1   dfail:0   fail:0   skip:23 fi-skl-6700k     total:246  pass:221  dwarn:1   dfail:0   fail:0   skip:24 fi-skl-6770hq    total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 fi-snb-2520m     total:246  pass:210  dwarn:0   dfail:0   fail:0   skip:36 fi-snb-2600      total:209  pass:176  dwarn:0   dfail:0   fail:0   skip:32

Results at /archive/results/CI_IGT_test/Patchwork_2762/

21787266bd182df4c0d2067cf1b5c2379f61c24d drm-intel-nightly: 2016y-10m-19d-15h- 39m-22s UTC integration manifest
b7c7077 drm/i915: Address broxton phy registers based on phy and channel number
88ab5e1 drm/i915: Add location of the Rcomp resistor to bxt_ddi_phy_info 12c0f43 drm/i915: Create a struct to hold information about the broxton phys 6e830b9 drm/i915: Move broxton vswing sequence to intel_dpio_phy.c df0c1d2 drm/i915: Move DPIO phy documentation section to intel_dpio_phy.c 421e554 drm/i915: Move broxton phy code to intel_dpio_phy.c 125da91 drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask() cf9f51f drm/i915: Explicitly map broxton DPIO power wells to phys 8f7b31c drm/i915: Rename struct i915_power_well field data to id

Quoted 4 lines

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

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

Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#21 lore raw

Re: ✗ Fi.CI.BAT: failure for Broxton ddi phy refactoring (rev5)

Quoted 45 lines · Ville Syrjälä
Quoted 44 lines · Ander Conselvan De Oliveira
Quoted 7 lines · Patchwork

== Series Details ==

Series: Broxton ddi phy refactoring (rev5)
URL   : https://patchwork.freedesktop.org/series/13320/
State : failure

Quoted 7 lines

== Summary ==

Series 13320v5 Broxton ddi phy refactoring
https://patchwork.freedesktop.org/api/1.0/series/13320/revisions/5/mbox/

Test drv_module_reload_basic:
                pass       -> DMESG-WARN (fi-skl-6700hq)

[   37.937419] [drm:lspcon_init [i915]] No LSPCON detected, found unknown [   37.937488] [drm:lspcon_init [i915]] *ERROR* Failed to probe lspcon [   37.937569] [drm:intel_ddi_init [i915]] *ERROR* LSPCON init failed on port B

https://bugs.freedesktop.org/show_bug.cgi?id=98353

Quoted 7 lines

Test gem_exec_suspend:
        Subgroup basic-s3:
                dmesg-warn -> PASS       (fi-skl-6700hq) Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-legacy:
                pass       -> DMESG-WARN (fi-ilk-650)

[drm:intel_pch_fifo_underrun_irq_handler [i915]] *ERROR* PCH transcoder B FIFO
underrun

Also happened once in CI 1733.

https://bugs.freedesktop.org/show_bug.cgi?id=98251 ?

Quoted 5 lines

Test kms_force_connector_basic:
        Subgroup force-load-detect:
                incomplete -> PASS       (fi-byt-j1900) pass       -> INCOMPLETE (fi-ivb-3770)

Quoted 6 lines
Quoted 5 lines
BUG: unable to handle kernel NULL pointer dereference at           (null)
[<ffffffffa00aa424>] intel_get_load_detect_pipe+0xe4/0x610 [i915]

Seems to happen sporadically between CI 1726 and 1736 across different machines.

https://patchwork.freedesktop.org/patch/116624/

Pushed.

Ander

Quoted 67 lines
Quoted 67 lines

Ander

Quoted 61 lines

Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> PASS       (fi-skl-6700hq) Subgroup suspend-read-crc-pipe-b:
                dmesg-warn -> PASS       (fi-skl-6700hq) Subgroup suspend-read-crc-pipe-c:
                dmesg-warn -> PASS       (fi-skl-6700hq)

fi-bdw-
5557u     total:246  pass:231  dwarn:0   dfail:0   fail:0   skip:15 fi-bsw-
n3050     total:246  pass:203  dwarn:1   dfail:0   fail:0   skip:42 fi-bxt-
t5700     total:246  pass:216  dwarn:0   dfail:0   fail:0   skip:30 fi-byt-
j1900     total:246  pass:213  dwarn:1   dfail:0   fail:1   skip:31 fi-byt-
n2820     total:246  pass:209  dwarn:1   dfail:0   fail:1   skip:35 fi-hsw-
4770      total:246  pass:224  dwarn:0   dfail:0   fail:0   skip:22 fi-hsw-
4770r     total:246  pass:223  dwarn:1   dfail:0   fail:0   skip:22 fi-ilk-
650       total:246  pass:159  dwarn:25  dfail:0   fail:2   skip:60 fi-ivb-
3520m     total:246  pass:221  dwarn:0   dfail:0   fail:0   skip:25 fi-ivb-
3770      total:186  pass:164  dwarn:0   dfail:0   fail:0   skip:21 fi-kbl-
7200u     total:246  pass:222  dwarn:0   dfail:0   fail:0   skip:24 fi-skl-
6260u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 fi-skl-
6700hq    total:246  pass:222  dwarn:1   dfail:0   fail:0   skip:23 fi-skl-
6700k     total:246  pass:221  dwarn:1   dfail:0   fail:0   skip:24 fi-skl-
6770hq    total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 fi-snb-
2520m     total:246  pass:210  dwarn:0   dfail:0   fail:0   skip:36 fi-snb-
2600      total:209  pass:176  dwarn:0   dfail:0   fail:0   skip:32

Results at /archive/results/CI_IGT_test/Patchwork_2762/

21787266bd182df4c0d2067cf1b5c2379f61c24d drm-intel-nightly: 2016y-10m-19d- 15h-
39m-22s UTC integration manifest
b7c7077 drm/i915: Address broxton phy registers based on phy and channel number
88ab5e1 drm/i915: Add location of the Rcomp resistor to bxt_ddi_phy_info 12c0f43 drm/i915: Create a struct to hold information about the broxton phys
6e830b9 drm/i915: Move broxton vswing sequence to intel_dpio_phy.c df0c1d2 drm/i915: Move DPIO phy documentation section to intel_dpio_phy.c 421e554 drm/i915: Move broxton phy code to intel_dpio_phy.c 125da91 drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask() cf9f51f drm/i915: Explicitly map broxton DPIO power wells to phys 8f7b31c drm/i915: Rename struct i915_power_well field data to id

Quoted 8 lines
Quoted 8 lines
Quoted 4 lines

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

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

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

#22 lore raw

Re: ✗ Fi.CI.BAT: failure for Broxton ddi phy refactoring (rev5)

In reply to Ander Conselvan De Oliveira
Quoted 10 lines · Ander Conselvan De Oliveira
Quoted 4 lines · Patchwork

Test kms_force_connector_basic:
        Subgroup force-load-detect:
                incomplete -> PASS       (fi-byt-j1900) pass       -> INCOMPLETE (fi-ivb-3770)

BUG: unable to handle kernel NULL pointer dereference at           (null)
[<ffffffffa00aa424>] intel_get_load_detect_pipe+0xe4/0x610 [i915]

Seems to happen sporadically between CI 1726 and 1736 across different machines.

That's so CI 1730s.
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#23 lore raw

✗ Fi.CI.BAT: warning for Broxton ddi phy refactoring (rev5)

In reply to Ander Conselvan de Oliveira
== Series Details ==

== Series Details ==

Series: Broxton ddi phy refactoring (rev5)
URL : https://patchwork.freedesktop.org/series/13320/
State : warning

== Summary ==

Series 13320v5 Broxton ddi phy refactoring
https://patchwork.freedesktop.org/api/1.0/series/13320/revisions/5/mbox/

Test gem_ringfill:

        Subgroup basic-default-hang:
                timeout    -> PASS       (fi-ivb-3770)
        Subgroup basic-default-interruptible:
                incomplete -> PASS       (fi-ivb-3770)
Test kms_flip:
        Subgroup basic-flip-vs-wf_vblank:
                pass       -> SKIP       (fi-byt-n2820)
Test kms_force_connector_basic:
        Subgroup force-connector-state:
                pass       -> DMESG-WARN (fi-snb-2520m)
fi-bdw-5557u     total:239  pass:224  dwarn:0   dfail:0   fail:0   skip:15 
fi-bsw-n3050     total:239  pass:199  dwarn:0   dfail:0   fail:0   skip:40 
fi-bxt-t5700     total:239  pass:211  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-j1900     total:239  pass:211  dwarn:0   dfail:0   fail:0   skip:28 
fi-byt-n2820     total:239  pass:206  dwarn:0   dfail:0   fail:0   skip:33 
fi-hsw-4770      total:239  pass:219  dwarn:0   dfail:0   fail:0   skip:20 
fi-hsw-4770r     total:239  pass:218  dwarn:0   dfail:0   fail:0   skip:21 
fi-ilk-650       total:239  pass:185  dwarn:0   dfail:0   fail:0   skip:54 
fi-ivb-3520m     total:239  pass:216  dwarn:0   dfail:0   fail:0   skip:23 
fi-ivb-3770      total:239  pass:216  dwarn:0   dfail:0   fail:0   skip:23 
fi-kbl-7200u     total:239  pass:217  dwarn:0   dfail:0   fail:0   skip:22 
fi-skl-6260u     total:239  pass:225  dwarn:0   dfail:0   fail:0   skip:14 
fi-skl-6700hq    total:239  pass:218  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6700k     total:239  pass:217  dwarn:1   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:239  pass:225  dwarn:0   dfail:0   fail:0   skip:14 
fi-snb-2520m     total:239  pass:205  dwarn:1   dfail:0   fail:0   skip:33 
fi-snb-2600      total:239  pass:205  dwarn:0   dfail:0   fail:0   skip:34 

56cae66b9bf88f7114ae9e526106aca1605c7fd0 drm-intel-nightly: 2016y-10m-28d-07h-26m-15s UTC integration manifest 63ed222 drm/i915: Address broxton phy registers based on phy and channel number
f6a0907 drm/i915: Add location of the Rcomp resistor to bxt_ddi_phy_info
c51fe03 drm/i915: Create a struct to hold information about the broxton phys
6c8a0c3 drm/i915: Move broxton vswing sequence to intel_dpio_phy.c
584ca40 drm/i915: Move DPIO phy documentation section to intel_dpio_phy.c
d65021d drm/i915: Move broxton phy code to intel_dpio_phy.c
55f7e6e drm/i915: Pass lane count to bxt_ddi_phy_calc_lane_optmin_mask()
6cd9d4f drm/i915: Explicitly map broxton DPIO power wells to phys
c5d6f5f drm/i915: Rename struct i915_power_well field data to id

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2845/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx