Skip to contentSkip to conversation

Add USB typeC based DP support for BXT platform

PATCH In review Durgadoss R 4 participants 12 messages Jul 13, 2016 – Jul 27, 2016

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

v7 cover Add USB typeC based DP support for BXT platform

This patch series adds upfront link training support to enable USB type C based DP on BXT platform.

To support USB type C alternate DP mode, the display driver needs to know the number of lanes required by the DP panel as well as number of lanes that can be supported by the type-C cable. Sometimes, the type-C cable may limit the bandwidth even if Panel can support more lanes.

The goal is to find out the number of lanes which can be supported using a particular cable so that we can cap 'max_available_lanes' to that number during modeset.

Patch 1-3/5 : Refactor ddi_pll code so that upfront link
training does not need crtc_state.
Patch 4/5 : Split ddi_pll_select to be able to calculate
pll config for DP during upfront link train.
Patch 5/5 : Upfront implementation for BXT platform.

Changes since v6:
* Use link_rate (and not link_bw) for upfront (Ville)
* Make intel_dp_upfront*() as a vfunc (Ander)
Changes from v5:
* Moved the retry logic from upfront code to intel_dp.c Changes from v4:
* Don't use crtc_state in upfront link train
* Use separate variables to track max lane count
and link bw obtained through upfront link train
Changes from v3:
* Used an earlier patch from Ander that splits ddi_pll_select to be able to use it from upfront link train logic.
Changes from v2:
* Rebased on top of intel_dpll_mgr.c code.
* Use drm_atomic_commit instead of atomic_helper_dpms, since the later uses crtc->acquire_ctx used also in legacy paths.
* Using a drm_atomic_state helps in using the shared_dpll APIs as is, thus keeping the upfront code away from changing pll internals directly.
* Fixed locking/retry/backoff logic in upfront according to atomic implementation.
Changes from v1:
* Using atomic_helper_dpms() to do DPMS off for upfront link training, instead of using load detect functions.
* Made intel_get_shared_dpll handle non-atomic paths by duplicating the required shared_dpll_config and then working on top of it. This helps in upfront link train code not directly touch the 'pll/pll->config' internals.
* Fixed the link_bw update logic in intel_dp_get_link_retry_params() for non-HBR2 panels.
* As per comments on earlier version, merged few patches (that added new functions) with the upfront link train patch, to facilitate easy review.

Link for v6:    https://patchwork.freedesktop.org/patch/88189/
Link for v5:    https://patchwork.freedesktop.org/patch/87327/
Link for v4:    https://patchwork.freedesktop.org/patch/81656/
Link for v3:    https://patchwork.freedesktop.org/patch/79792/
Link for v2:    https://patchwork.freedesktop.org/patch/72207/
Link for v1:    https://patchwork.freedesktop.org/patch/67784/
Link for RFCv2: https://patchwork.freedesktop.org/patch/61776/
Link for RFCv1: https://patchwork.freedesktop.org/patch/59589/

Ander Conselvan de Oliveira (3):
drm/i915: Don't pass crtc_state to intel_dp_set_link_params() drm/i915: Remove ddi_pll_sel from intel_crtc_state drm/i915: Split intel_ddi_pre_enable() into DP and HDMI versions

Durgadoss R (2):
drm/i915: Split bxt_ddi_pll_select()
drm/i915/dp: Enable Upfront link training for typeC DP support on BXT

 drivers/gpu/drm/i915/intel_ddi.c              | 162 ++++++++++++++++------
 drivers/gpu/drm/i915/intel_display.c          |  43 ++----
 drivers/gpu/drm/i915/intel_dp.c               | 164 ++++++++++++++++++++--
 drivers/gpu/drm/i915/intel_dp_link_training.c |   7 +-
 drivers/gpu/drm/i915/intel_dp_mst.c           |   7 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.c         | 192 ++++++++++++++------------
 drivers/gpu/drm/i915/intel_dpll_mgr.h         |   3 +
 drivers/gpu/drm/i915/intel_drv.h              |  25 ++--
 8 files changed, 414 insertions(+), 189 deletions(-)
Signature · 6 lines
1.9.1

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

PATCH v7 1/5 drm/i915: Don't pass crtc_state to intel_dp_set_link_params()

From: Ander Conselvan de Oliveira <[email protected]>

Decouple intel_dp_set_link_params() from struct intel_crtc_state. This will be useful for implementing DP upfront link training.

---
 drivers/gpu/drm/i915/intel_ddi.c    | 3 ++-
 drivers/gpu/drm/i915/intel_dp.c     | 9 +++++----
 drivers/gpu/drm/i915/intel_dp_mst.c | 4 +++-
 drivers/gpu/drm/i915/intel_drv.h    | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +2 -1
index dd1d6fe..7d78262 100644
@@ -1627,7 +1627,8 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)
 	if (type == INTEL_OUTPUT_DP || type == INTEL_OUTPUT_EDP) {
 		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
 
-		intel_dp_set_link_params(intel_dp, crtc->config);
+		intel_dp_set_link_params(intel_dp, crtc->config->port_clock,
+					 crtc->config->lane_count);
 
 		intel_ddi_init_dp_buf_reg(intel_encoder);
 
drivers/gpu/drm/i915/intel_dp.c +5 -4
index 0c5ba34..817897c 100644
@@ -1647,10 +1647,10 @@ found:
 }
 
 void intel_dp_set_link_params(struct intel_dp *intel_dp,
-			      const struct intel_crtc_state *pipe_config)
+			      int link_rate, uint8_t lane_count)
 {
-	intel_dp->link_rate = pipe_config->port_clock;
-	intel_dp->lane_count = pipe_config->lane_count;
+	intel_dp->link_rate = link_rate;
+	intel_dp->lane_count = lane_count;
 }
 
 static void intel_dp_prepare(struct intel_encoder *encoder)
@@ -1662,7 +1662,8 @@ static void intel_dp_prepare(struct intel_encoder *encoder)
 	struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
 	const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
 
-	intel_dp_set_link_params(intel_dp, crtc->config);
+	intel_dp_set_link_params(intel_dp, crtc->config->port_clock,
+				 crtc->config->lane_count);
 
 	/*
 	 * There are four kinds of DP registers:
drivers/gpu/drm/i915/intel_dp_mst.c +3 -1
index 68a005d..fd8f6a3 100644
@@ -174,7 +174,9 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
 
 		intel_ddi_clk_select(&intel_dig_port->base, intel_crtc->config);
 
-		intel_dp_set_link_params(intel_dp, intel_crtc->config);
+		intel_dp_set_link_params(intel_dp,
+					 intel_crtc->config->port_clock,
+					 intel_crtc->config->lane_count);
 
 		intel_ddi_init_dp_buf_reg(&intel_dig_port->base);
 
drivers/gpu/drm/i915/intel_drv.h +1 -1
index 6c8485c..be37b98 100644
@@ -1355,7 +1355,7 @@ bool intel_dp_init(struct drm_device *dev, i915_reg_t output_reg, enum port port
 bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
 			     struct intel_connector *intel_connector);
 void intel_dp_set_link_params(struct intel_dp *intel_dp,
-			      const struct intel_crtc_state *pipe_config);
+				int link_rate, uint8_t lane_count);
 void intel_dp_start_link_train(struct intel_dp *intel_dp);
 void intel_dp_stop_link_train(struct intel_dp *intel_dp);
 void intel_dp_sink_dpms(struct intel_dp *intel_dp, int mode);
Signature · 6 lines
1.9.1

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

PATCH v2 2/5 drm/i915: Remove ddi_pll_sel from intel_crtc_state

In reply to Durgadoss R

From: Ander Conselvan de Oliveira <[email protected]>

The value of ddi_pll_sel is derived from the selection of shared dpll, so just calculate the final value when necessary.

v2: Actually remove it from crtc state and delete remaining usages. (CI)

---
 drivers/gpu/drm/i915/intel_ddi.c      | 45 ++++++++++++++++++++++++++---------
 drivers/gpu/drm/i915/intel_display.c  | 43 +++++++--------------------------
 drivers/gpu/drm/i915/intel_dp_mst.c   |  3 ++-
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 27 ---------------------
 drivers/gpu/drm/i915/intel_drv.h      |  8 +------
 5 files changed, 45 insertions(+), 81 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +34 -11
index 7d78262..b919cdf 100644
@@ -531,6 +531,27 @@ static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,
 	DRM_ERROR("Timeout waiting for DDI BUF %c idle bit\n", port_name(port));
 }
 
+static uint32_t hsw_pll_to_ddi_pll_sel(struct intel_shared_dpll *pll)
+{
+	switch (pll->id) {
+	case DPLL_ID_WRPLL1:
+		return PORT_CLK_SEL_WRPLL1;
+	case DPLL_ID_WRPLL2:
+		return PORT_CLK_SEL_WRPLL2;
+	case DPLL_ID_SPLL:
+		return PORT_CLK_SEL_SPLL;
+	case DPLL_ID_LCPLL_810:
+		return PORT_CLK_SEL_LCPLL_810;
+	case DPLL_ID_LCPLL_1350:
+		return PORT_CLK_SEL_LCPLL_1350;
+	case DPLL_ID_LCPLL_2700:
+		return PORT_CLK_SEL_LCPLL_2700;
+	default:
+		MISSING_CASE(pll->id);
+		return PORT_CLK_SEL_NONE;
+	}
+}
+
 /* Starting with Haswell, different DDI ports can work in FDI mode for
  * connection to the PCH-located connectors. For this, it is necessary to train
  * both the DDI port and PCH receiver for the desired DDI buffer settings.
@@ -546,7 +567,7 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	struct intel_encoder *encoder;
-	u32 temp, i, rx_ctl_val;
+	u32 temp, i, rx_ctl_val, ddi_pll_sel;
 
 	for_each_encoder_on_crtc(dev, crtc, encoder) {
 		WARN_ON(encoder->type != INTEL_OUTPUT_ANALOG);
@@ -577,8 +598,9 @@ void hsw_fdi_link_train(struct drm_crtc *crtc)
 	I915_WRITE(FDI_RX_CTL(PIPE_A), rx_ctl_val);
 
 	/* Configure Port Clock Select */
-	I915_WRITE(PORT_CLK_SEL(PORT_E), intel_crtc->config->ddi_pll_sel);
-	WARN_ON(intel_crtc->config->ddi_pll_sel != PORT_CLK_SEL_SPLL);
+	ddi_pll_sel = hsw_pll_to_ddi_pll_sel(intel_crtc->config->shared_dpll);
+	I915_WRITE(PORT_CLK_SEL(PORT_E), ddi_pll_sel);
+	WARN_ON(ddi_pll_sel != PORT_CLK_SEL_SPLL);
 
 	/* Start the training iterating through available voltages and emphasis,
 	 * testing each value twice. */
@@ -855,7 +877,7 @@ static void skl_ddi_clock_get(struct intel_encoder *encoder,
 	int link_clock = 0;
 	uint32_t dpll_ctl1, dpll;
 
-	dpll = pipe_config->ddi_pll_sel;
+	dpll = intel_get_shared_dpll_id(dev_priv, pipe_config->shared_dpll);
 
 	dpll_ctl1 = I915_READ(DPLL_CTRL1);
 
@@ -903,7 +925,7 @@ static void hsw_ddi_clock_get(struct intel_encoder *encoder,
 	int link_clock = 0;
 	u32 val, pll;
 
-	val = pipe_config->ddi_pll_sel;
+	val = hsw_pll_to_ddi_pll_sel(pipe_config->shared_dpll);
 	switch (val & PORT_CLK_SEL_MASK) {
 	case PORT_CLK_SEL_LCPLL_810:
 		link_clock = 81000;
@@ -1576,13 +1598,15 @@ uint32_t ddi_signal_levels(struct intel_dp *intel_dp)
 }
 
 void intel_ddi_clk_select(struct intel_encoder *encoder,
-			  const struct intel_crtc_state *pipe_config)
+			  struct intel_shared_dpll *pll)
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 	enum port port = intel_ddi_get_encoder_port(encoder);
 
+	if (WARN_ON(!pll))
+		return;
+
 	if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) {
-		uint32_t dpll = pipe_config->ddi_pll_sel;
 		uint32_t val;
 
 		/* DDI -> PLL mapping  */
@@ -1590,14 +1614,13 @@ void intel_ddi_clk_select(struct intel_encoder *encoder,
 
 		val &= ~(DPLL_CTRL2_DDI_CLK_OFF(port) |
 			DPLL_CTRL2_DDI_CLK_SEL_MASK(port));
-		val |= (DPLL_CTRL2_DDI_CLK_SEL(dpll, port) |
+		val |= (DPLL_CTRL2_DDI_CLK_SEL(pll->id, port) |
 			DPLL_CTRL2_DDI_SEL_OVERRIDE(port));
 
 		I915_WRITE(DPLL_CTRL2, val);
 
 	} else if (INTEL_INFO(dev_priv)->gen < 9) {
-		WARN_ON(pipe_config->ddi_pll_sel == PORT_CLK_SEL_NONE);
-		I915_WRITE(PORT_CLK_SEL(port), pipe_config->ddi_pll_sel);
+		I915_WRITE(PORT_CLK_SEL(port), hsw_pll_to_ddi_pll_sel(pll));
 	}
 }
 
@@ -1622,7 +1645,7 @@ static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)
 		intel_edp_panel_on(intel_dp);
 	}
 
-	intel_ddi_clk_select(intel_encoder, crtc->config);
+	intel_ddi_clk_select(intel_encoder, crtc->config->shared_dpll);
 
 	if (type == INTEL_OUTPUT_DP || type == INTEL_OUTPUT_EDP) {
 		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
drivers/gpu/drm/i915/intel_display.c +8 -35

119 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dp_mst.c +2 -1
index fd8f6a3..e652109 100644
@@ -172,7 +172,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder)
 	if (intel_dp->active_mst_links == 0) {
 		intel_prepare_ddi_buffer(&intel_dig_port->base);
 
-		intel_ddi_clk_select(&intel_dig_port->base, intel_crtc->config);
+		intel_ddi_clk_select(&intel_dig_port->base,
+				     intel_crtc->config->shared_dpll);
 
 		intel_dp_set_link_params(intel_dp,
 					 intel_crtc->config->port_clock,
drivers/gpu/drm/i915/intel_dpll_mgr.c +0 -27
index 5c1f2d2..0e1af4d 100644
@@ -452,26 +452,6 @@ static bool hsw_ddi_spll_get_hw_state(struct drm_i915_private *dev_priv,
 	return val & SPLL_PLL_ENABLE;
 }
 
-static uint32_t hsw_pll_to_ddi_pll_sel(struct intel_shared_dpll *pll)
-{
-	switch (pll->id) {
-	case DPLL_ID_WRPLL1:
-		return PORT_CLK_SEL_WRPLL1;
-	case DPLL_ID_WRPLL2:
-		return PORT_CLK_SEL_WRPLL2;
-	case DPLL_ID_SPLL:
-		return PORT_CLK_SEL_SPLL;
-	case DPLL_ID_LCPLL_810:
-		return PORT_CLK_SEL_LCPLL_810;
-	case DPLL_ID_LCPLL_1350:
-		return PORT_CLK_SEL_LCPLL_1350;
-	case DPLL_ID_LCPLL_2700:
-		return PORT_CLK_SEL_LCPLL_2700;
-	default:
-		return PORT_CLK_SEL_NONE;
-	}
-}
-
 #define LC_FREQ 2700
 #define LC_FREQ_2K U64_C(LC_FREQ * 2000)
 
@@ -751,8 +731,6 @@ hsw_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
 	if (!pll)
 		return NULL;
 
-	crtc_state->ddi_pll_sel = hsw_pll_to_ddi_pll_sel(pll);
-
 	intel_reference_shared_dpll(pll, crtc_state);
 
 	return pll;
@@ -1274,8 +1252,6 @@ skl_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
 	if (!pll)
 		return NULL;
 
-	crtc_state->ddi_pll_sel = pll->id;
-
 	intel_reference_shared_dpll(pll, crtc_state);
 
 	return pll;
@@ -1622,9 +1598,6 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
 
 	intel_reference_shared_dpll(pll, crtc_state);
 
-	/* shared DPLL id 0 is DPLL A */
-	crtc_state->ddi_pll_sel = pll->id;
-
 	return pll;
 }
 
drivers/gpu/drm/i915/intel_drv.h +1 -7
index be37b98..16f70d4 100644
@@ -561,12 +561,6 @@ struct intel_crtc_state {
 	/* Selected dpll when shared or NULL. */
 	struct intel_shared_dpll *shared_dpll;
 
-	/*
-	 * - PORT_CLK_SEL for DDI ports on HSW/BDW.
-	 * - enum skl_dpll on SKL
-	 */
-	uint32_t ddi_pll_sel;
-
 	/* Actual register state of the dpll, for shared dpll cross-checking. */
 	struct intel_dpll_hw_state dpll_hw_state;
 
@@ -1106,7 +1100,7 @@ void intel_crt_init(struct drm_device *dev);
 
 /* intel_ddi.c */
 void intel_ddi_clk_select(struct intel_encoder *encoder,
-			  const struct intel_crtc_state *pipe_config);
+			  struct intel_shared_dpll *pll);
 void intel_prepare_ddi_buffer(struct intel_encoder *encoder);
 void hsw_fdi_link_train(struct drm_crtc *crtc);
 void intel_ddi_init(struct drm_device *dev, enum port port);
Signature · 6 lines
1.9.1

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

PATCH v7 3/5 drm/i915: Split intel_ddi_pre_enable() into DP and HDMI versions

In reply to Durgadoss R

From: Ander Conselvan de Oliveira <[email protected]>

Split intel_ddi_pre_enable() into encoder type specific versions that don't depend on crtc_state. The necessary parameters are passed as function arguments. This split will be necessary for implementing DP upfront link training.

---
 drivers/gpu/drm/i915/intel_ddi.c | 75 +++++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 31 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +44 -31
index b919cdf..ab1745a 100644
@@ -1624,48 +1624,61 @@ void intel_ddi_clk_select(struct intel_encoder *encoder,
 	}
 }
 
-static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)
+static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder,
+				int link_rate, uint32_t lane_count,
+				struct intel_shared_dpll *pll)
 {
-	struct drm_encoder *encoder = &intel_encoder->base;
-	struct drm_i915_private *dev_priv = to_i915(encoder->dev);
-	struct intel_crtc *crtc = to_intel_crtc(encoder->crtc);
-	enum port port = intel_ddi_get_encoder_port(intel_encoder);
-	int type = intel_encoder->type;
+	struct intel_dp *intel_dp = enc_to_intel_dp(&encoder->base);
+	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+	enum port port = intel_ddi_get_encoder_port(encoder);
 
-	if (type == INTEL_OUTPUT_HDMI) {
-		struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
+	intel_prepare_ddi_buffer(encoder);
 
-		intel_dp_dual_mode_set_tmds_output(intel_hdmi, true);
-	}
+	if (encoder->type == INTEL_OUTPUT_EDP)
+		intel_edp_panel_on(intel_dp);
 
-	intel_prepare_ddi_buffer(intel_encoder);
+	intel_ddi_clk_select(encoder, pll);
 
-	if (type == INTEL_OUTPUT_EDP) {
-		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
-		intel_edp_panel_on(intel_dp);
-	}
+	intel_dp_set_link_params(intel_dp, link_rate, lane_count);
+	intel_ddi_init_dp_buf_reg(encoder);
 
-	intel_ddi_clk_select(intel_encoder, crtc->config->shared_dpll);
+	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
+	intel_dp_start_link_train(intel_dp);
+	if (port != PORT_A || INTEL_INFO(dev_priv)->gen >= 9)
+		intel_dp_stop_link_train(intel_dp);
+}
 
-	if (type == INTEL_OUTPUT_DP || type == INTEL_OUTPUT_EDP) {
-		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
+static void intel_ddi_pre_enable_hdmi(struct intel_encoder *encoder,
+					bool has_hdmi_sink,
+					struct drm_display_mode *adjusted_mode,
+					struct intel_shared_dpll *pll)
+{
+	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
+	struct drm_encoder *drm_encoder = &encoder->base;
 
-		intel_dp_set_link_params(intel_dp, crtc->config->port_clock,
-					 crtc->config->lane_count);
+	intel_dp_dual_mode_set_tmds_output(intel_hdmi, true);
+	intel_prepare_ddi_buffer(encoder);
+	intel_ddi_clk_select(encoder, pll);
+	intel_hdmi->set_infoframes(drm_encoder, has_hdmi_sink, adjusted_mode);
+}
 
-		intel_ddi_init_dp_buf_reg(intel_encoder);
+static void intel_ddi_pre_enable(struct intel_encoder *intel_encoder)
+{
+	struct drm_encoder *encoder = &intel_encoder->base;
+	struct intel_crtc *crtc = to_intel_crtc(encoder->crtc);
+	int type = intel_encoder->type;
 
-		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
-		intel_dp_start_link_train(intel_dp);
-		if (port != PORT_A || INTEL_INFO(dev_priv)->gen >= 9)
-			intel_dp_stop_link_train(intel_dp);
-	} else if (type == INTEL_OUTPUT_HDMI) {
-		struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(encoder);
+	if (type == INTEL_OUTPUT_DP || type == INTEL_OUTPUT_EDP)
+		intel_ddi_pre_enable_dp(intel_encoder,
+					crtc->config->port_clock,
+					crtc->config->lane_count,
+					crtc->config->shared_dpll);
 
-		intel_hdmi->set_infoframes(encoder,
-					   crtc->config->has_hdmi_sink,
-					   &crtc->config->base.adjusted_mode);
-	}
+	if (type == INTEL_OUTPUT_HDMI)
+		intel_ddi_pre_enable_hdmi(intel_encoder,
+					crtc->config->has_hdmi_sink,
+					&crtc->config->base.adjusted_mode,
+					crtc->config->shared_dpll);
 }
 
 static void intel_ddi_post_disable(struct intel_encoder *intel_encoder)
Signature · 6 lines
1.9.1

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

PATCH v2 4/5 drm/i915: Split bxt_ddi_pll_select()

In reply to Durgadoss R

Split out of bxt_ddi_pll_select() the logic that calculates the pll dividers and dpll_hw_state into a new function that doesn't depend on crtc state. This will be used for enabling the port pll when doing upfront link training.

v2:
* Refactored code so that bxt_clk_div need not be exported (Durga) v1:
* Rebased on top of intel_dpll_mgr.c (Durga)
* Initial version from Ander on top of intel_ddi.c

---
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 165 +++++++++++++++++++++-------------
 drivers/gpu/drm/i915/intel_dpll_mgr.h |   3 +
 2 files changed, 104 insertions(+), 64 deletions(-)
drivers/gpu/drm/i915/intel_dpll_mgr.c +101 -64
index 0e1af4d..61d2311 100644
@@ -1460,6 +1460,8 @@ struct bxt_clk_div {
 	uint32_t m2_frac;
 	bool m2_frac_en;
 	uint32_t n;
+
+	int vco;
 };
 
 /* pre-calculated values for DP linkrates */
@@ -1473,57 +1475,60 @@ static const struct bxt_clk_div bxt_dp_clk_val[] = {
 	{432000, 3, 1, 32, 1677722, 1, 1}
 };
 
-static struct intel_shared_dpll *
-bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
-	     struct intel_encoder *encoder)
+static bool
+bxt_ddi_hdmi_pll_dividers(struct intel_crtc *intel_crtc,
+			  struct intel_crtc_state *crtc_state, int clock,
+			  struct bxt_clk_div *clk_div)
 {
-	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-	struct intel_shared_dpll *pll;
-	enum intel_dpll_id i;
-	struct intel_digital_port *intel_dig_port;
-	struct bxt_clk_div clk_div = {0};
-	int vco = 0;
-	uint32_t prop_coef, int_coef, gain_ctl, targ_cnt;
-	uint32_t lanestagger;
-	int clock = crtc_state->port_clock;
+	struct dpll best_clock;
 
-	if (encoder->type == INTEL_OUTPUT_HDMI) {
-		struct dpll best_clock;
+	/* Calculate HDMI div */
+	/*
+	 * FIXME: tie the following calculation into
+	 * i9xx_crtc_compute_clock
+	 */
+	if (!bxt_find_best_dpll(crtc_state, clock, &best_clock)) {
+		DRM_DEBUG_DRIVER("no PLL dividers found for clock %d pipe %c\n",
+				 clock, pipe_name(intel_crtc->pipe));
+		return false;
+	}
 
-		/* Calculate HDMI div */
-		/*
-		 * FIXME: tie the following calculation into
-		 * i9xx_crtc_compute_clock
-		 */
-		if (!bxt_find_best_dpll(crtc_state, clock, &best_clock)) {
-			DRM_DEBUG_DRIVER("no PLL dividers found for clock %d pipe %c\n",
-					 clock, pipe_name(crtc->pipe));
-			return NULL;
-		}
+	clk_div->p1 = best_clock.p1;
+	clk_div->p2 = best_clock.p2;
+	WARN_ON(best_clock.m1 != 2);
+	clk_div->n = best_clock.n;
+	clk_div->m2_int = best_clock.m2 >> 22;
+	clk_div->m2_frac = best_clock.m2 & ((1 << 22) - 1);
+	clk_div->m2_frac_en = clk_div->m2_frac != 0;
 
-		clk_div.p1 = best_clock.p1;
-		clk_div.p2 = best_clock.p2;
-		WARN_ON(best_clock.m1 != 2);
-		clk_div.n = best_clock.n;
-		clk_div.m2_int = best_clock.m2 >> 22;
-		clk_div.m2_frac = best_clock.m2 & ((1 << 22) - 1);
-		clk_div.m2_frac_en = clk_div.m2_frac != 0;
+	clk_div->vco = best_clock.vco;
 
-		vco = best_clock.vco;
-	} else if (encoder->type == INTEL_OUTPUT_DP ||
-		   encoder->type == INTEL_OUTPUT_EDP) {
-		int i;
+	return true;
+}
 
-		clk_div = bxt_dp_clk_val[0];
-		for (i = 0; i < ARRAY_SIZE(bxt_dp_clk_val); ++i) {
-			if (bxt_dp_clk_val[i].clock == clock) {
-				clk_div = bxt_dp_clk_val[i];
-				break;
-			}
+static void bxt_ddi_dp_pll_dividers(int clock, struct bxt_clk_div *clk_div)
+{
+	int i;
+
+	*clk_div = bxt_dp_clk_val[0];
+	for (i = 0; i < ARRAY_SIZE(bxt_dp_clk_val); ++i) {
+		if (bxt_dp_clk_val[i].clock == clock) {
+			*clk_div = bxt_dp_clk_val[i];
+			break;
 		}
-		vco = clock * 10 / 2 * clk_div.p1 * clk_div.p2;
 	}
 
+	clk_div->vco = clock * 10 / 2 * clk_div->p1 * clk_div->p2;
+}
+
+static bool bxt_ddi_set_dpll_hw_state(int clock,
+			  struct bxt_clk_div *clk_div,
+			  struct intel_dpll_hw_state *dpll_hw_state)
+{
+	int vco = clk_div->vco;
+	uint32_t prop_coef, int_coef, gain_ctl, targ_cnt;
+	uint32_t lanestagger;
+
 	if (vco >= 6200000 && vco <= 6700000) {
 		prop_coef = 4;
 		int_coef = 9;
@@ -1542,12 +1547,9 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
 		targ_cnt = 9;
 	} else {
 		DRM_ERROR("Invalid VCO\n");
-		return NULL;
+		return false;
 	}
 
-	memset(&crtc_state->dpll_hw_state, 0,
-	       sizeof(crtc_state->dpll_hw_state));
-
 	if (clock > 270000)
 		lanestagger = 0x18;
 	else if (clock > 135000)
@@ -1559,33 +1561,68 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
 	else
 		lanestagger = 0x02;
 
-	crtc_state->dpll_hw_state.ebb0 =
-		PORT_PLL_P1(clk_div.p1) | PORT_PLL_P2(clk_div.p2);
-	crtc_state->dpll_hw_state.pll0 = clk_div.m2_int;
-	crtc_state->dpll_hw_state.pll1 = PORT_PLL_N(clk_div.n);
-	crtc_state->dpll_hw_state.pll2 = clk_div.m2_frac;
+	dpll_hw_state->ebb0 = PORT_PLL_P1(clk_div->p1) | PORT_PLL_P2(clk_div->p2);
+	dpll_hw_state->pll0 = clk_div->m2_int;
+	dpll_hw_state->pll1 = PORT_PLL_N(clk_div->n);
+	dpll_hw_state->pll2 = clk_div->m2_frac;
 
-	if (clk_div.m2_frac_en)
-		crtc_state->dpll_hw_state.pll3 =
-			PORT_PLL_M2_FRAC_ENABLE;
+	if (clk_div->m2_frac_en)
+		dpll_hw_state->pll3 = PORT_PLL_M2_FRAC_ENABLE;
 
-	crtc_state->dpll_hw_state.pll6 =
-		prop_coef | PORT_PLL_INT_COEFF(int_coef);
-	crtc_state->dpll_hw_state.pll6 |=
-		PORT_PLL_GAIN_CTL(gain_ctl);
+	dpll_hw_state->pll6 = prop_coef | PORT_PLL_INT_COEFF(int_coef);
+	dpll_hw_state->pll6 |= PORT_PLL_GAIN_CTL(gain_ctl);
 
-	crtc_state->dpll_hw_state.pll8 = targ_cnt;
+	dpll_hw_state->pll8 = targ_cnt;
 
-	crtc_state->dpll_hw_state.pll9 = 5 << PORT_PLL_LOCK_THRESHOLD_SHIFT;
+	dpll_hw_state->pll9 = 5 << PORT_PLL_LOCK_THRESHOLD_SHIFT;
 
-	crtc_state->dpll_hw_state.pll10 =
+	dpll_hw_state->pll10 =
 		PORT_PLL_DCO_AMP(PORT_PLL_DCO_AMP_DEFAULT)
 		| PORT_PLL_DCO_AMP_OVR_EN_H;
 
-	crtc_state->dpll_hw_state.ebb4 = PORT_PLL_10BIT_CLK_ENABLE;
+	dpll_hw_state->ebb4 = PORT_PLL_10BIT_CLK_ENABLE;
+
+	dpll_hw_state->pcsdw12 = LANESTAGGER_STRAP_OVRD | lanestagger;
+
+	return true;
+}
+
+bool bxt_ddi_dp_set_dpll_hw_state(int clock,
+			  struct intel_dpll_hw_state *dpll_hw_state)
+{
+	struct bxt_clk_div clk_div = {0};
+
+	bxt_ddi_dp_pll_dividers(clock, &clk_div);
+
+	return bxt_ddi_set_dpll_hw_state(clock, &clk_div, dpll_hw_state);
+}
+
+static struct intel_shared_dpll *
+bxt_get_dpll(struct intel_crtc *crtc,
+		struct intel_crtc_state *crtc_state,
+		struct intel_encoder *encoder)
+{
+	struct bxt_clk_div clk_div = {0};
+	struct intel_dpll_hw_state dpll_hw_state = {0};
+	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
+	struct intel_digital_port *intel_dig_port;
+	struct intel_shared_dpll *pll;
+	int i, clock = crtc_state->port_clock;
+
+	if (encoder->type == INTEL_OUTPUT_HDMI
+	    && !bxt_ddi_hdmi_pll_dividers(crtc, crtc_state,
+					  clock, &clk_div))
+			return false;
+
+	if ((encoder->type == INTEL_OUTPUT_DP ||
+		encoder->type == INTEL_OUTPUT_EDP) &&
+		!bxt_ddi_dp_set_dpll_hw_state(clock, &dpll_hw_state))
+			return false;
+
+	memset(&crtc_state->dpll_hw_state, 0,
+	       sizeof(crtc_state->dpll_hw_state));
 
-	crtc_state->dpll_hw_state.pcsdw12 =
-		LANESTAGGER_STRAP_OVRD | lanestagger;
+	crtc_state->dpll_hw_state = dpll_hw_state;
 
 	intel_dig_port = enc_to_dig_port(&encoder->base);
 
drivers/gpu/drm/i915/intel_dpll_mgr.h +3 -0
index 89c5ada..11a85a5 100644
@@ -160,5 +160,8 @@ void intel_disable_shared_dpll(struct intel_crtc *crtc);
 void intel_shared_dpll_commit(struct drm_atomic_state *state);
 void intel_shared_dpll_init(struct drm_device *dev);
 
+/* BXT dpll related functions */
+bool bxt_ddi_dp_set_dpll_hw_state(int clock,
+			  struct intel_dpll_hw_state *dpll_hw_state);
 
 #endif /* _INTEL_DPLL_MGR_H_ */
Signature · 6 lines
1.9.1

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

PATCH v7 5/5 drm/i915/dp: Enable Upfront link training for typeC DP support on BXT

In reply to Durgadoss R

To support USB type C alternate DP mode, the display driver needs to know the number of lanes required by the DP panel as well as number of lanes that can be supported by the type-C cable. Sometimes, the type-C cable may limit the bandwidth even if Panel can support more lanes. To address these scenarios, the display driver will start link training with max lanes, and if that fails, the driver falls back to x2 lanes; and repeats this procedure for all bandwidth/lane configurations.

* Since link training is done before modeset only the port (and not pipe/planes) and its associated PLLs are enabled.
* On DP hotplug: Directly start link training on the DP encoder.
* On Connected boot scenarios: When booted with an LFP and a DP, sometimes BIOS brings up DP. In these cases, we disable the crtc and then do upfront link training; and bring it back up.
* All local changes made for upfront link training are reset to their previous values once it is done; so that the subsequent modeset is not aware of these changes.

Changes since v6:
* Fix some initialization bugs on link_rate (Jim Bride)
* Use link_rate (and not link_bw) for upfront (Ville)
* Make intel_dp_upfront*() as a vfunc (Ander)
* The train_set_valid variable in intel_dp was removed due to issues in fast link training. So, to indicate the link train status, move the channel_eq inside intel_dp.
Changes since v5:
* Moved retry logic in upfront to intel_dp.c so that it can be used for all platforms.
Changes since v4:
* Removed usage of crtc_state in upfront link training; Hence no need to find free crtc to do upfront now.
* Re-enable crtc if it was disabled for upfront.
* Use separate variables to track max lane count
and link rate found by upfront, without modifying the original DPCD read from panel.
Changes since v3:
* Fixed a return value on BXT check
* Reworked on top of bxt_ddi_pll_select split from Ander
* Renamed from ddi_upfront to bxt_upfront since the upfront logic includes BXT specific functions for now.
Changes since v2:
* Rebased on top of latest dpll_mgr.c code and latest HPD related clean ups.
* Corrected return values from upfront (Ander)
* Corrected atomic locking for upfront in intel_dp.c (Ville) Changes since v1:
* all pll related functions inside ddi.c

---
 drivers/gpu/drm/i915/intel_ddi.c              |  45 ++++++++
 drivers/gpu/drm/i915/intel_dp.c               | 155 +++++++++++++++++++++++++-
 drivers/gpu/drm/i915/intel_dp_link_training.c |   7 +-
 drivers/gpu/drm/i915/intel_drv.h              |  15 +++
 4 files changed, 213 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +45 -0
index ab1745a..3bad01b 100644
@@ -2356,6 +2356,51 @@ intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port)
 	return connector;
 }
 
+bool intel_bxt_upfront_link_train(struct intel_dp *intel_dp,
+				int clock, uint8_t lane_count)
+{
+	struct intel_connector *connector = intel_dp->attached_connector;
+	struct intel_encoder *encoder = connector->encoder;
+	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+	struct intel_shared_dpll *pll;
+	struct intel_shared_dpll_config tmp_pll_config;
+	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
+	enum intel_dpll_id dpll_id = (enum intel_dpll_id)dig_port->port;
+
+	/*
+	 * FIXME: Works only for BXT.
+	 * Select the required PLL. This works for platforms where
+	 * there is no shared DPLL.
+	 */
+	pll = &dev_priv->shared_dplls[dpll_id];
+	if (WARN_ON(pll->active_mask)) {
+		DRM_ERROR("Shared DPLL already in use. active_mask:%x\n", pll->active_mask);
+		return false;
+	}
+
+	tmp_pll_config = pll->config;
+
+	if (!bxt_ddi_dp_set_dpll_hw_state(clock, &pll->config.hw_state)) {
+		DRM_ERROR("Could not setup DPLL\n");
+		pll->config = tmp_pll_config;
+		return false;
+	}
+
+	/* Enable PLL followed by port */
+	pll->funcs.enable(dev_priv, pll);
+	intel_ddi_pre_enable_dp(encoder, clock, lane_count, pll);
+
+	DRM_DEBUG_KMS("Upfront link train %s: link_clock:%d lanes:%d\n",
+	intel_dp->channel_eq_status ? "Passed" : "Failed", clock, lane_count);
+
+	/* Disable port followed by PLL for next retry/clean up */
+	intel_ddi_post_disable(encoder);
+	pll->funcs.disable(dev_priv, pll);
+
+	pll->config = tmp_pll_config;
+	return intel_dp->channel_eq_status;
+}
+
 void intel_ddi_init(struct drm_device *dev, enum port port)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
drivers/gpu/drm/i915/intel_dp.c +150 -5

197 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dp_link_training.c +3 -4
index 60fb39c..e58442a 100644
@@ -232,7 +232,6 @@ static u32 intel_dp_training_pattern(struct intel_dp *intel_dp)
 static void
 intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 {
-	bool channel_eq = false;
 	int tries, cr_tries;
 	u32 training_pattern;
 
@@ -248,7 +247,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 
 	tries = 0;
 	cr_tries = 0;
-	channel_eq = false;
+	intel_dp->channel_eq_status = false;
 	for (;;) {
 		uint8_t link_status[DP_LINK_STATUS_SIZE];
 
@@ -276,7 +275,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 
 		if (drm_dp_channel_eq_ok(link_status,
 					 intel_dp->lane_count)) {
-			channel_eq = true;
+			intel_dp->channel_eq_status = true;
 			break;
 		}
 
@@ -302,7 +301,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 
 	intel_dp_set_idle_link_train(intel_dp);
 
-	if (channel_eq)
+	if (intel_dp->channel_eq_status)
 		DRM_DEBUG_KMS("Channel EQ done. DP Training successful\n");
 }
 
drivers/gpu/drm/i915/intel_drv.h +15 -0
index 16f70d4..88306fc 100644
@@ -851,6 +851,15 @@ struct intel_dp {
 	enum hdmi_force_audio force_audio;
 	bool limited_color_range;
 	bool color_range_auto;
+
+	/* Whether Channel Equalization was achieved during Link training */
+	bool channel_eq_status;
+
+	/* Upfront link train parameters */
+	int max_link_rate_upfront;
+	uint8_t max_lanes_upfront;
+	bool upfront_done;
+
 	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];
 	uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE];
 	uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
@@ -908,6 +917,10 @@ struct intel_dp {
 	/* This is called before a link training is starterd */
 	void (*prepare_link_retrain)(struct intel_dp *intel_dp);
 
+	/* For Upfront link training */
+	bool (*upfront_link_train)(struct intel_dp *intel_dp, int clock,
+				uint8_t lane_count);
+
 	/* Displayport compliance testing */
 	unsigned long compliance_test_type;
 	unsigned long compliance_test_data;
@@ -1127,6 +1140,8 @@ void intel_ddi_clock_get(struct intel_encoder *encoder,
 			 struct intel_crtc_state *pipe_config);
 void intel_ddi_set_vc_payload_alloc(struct drm_crtc *crtc, bool state);
 uint32_t ddi_signal_levels(struct intel_dp *intel_dp);
+bool intel_bxt_upfront_link_train(struct intel_dp *intel_dp,
+				int clock, uint8_t lane_count);
 
 /* intel_frontbuffer.c */
 void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
Signature · 6 lines
1.9.1

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

Re: [PATCHv7 5/5] drm/i915/dp: Enable Upfront link training for typeC DP support on BXT

Quoted 226 lines · Durgadoss R

To support USB type C alternate DP mode, the display driver needs to know the number of lanes required by the DP panel as well as number of lanes that can be supported by the type-C cable. Sometimes, the type-C cable may limit the bandwidth even if Panel can support more lanes. To address these scenarios, the display driver will start link training with max lanes, and if that fails, the driver falls back to x2 lanes; and repeats this procedure for all bandwidth/lane configurations.

* Since link training is done before modeset only the port (and not pipe/planes) and its associated PLLs are enabled.
* On DP hotplug: Directly start link training on the DP encoder.
* On Connected boot scenarios: When booted with an LFP and a DP, sometimes BIOS brings up DP. In these cases, we disable the crtc and then do upfront link training; and bring it back up.
* All local changes made for upfront link training are reset to their previous values once it is done; so that the subsequent modeset is not aware of these changes.

Changes since v6:
* Fix some initialization bugs on link_rate (Jim Bride)
* Use link_rate (and not link_bw) for upfront (Ville)
* Make intel_dp_upfront*() as a vfunc (Ander)
* The train_set_valid variable in intel_dp was removed due to issues in fast link training. So, to indicate the link train status, move the channel_eq inside intel_dp.
Changes since v5:
* Moved retry logic in upfront to intel_dp.c so that it can be used for all platforms.
Changes since v4:
* Removed usage of crtc_state in upfront link training; Hence no need to find free crtc to do upfront now.
* Re-enable crtc if it was disabled for upfront.
* Use separate variables to track max lane count
and link rate found by upfront, without modifying the original DPCD read from panel.
Changes since v3:
* Fixed a return value on BXT check
* Reworked on top of bxt_ddi_pll_select split from Ander
* Renamed from ddi_upfront to bxt_upfront since the upfront logic includes BXT specific functions for now.
Changes since v2:
* Rebased on top of latest dpll_mgr.c code and latest HPD related clean ups.
* Corrected return values from upfront (Ander)
* Corrected atomic locking for upfront in intel_dp.c (Ville) Changes since v1:
* all pll related functions inside ddi.c

---
 drivers/gpu/drm/i915/intel_ddi.c              |  45 ++++++++
 drivers/gpu/drm/i915/intel_dp.c               | 155 +++++++++++++++++++++++++-
 drivers/gpu/drm/i915/intel_dp_link_training.c |   7 +-
 drivers/gpu/drm/i915/intel_drv.h              |  15 +++
 4 files changed, 213 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +45 -0
index ab1745a..3bad01b 100644
@@ -2356,6 +2356,51 @@ intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port)
 	return connector;
 }
 
+bool intel_bxt_upfront_link_train(struct intel_dp *intel_dp,
+				int clock, uint8_t lane_count)
+{
+	struct intel_connector *connector = intel_dp->attached_connector;
+	struct intel_encoder *encoder = connector->encoder;
+	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+	struct intel_shared_dpll *pll;
+	struct intel_shared_dpll_config tmp_pll_config;
+	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
+	enum intel_dpll_id dpll_id = (enum intel_dpll_id)dig_port->port;
+
+	/*
+	 * FIXME: Works only for BXT.
+	 * Select the required PLL. This works for platforms where
+	 * there is no shared DPLL.
+	 */
+	pll = &dev_priv->shared_dplls[dpll_id];
+	if (WARN_ON(pll->active_mask)) {
+		DRM_ERROR("Shared DPLL already in use. active_mask:%x\n", pll->active_mask);
+		return false;
+	}
+
+	tmp_pll_config = pll->config;
+
+	if (!bxt_ddi_dp_set_dpll_hw_state(clock, &pll->config.hw_state)) {
+		DRM_ERROR("Could not setup DPLL\n");
+		pll->config = tmp_pll_config;
+		return false;
+	}
+
+	/* Enable PLL followed by port */
+	pll->funcs.enable(dev_priv, pll);
+	intel_ddi_pre_enable_dp(encoder, clock, lane_count, pll);
+
+	DRM_DEBUG_KMS("Upfront link train %s: link_clock:%d lanes:%d\n",
+	intel_dp->channel_eq_status ? "Passed" : "Failed", clock, lane_count);
+
+	/* Disable port followed by PLL for next retry/clean up */
+	intel_ddi_post_disable(encoder);
+	pll->funcs.disable(dev_priv, pll);
+
+	pll->config = tmp_pll_config;
+	return intel_dp->channel_eq_status;
+}
+
 void intel_ddi_init(struct drm_device *dev, enum port port)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
drivers/gpu/drm/i915/intel_dp.c +85 -2
index 817897c..394e62d 100644
@@ -153,12 +153,21 @@ intel_dp_max_link_bw(struct intel_dp  *intel_dp)
 static u8 intel_dp_max_lane_count(struct intel_dp *intel_dp)
 {
 	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
-	u8 source_max, sink_max;
+	u8 temp, source_max, sink_max;
 
 	source_max = intel_dig_port->max_lanes;
 	sink_max = drm_dp_max_lane_count(intel_dp->dpcd);
 
-	return min(source_max, sink_max);
+	temp = min(source_max, sink_max);
+
+	/*
+	 * Limit max lanes w.r.t to the max value found
+	 * using Upfront link training also.
+	 */
+	if (intel_dp->max_lanes_upfront)
+		return min(temp, intel_dp->max_lanes_upfront);
+	else
+		return temp;
 }
 
 /*
@@ -1380,6 +1389,15 @@ static int intel_dp_common_rates(struct intel_dp *intel_dp,
 	int source_len, sink_len;
 
 	sink_len = intel_dp_sink_rates(intel_dp, &sink_rates);
+
+	/* Cap sink rates w.r.t upfront values */
+	if (intel_dp->max_link_rate_upfront) {
+		int len = sink_len - 1;
+		while (len > 0 && sink_rates[len] > intel_dp->max_link_rate_upfront)
+			len--;
+		sink_len = len + 1;
+	}
+
 	source_len = intel_dp_source_rates(intel_dp, &source_rates);
 
 	return intersect_rates(source_rates, source_len,
@@ -4208,6 +4226,114 @@ intel_dp_unset_edid(struct intel_dp *intel_dp)
 	intel_dp->has_audio = false;
 }
 
+static int intel_dp_upfront_crtc_disable(struct intel_crtc *crtc,
+				struct drm_modeset_acquire_ctx *ctx,
+				bool enable)
+{
+	int ret;
+	struct drm_atomic_state *state;
+	struct intel_crtc_state *crtc_state;
+	struct drm_device *dev = crtc->base.dev;
+	enum pipe pipe = crtc->pipe;
+
+	state = drm_atomic_state_alloc(dev);
+	if (!state)
+		return -ENOMEM;
+
+	state->acquire_ctx = ctx;
+
+	crtc_state = intel_atomic_get_crtc_state(state, crtc);
+	if (IS_ERR(crtc_state)) {
+		ret = PTR_ERR(crtc_state);
+		drm_atomic_state_free(state);
+		return ret;
+	}
+
+	DRM_DEBUG_KMS("%sabling crtc %c %s upfront link train\n",
+			enable ? "En" : "Dis",
+			pipe_name(pipe),
+			enable ? "after" : "before");
+
+	crtc_state->base.active = enable;
+	ret = drm_atomic_commit(state);
+	if (ret)
+		drm_atomic_state_free(state);
+
+	return ret;
+}
+
+static bool intel_dp_upfront_link_train(struct intel_dp *intel_dp)
+{
+	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
+	struct intel_encoder *intel_encoder = &intel_dig_port->base;
+	struct drm_device *dev = intel_encoder->base.dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
+	struct drm_mode_config *config = &dev->mode_config;
+	struct drm_modeset_acquire_ctx ctx;
+	struct intel_crtc *intel_crtc;
+	struct drm_crtc *crtc = NULL;
+	int ret;
+	bool done = false;
+	uint8_t lane_count, max_lanes = 4;
+	int common_rates[DP_MAX_SUPPORTED_RATES] = {};
+	int clock, common_len;
+
+	common_len = intel_dp_common_rates(intel_dp, common_rates);
+	if (WARN_ON(common_len <= 0))
+		return true;
+
+	drm_modeset_acquire_init(&ctx, 0);
+retry:
+	ret = drm_modeset_lock(&config->connection_mutex, &ctx);
+	if (ret)
+		goto exit_fail;
+
+	if (intel_encoder->base.crtc) {
+		crtc = intel_encoder->base.crtc;
+

drivers/gpu/drm/i915/intel_dp.c intel_dp_unset_edid(struct intel_dp *intel_dp) · line 4303

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +10 -0
+		ret = drm_modeset_lock(&crtc->mutex, &ctx);
+		if (ret)
+			goto exit_fail;
+
+		ret = drm_modeset_lock(&crtc->primary->mutex, &ctx);
+		if (ret)
+			goto exit_fail;
+
+		intel_crtc = to_intel_crtc(crtc);
+		ret = intel_dp_upfront_crtc_disable(intel_crtc, &ctx, false);

Still seems wrong to just disable things here. And if we can't disable things, then what can we do?

I believe there are people working on a proper USB type-C framework, and once that materializes, I'm hoping it could just signal us whenever the cable mode gets changed. I assume the biggest mess for us would be how to detect that we're dealing with a type-C port, so that we'd know when to register for these notifications.

Anyway, once there's a proper framework for this stuff, I don't think we'd need any upfront link training snymore. I guess we could use it as a temporary thing, and garbage collect it if/when the proper USB stuff happens?

Quoted 165 lines
drivers/gpu/drm/i915/intel_dp.c +55 -3
+		if (ret)
+			goto exit_fail;
+	}
+
+	mutex_lock(&dev_priv->dpll_lock);
+
+	for (lane_count = max_lanes; lane_count >= 1 && !done; lane_count >>= 1) {
+		for (clock = common_len - 1; clock >= 0 && !done; clock--) {
+			done = intel_dp->upfront_link_train(intel_dp,
+					common_rates[clock], lane_count);
+			if (done) {
+				intel_dp->max_lanes_upfront = lane_count;
+				intel_dp->max_link_rate_upfront = common_rates[clock];
+				break;
+			}
+		}
+	}
+
+	mutex_unlock(&dev_priv->dpll_lock);
+
+	if (crtc)
+		ret = intel_dp_upfront_crtc_disable(intel_crtc, &ctx, true);
+
+exit_fail:
+	if (ret == -EDEADLK) {
+		drm_modeset_backoff(&ctx);
+		goto retry;
+	}
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
+	return done;
+}
+
 static void
 intel_dp_long_pulse(struct intel_connector *intel_connector)
 {
@@ -4218,7 +4344,7 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)
 	struct drm_device *dev = connector->dev;
 	enum drm_connector_status status;
 	enum intel_display_power_domain power_domain;
-	bool ret;
+	bool ret, do_upfront_link_train;
 	u8 sink_irq_vector;
 
 	power_domain = intel_display_port_aux_power_domain(intel_encoder);
@@ -4303,10 +4429,23 @@ intel_dp_long_pulse(struct intel_connector *intel_connector)
 			DRM_DEBUG_DRIVER("CP or sink specific irq unhandled\n");
 	}
 
+	/* Do not do upfront link train, if it is a compliance request */
+	do_upfront_link_train = intel_dp->upfront_link_train &&
+				!intel_dp->upfront_done &&
+				intel_encoder->type == INTEL_OUTPUT_DP &&
+				intel_dp->compliance_test_type != DP_TEST_LINK_TRAINING;
+
+	if (do_upfront_link_train) {
+		intel_dp->upfront_done = intel_dp_upfront_link_train(intel_dp);
+		if (!intel_dp->upfront_done)
+			status = connector_status_disconnected;
+	}
+
 out:
-	if ((status != connector_status_connected) &&
-	    (intel_dp->is_mst == false))
+	if (status != connector_status_connected && !intel_dp->is_mst) {
 		intel_dp_unset_edid(intel_dp);
+		intel_dp->upfront_done = false;
+	}
 
 	intel_display_power_put(to_i915(dev), power_domain);
 	return;
@@ -5562,6 +5701,12 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
 	if (type == DRM_MODE_CONNECTOR_eDP)
 		intel_encoder->type = INTEL_OUTPUT_EDP;
 
+	/* Initialize upfront link training vfunc for DP */
+	if (intel_encoder->type != INTEL_OUTPUT_EDP) {
+		if (IS_BROXTON(dev))
+			intel_dp->upfront_link_train = intel_bxt_upfront_link_train;
+	}
+
 	/* eDP only on port B and/or C on vlv/chv */
 	if (WARN_ON((IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) &&
 		    is_edp(intel_dp) && port != PORT_B && port != PORT_C))
drivers/gpu/drm/i915/intel_dp_link_training.c +3 -4
index 60fb39c..e58442a 100644
@@ -232,7 +232,6 @@ static u32 intel_dp_training_pattern(struct intel_dp *intel_dp)
 static void
 intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 {
-	bool channel_eq = false;
 	int tries, cr_tries;
 	u32 training_pattern;
 
@@ -248,7 +247,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 
 	tries = 0;
 	cr_tries = 0;
-	channel_eq = false;
+	intel_dp->channel_eq_status = false;
 	for (;;) {
 		uint8_t link_status[DP_LINK_STATUS_SIZE];
 
@@ -276,7 +275,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 
 		if (drm_dp_channel_eq_ok(link_status,
 					 intel_dp->lane_count)) {
-			channel_eq = true;
+			intel_dp->channel_eq_status = true;
 			break;
 		}
 
@@ -302,7 +301,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 
 	intel_dp_set_idle_link_train(intel_dp);
 
-	if (channel_eq)
+	if (intel_dp->channel_eq_status)
 		DRM_DEBUG_KMS("Channel EQ done. DP Training successful\n");
 }
 
drivers/gpu/drm/i915/intel_drv.h +15 -0
index 16f70d4..88306fc 100644
@@ -851,6 +851,15 @@ struct intel_dp {
 	enum hdmi_force_audio force_audio;
 	bool limited_color_range;
 	bool color_range_auto;
+
+	/* Whether Channel Equalization was achieved during Link training */
+	bool channel_eq_status;
+
+	/* Upfront link train parameters */
+	int max_link_rate_upfront;
+	uint8_t max_lanes_upfront;
+	bool upfront_done;
+
 	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];
 	uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE];
 	uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
@@ -908,6 +917,10 @@ struct intel_dp {
 	/* This is called before a link training is starterd */
 	void (*prepare_link_retrain)(struct intel_dp *intel_dp);
 
+	/* For Upfront link training */
+	bool (*upfront_link_train)(struct intel_dp *intel_dp, int clock,
+				uint8_t lane_count);
+
 	/* Displayport compliance testing */
 	unsigned long compliance_test_type;
 	unsigned long compliance_test_data;
@@ -1127,6 +1140,8 @@ void intel_ddi_clock_get(struct intel_encoder *encoder,
 			 struct intel_crtc_state *pipe_config);
 void intel_ddi_set_vc_payload_alloc(struct drm_crtc *crtc, bool state);
 uint32_t ddi_signal_levels(struct intel_dp *intel_dp);
+bool intel_bxt_upfront_link_train(struct intel_dp *intel_dp,
+				int clock, uint8_t lane_count);
 
 /* intel_frontbuffer.c */
 void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
Signature · 1 line
1.9.1
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

Re: [PATCHv7 5/5] drm/i915/dp: Enable Upfront link training for typeC DP support on BXT

Quoted 269 lines

-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Wednesday, July 27, 2016 3:28 PM
To: R, Durgadoss <[email protected]>
Cc: [email protected]; Conselvan De Oliveira, Ander <[email protected]>; Bride, Jim <[email protected]>; Navare, Manasi D <[email protected]>
Subject: Re: [PATCHv7 5/5] drm/i915/dp: Enable Upfront link training for typeC DP support on BXT

Quoted 49 lines · Durgadoss R

To support USB type C alternate DP mode, the display driver needs to know the number of lanes required by the DP panel as well as number of lanes that can be supported by the type-C cable. Sometimes, the type-C cable may limit the bandwidth even if Panel can support more lanes. To address these scenarios, the display driver will start link training with max lanes, and if that fails, the driver falls back to x2 lanes; and repeats this procedure for all bandwidth/lane configurations.

* Since link training is done before modeset only the port (and not pipe/planes) and its associated PLLs are enabled.
* On DP hotplug: Directly start link training on the DP encoder.
* On Connected boot scenarios: When booted with an LFP and a DP, sometimes BIOS brings up DP. In these cases, we disable the crtc and then do upfront link training; and bring it back up.
* All local changes made for upfront link training are reset to their previous values once it is done; so that the subsequent modeset is not aware of these changes.

Changes since v6:
* Fix some initialization bugs on link_rate (Jim Bride)
* Use link_rate (and not link_bw) for upfront (Ville)
* Make intel_dp_upfront*() as a vfunc (Ander)
* The train_set_valid variable in intel_dp was removed due to issues in fast link training. So, to indicate the link train status, move the channel_eq inside intel_dp.
Changes since v5:
* Moved retry logic in upfront to intel_dp.c so that it can be used for all platforms.
Changes since v4:
* Removed usage of crtc_state in upfront link training; Hence no need to find free crtc to do upfront now.
* Re-enable crtc if it was disabled for upfront.
* Use separate variables to track max lane count
and link rate found by upfront, without modifying the original DPCD read from panel.
Changes since v3:
* Fixed a return value on BXT check
* Reworked on top of bxt_ddi_pll_select split from Ander
* Renamed from ddi_upfront to bxt_upfront since the upfront logic includes BXT specific functions for now.
Changes since v2:
* Rebased on top of latest dpll_mgr.c code and latest HPD related clean ups.
* Corrected return values from upfront (Ander)
* Corrected atomic locking for upfront in intel_dp.c (Ville) Changes since v1:
* all pll related functions inside ddi.c

Quoted 4 lines
---
 drivers/gpu/drm/i915/intel_ddi.c              |  45 ++++++++
 drivers/gpu/drm/i915/intel_dp.c               | 155

+++++++++++++++++++++++++-

Review

Quoted 5 lines
 drivers/gpu/drm/i915/intel_dp_link_training.c |   7 +-
 drivers/gpu/drm/i915/intel_drv.h              |  15 +++
 4 files changed, 213 insertions(+), 9 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_ddi.c

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct

Quoted 4 lines

index ab1745a..3bad01b 100644

drivers/gpu/drm/i915/intel_ddi.c +0 -0
@@ -2356,6 +2356,51 @@ intel_ddi_init_hdmi_connector(struct

intel_digital_port *intel_dig_port)

Quoted 12 lines
drivers/gpu/drm/i915/intel_ddi.c +9 -0
 	return connector;
 }
 
+bool intel_bxt_upfront_link_train(struct intel_dp *intel_dp,
+				int clock, uint8_t lane_count)
+{
+	struct intel_connector *connector = intel_dp->attached_connector;
+	struct intel_encoder *encoder = connector->encoder;
+	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+	struct intel_shared_dpll *pll;
+	struct intel_shared_dpll_config tmp_pll_config;
+	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port)

Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +10 -0
+	enum intel_dpll_id dpll_id = (enum intel_dpll_id)dig_port->port;
+
+	/*
+	 * FIXME: Works only for BXT.
+	 * Select the required PLL. This works for platforms where
+	 * there is no shared DPLL.
+	 */
+	pll = &dev_priv->shared_dplls[dpll_id];
+	if (WARN_ON(pll->active_mask)) {
+		DRM_ERROR("Shared DPLL already in use.

active_mask:%x\n", pll->active_mask);

Quoted 6 lines
drivers/gpu/drm/i915/intel_ddi.c +6 -0
+		return false;
+	}
+
+	tmp_pll_config = pll->config;
+
+	if (!bxt_ddi_dp_set_dpll_hw_state(clock, &pll->config.hw_state)) {

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port)

Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +10 -0
+		DRM_ERROR("Could not setup DPLL\n");
+		pll->config = tmp_pll_config;
+		return false;
+	}
+
+	/* Enable PLL followed by port */
+	pll->funcs.enable(dev_priv, pll);
+	intel_ddi_pre_enable_dp(encoder, clock, lane_count, pll);
+
+	DRM_DEBUG_KMS("Upfront link train %s: link_clock:%d

lanes:%d\n",

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct · line 2394

Quoted 1 line
drivers/gpu/drm/i915/intel_ddi.c +1 -0
+	intel_dp->channel_eq_status ? "Passed" : "Failed", clock,

lane_count);

Review

Quoted 13 lines
drivers/gpu/drm/i915/intel_ddi.c +9 -0
+
+	/* Disable port followed by PLL for next retry/clean up */
+	intel_ddi_post_disable(encoder);
+	pll->funcs.disable(dev_priv, pll);
+
+	pll->config = tmp_pll_config;
+	return intel_dp->channel_eq_status;
+}
+
 void intel_ddi_init(struct drm_device *dev, enum port port)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_dp.c

drivers/gpu/drm/i915/intel_dp.c intel_dp_max_link_bw(struct intel_dp

Quoted 4 lines

index 817897c..394e62d 100644

drivers/gpu/drm/i915/intel_dp.c +0 -0
@@ -153,12 +153,21 @@ intel_dp_max_link_bw(struct intel_dp

*intel_dp)

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_common_rates(struct

Quoted 24 lines
drivers/gpu/drm/i915/intel_dp.c +11 -2
 static u8 intel_dp_max_lane_count(struct intel_dp *intel_dp)
 {
 	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
-	u8 source_max, sink_max;
+	u8 temp, source_max, sink_max;
 
 	source_max = intel_dig_port->max_lanes;
 	sink_max = drm_dp_max_lane_count(intel_dp->dpcd);
 
-	return min(source_max, sink_max);
+	temp = min(source_max, sink_max);
+
+	/*
+	 * Limit max lanes w.r.t to the max value found
+	 * using Upfront link training also.
+	 */
+	if (intel_dp->max_lanes_upfront)
+		return min(temp, intel_dp->max_lanes_upfront);
+	else
+		return temp;
 }
 
 /*
@@ -1380,6 +1389,15 @@ static int intel_dp_common_rates(struct

intel_dp *intel_dp,

Quoted 85 lines
drivers/gpu/drm/i915/intel_dp.c +9 -0
 	int source_len, sink_len;
 
 	sink_len = intel_dp_sink_rates(intel_dp, &sink_rates);
+
+	/* Cap sink rates w.r.t upfront values */
+	if (intel_dp->max_link_rate_upfront) {
+		int len = sink_len - 1;
+		while (len > 0 && sink_rates[len] > intel_dp-
 max_link_rate_upfront)
+			len--;
+		sink_len = len + 1;
+	}
+
 	source_len = intel_dp_source_rates(intel_dp, &source_rates);
 
drivers/gpu/drm/i915/intel_dp.c +65 -0
 	return intersect_rates(source_rates, source_len,
@@ -4208,6 +4226,114 @@ intel_dp_unset_edid(struct intel_dp *intel_dp)
 	intel_dp->has_audio = false;
 }
 
+static int intel_dp_upfront_crtc_disable(struct intel_crtc *crtc,
+				struct drm_modeset_acquire_ctx *ctx,
+				bool enable)
+{
+	int ret;
+	struct drm_atomic_state *state;
+	struct intel_crtc_state *crtc_state;
+	struct drm_device *dev = crtc->base.dev;
+	enum pipe pipe = crtc->pipe;
+
+	state = drm_atomic_state_alloc(dev);
+	if (!state)
+		return -ENOMEM;
+
+	state->acquire_ctx = ctx;
+
+	crtc_state = intel_atomic_get_crtc_state(state, crtc);
+	if (IS_ERR(crtc_state)) {
+		ret = PTR_ERR(crtc_state);
+		drm_atomic_state_free(state);
+		return ret;
+	}
+
+	DRM_DEBUG_KMS("%sabling crtc %c %s upfront link train\n",
+			enable ? "En" : "Dis",
+			pipe_name(pipe),
+			enable ? "after" : "before");
+
+	crtc_state->base.active = enable;
+	ret = drm_atomic_commit(state);
+	if (ret)
+		drm_atomic_state_free(state);
+
+	return ret;
+}
+
+static bool intel_dp_upfront_link_train(struct intel_dp *intel_dp)
+{
+	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
+	struct intel_encoder *intel_encoder = &intel_dig_port->base;
+	struct drm_device *dev = intel_encoder->base.dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
+	struct drm_mode_config *config = &dev->mode_config;
+	struct drm_modeset_acquire_ctx ctx;
+	struct intel_crtc *intel_crtc;
+	struct drm_crtc *crtc = NULL;
+	int ret;
+	bool done = false;
+	uint8_t lane_count, max_lanes = 4;
+	int common_rates[DP_MAX_SUPPORTED_RATES] = {};
+	int clock, common_len;
+
+	common_len = intel_dp_common_rates(intel_dp, common_rates);
+	if (WARN_ON(common_len <= 0))
+		return true;
+
+	drm_modeset_acquire_init(&ctx, 0);
+retry:
+	ret = drm_modeset_lock(&config->connection_mutex, &ctx);
+	if (ret)
+		goto exit_fail;
+
+	if (intel_encoder->base.crtc) {
+		crtc = intel_encoder->base.crtc;
+

drivers/gpu/drm/i915/intel_dp.c intel_dp_unset_edid(struct intel_dp *intel_dp) · line 4303

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +10 -0
+		ret = drm_modeset_lock(&crtc->mutex, &ctx);
+		if (ret)
+			goto exit_fail;
+
+		ret = drm_modeset_lock(&crtc->primary->mutex, &ctx);
+		if (ret)
+			goto exit_fail;
+
+		intel_crtc = to_intel_crtc(crtc);
+		ret = intel_dp_upfront_crtc_disable(intel_crtc, &ctx, false);

Still seems wrong to just disable things here. And if we can't disable things, then what can we do?

I believe there are people working on a proper USB type-C framework, and once that materializes, I'm hoping it could just signal us whenever the cable mode gets changed. I assume the biggest mess for us would be how to detect that we're dealing with a type-C port, so that we'd know when to register for these notifications.

Quoted 4 lines

Anyway, once there's a proper framework for this stuff, I don't think we'd need any upfront link training snymore. I guess we could use it as a temporary thing, and garbage collect it if/when the proper USB stuff happens?

Sure, I am fine with this as a temporary stuff..

Thanks,
Durga

Quoted 181 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
+		if (ret)
+			goto exit_fail;
+	}
+

drivers/gpu/drm/i915/intel_dp.c intel_dp_unset_edid(struct intel_dp *intel_dp)

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +9 -0
+	mutex_lock(&dev_priv->dpll_lock);
+
+	for (lane_count = max_lanes; lane_count >= 1 && !done; lane_count
 >= 1) {
+		for (clock = common_len - 1; clock >= 0 && !done; clock--) {
+			done = intel_dp->upfront_link_train(intel_dp,
+					common_rates[clock], lane_count);
+			if (done) {
+				intel_dp->max_lanes_upfront = lane_count;
+				intel_dp->max_link_rate_upfront =

common_rates[clock];

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector

Quoted 24 lines
drivers/gpu/drm/i915/intel_dp.c +20 -0
+				break;
+			}
+		}
+	}
+
+	mutex_unlock(&dev_priv->dpll_lock);
+
+	if (crtc)
+		ret = intel_dp_upfront_crtc_disable(intel_crtc, &ctx, true);
+
+exit_fail:
+	if (ret == -EDEADLK) {
+		drm_modeset_backoff(&ctx);
+		goto retry;
+	}
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
+	return done;
+}
+
 static void
 intel_dp_long_pulse(struct intel_connector *intel_connector)

{

drivers/gpu/drm/i915/intel_dp.c +0 -0
@@ -4218,7 +4344,7 @@ intel_dp_long_pulse(struct intel_connector

*intel_connector)

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector *intel_connector)

Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +1 -1
 	struct drm_device *dev = connector->dev;
 	enum drm_connector_status status;
 	enum intel_display_power_domain power_domain;
-	bool ret;
+	bool ret, do_upfront_link_train;
 	u8 sink_irq_vector;
 
 	power_domain =

intel_display_port_aux_power_domain(intel_encoder);

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector

Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +0 -0
@@ -4303,10 +4429,23 @@ intel_dp_long_pulse(struct intel_connector

*intel_connector)

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector · line 4429

Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +0 -0
 			DRM_DEBUG_DRIVER("CP or sink specific irq

unhandled\n");

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector *intel_connector)

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
 	}
 
+	/* Do not do upfront link train, if it is a compliance request */
+	do_upfront_link_train = intel_dp->upfront_link_train &&
+				!intel_dp->upfront_done &&
+				intel_encoder->type == INTEL_OUTPUT_DP

&&

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector · line 4436

Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +1 -0
+				intel_dp->compliance_test_type !=

DP_TEST_LINK_TRAINING;

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector *intel_connector)

Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +3 -0
+
+	if (do_upfront_link_train) {
+		intel_dp->upfront_done =

intel_dp_upfront_link_train(intel_dp);

drivers/gpu/drm/i915/intel_dp.c intel_dp_init_connector(struct intel_digital_port

Quoted 15 lines
drivers/gpu/drm/i915/intel_dp.c +7 -2
+		if (!intel_dp->upfront_done)
+			status = connector_status_disconnected;
+	}
+
 out:
-	if ((status != connector_status_connected) &&
-	    (intel_dp->is_mst == false))
+	if (status != connector_status_connected && !intel_dp->is_mst) {
 		intel_dp_unset_edid(intel_dp);
+		intel_dp->upfront_done = false;
+	}
 
 	intel_display_power_put(to_i915(dev), power_domain);
 	return;
@@ -5562,6 +5701,12 @@ intel_dp_init_connector(struct intel_digital_port

*intel_dig_port,

drivers/gpu/drm/i915/intel_dp.c intel_dp_init_connector(struct intel_digital_port *intel_dig_port,

Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
 	if (type == DRM_MODE_CONNECTOR_eDP)
 		intel_encoder->type = INTEL_OUTPUT_EDP;
 
+	/* Initialize upfront link training vfunc for DP */
+	if (intel_encoder->type != INTEL_OUTPUT_EDP) {
+		if (IS_BROXTON(dev))
+			intel_dp->upfront_link_train =

intel_bxt_upfront_link_train;

Review

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +2 -0
+	}
+
 	/* eDP only on port B and/or C on vlv/chv */
 	if (WARN_ON((IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) &&
 		    is_edp(intel_dp) && port != PORT_B && port != PORT_C))
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_dp_link_training.c

drivers/gpu/drm/i915/intel_dp_link_training.c static u32 intel_dp_training_pattern(struct intel_dp

Quoted 4 lines

index 60fb39c..e58442a 100644

drivers/gpu/drm/i915/intel_dp_link_training.c +0 -0
@@ -232,7 +232,6 @@ static u32 intel_dp_training_pattern(struct intel_dp

*intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct

Quoted 8 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +0 -1
 static void
 intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 {
-	bool channel_eq = false;
 	int tries, cr_tries;
 	u32 training_pattern;
 
@@ -248,7 +247,7 @@ intel_dp_link_training_channel_equalization(struct

intel_dp *intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct

Quoted 9 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 	tries = 0;
 	cr_tries = 0;
-	channel_eq = false;
+	intel_dp->channel_eq_status = false;
 	for (;;) {
 		uint8_t link_status[DP_LINK_STATUS_SIZE];
 
@@ -276,7 +275,7 @@ intel_dp_link_training_channel_equalization(struct

intel_dp *intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct

Quoted 9 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 		if (drm_dp_channel_eq_ok(link_status,
 					 intel_dp->lane_count)) {
-			channel_eq = true;
+			intel_dp->channel_eq_status = true;
 			break;
 		}
 
@@ -302,7 +301,7 @@ intel_dp_link_training_channel_equalization(struct

intel_dp *intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 	intel_dp_set_idle_link_train(intel_dp);
 
-	if (channel_eq)
+	if (intel_dp->channel_eq_status)
 		DRM_DEBUG_KMS("Channel EQ done. DP Training

successful\n");

Review

Quoted 3 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +0 -0
 }
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_drv.h

drivers/gpu/drm/i915/intel_drv.h void intel_ddi_clock_get(struct intel_encoder

Quoted 31 lines

index 16f70d4..88306fc 100644

drivers/gpu/drm/i915/intel_drv.h +13 -0
@@ -851,6 +851,15 @@ struct intel_dp {
 	enum hdmi_force_audio force_audio;
 	bool limited_color_range;
 	bool color_range_auto;
+
+	/* Whether Channel Equalization was achieved during Link training */
+	bool channel_eq_status;
+
+	/* Upfront link train parameters */
+	int max_link_rate_upfront;
+	uint8_t max_lanes_upfront;
+	bool upfront_done;
+
 	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];
 	uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE];
 	uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
@@ -908,6 +917,10 @@ struct intel_dp {
 	/* This is called before a link training is starterd */
 	void (*prepare_link_retrain)(struct intel_dp *intel_dp);
 
+	/* For Upfront link training */
+	bool (*upfront_link_train)(struct intel_dp *intel_dp, int clock,
+				uint8_t lane_count);
+
 	/* Displayport compliance testing */
 	unsigned long compliance_test_type;
 	unsigned long compliance_test_data;
@@ -1127,6 +1140,8 @@ void intel_ddi_clock_get(struct intel_encoder

*encoder,

Quoted 6 lines
drivers/gpu/drm/i915/intel_drv.h +2 -0
 			 struct intel_crtc_state *pipe_config);
 void intel_ddi_set_vc_payload_alloc(struct drm_crtc *crtc, bool state);
 uint32_t ddi_signal_levels(struct intel_dp *intel_dp);
+bool intel_bxt_upfront_link_train(struct intel_dp *intel_dp,
+				int clock, uint8_t lane_count);
 
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_drv.h +0 -1
 /* intel_frontbuffer.c */
 void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
--

1.9.1

--
Ville Syrjälä
Intel OTC

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

#8 lore raw

Re: [PATCHv7 5/5] drm/i915/dp: Enable Upfront link training for typeC DP support on BXT

Quoted 267 lines · Durgadoss
Quoted 267 lines

-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Wednesday, July 27, 2016 3:28 PM
To: R, Durgadoss <[email protected]>
Cc: [email protected]; Conselvan De Oliveira, Ander <[email protected]>; Bride, Jim <[email protected]>; Navare, Manasi D <[email protected]>
Subject: Re: [PATCHv7 5/5] drm/i915/dp: Enable Upfront link training for typeC DP support on BXT

Quoted 49 lines · Durgadoss R

To support USB type C alternate DP mode, the display driver needs to know the number of lanes required by the DP panel as well as number of lanes that can be supported by the type-C cable. Sometimes, the type-C cable may limit the bandwidth even if Panel can support more lanes. To address these scenarios, the display driver will start link training with max lanes, and if that fails, the driver falls back to x2 lanes; and repeats this procedure for all bandwidth/lane configurations.

* Since link training is done before modeset only the port (and not pipe/planes) and its associated PLLs are enabled.
* On DP hotplug: Directly start link training on the DP encoder.
* On Connected boot scenarios: When booted with an LFP and a DP, sometimes BIOS brings up DP. In these cases, we disable the crtc and then do upfront link training; and bring it back up.
* All local changes made for upfront link training are reset to their previous values once it is done; so that the subsequent modeset is not aware of these changes.

Changes since v6:
* Fix some initialization bugs on link_rate (Jim Bride)
* Use link_rate (and not link_bw) for upfront (Ville)
* Make intel_dp_upfront*() as a vfunc (Ander)
* The train_set_valid variable in intel_dp was removed due to issues in fast link training. So, to indicate the link train status, move the channel_eq inside intel_dp.
Changes since v5:
* Moved retry logic in upfront to intel_dp.c so that it can be used for all platforms.
Changes since v4:
* Removed usage of crtc_state in upfront link training; Hence no need to find free crtc to do upfront now.
* Re-enable crtc if it was disabled for upfront.
* Use separate variables to track max lane count
and link rate found by upfront, without modifying the original DPCD read from panel.
Changes since v3:
* Fixed a return value on BXT check
* Reworked on top of bxt_ddi_pll_select split from Ander
* Renamed from ddi_upfront to bxt_upfront since the upfront logic includes BXT specific functions for now.
Changes since v2:
* Rebased on top of latest dpll_mgr.c code and latest HPD related clean ups.
* Corrected return values from upfront (Ander)
* Corrected atomic locking for upfront in intel_dp.c (Ville) Changes since v1:
* all pll related functions inside ddi.c

Quoted 4 lines
---
 drivers/gpu/drm/i915/intel_ddi.c              |  45 ++++++++
 drivers/gpu/drm/i915/intel_dp.c               | 155

+++++++++++++++++++++++++-

Review

Quoted 5 lines
 drivers/gpu/drm/i915/intel_dp_link_training.c |   7 +-
 drivers/gpu/drm/i915/intel_drv.h              |  15 +++
 4 files changed, 213 insertions(+), 9 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_ddi.c

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct

Quoted 4 lines

index ab1745a..3bad01b 100644

drivers/gpu/drm/i915/intel_ddi.c +0 -0
@@ -2356,6 +2356,51 @@ intel_ddi_init_hdmi_connector(struct

intel_digital_port *intel_dig_port)

Quoted 12 lines
drivers/gpu/drm/i915/intel_ddi.c +9 -0
 	return connector;
 }
 
+bool intel_bxt_upfront_link_train(struct intel_dp *intel_dp,
+				int clock, uint8_t lane_count)
+{
+	struct intel_connector *connector = intel_dp->attached_connector;
+	struct intel_encoder *encoder = connector->encoder;
+	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+	struct intel_shared_dpll *pll;
+	struct intel_shared_dpll_config tmp_pll_config;
+	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port)

Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +10 -0
+	enum intel_dpll_id dpll_id = (enum intel_dpll_id)dig_port->port;
+
+	/*
+	 * FIXME: Works only for BXT.
+	 * Select the required PLL. This works for platforms where
+	 * there is no shared DPLL.
+	 */
+	pll = &dev_priv->shared_dplls[dpll_id];
+	if (WARN_ON(pll->active_mask)) {
+		DRM_ERROR("Shared DPLL already in use.

active_mask:%x\n", pll->active_mask);

Quoted 6 lines
drivers/gpu/drm/i915/intel_ddi.c +6 -0
+		return false;
+	}
+
+	tmp_pll_config = pll->config;
+
+	if (!bxt_ddi_dp_set_dpll_hw_state(clock, &pll->config.hw_state)) {

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port)

Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +10 -0
+		DRM_ERROR("Could not setup DPLL\n");
+		pll->config = tmp_pll_config;
+		return false;
+	}
+
+	/* Enable PLL followed by port */
+	pll->funcs.enable(dev_priv, pll);
+	intel_ddi_pre_enable_dp(encoder, clock, lane_count, pll);
+
+	DRM_DEBUG_KMS("Upfront link train %s: link_clock:%d

lanes:%d\n",

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct · line 2394

Quoted 1 line
drivers/gpu/drm/i915/intel_ddi.c +1 -0
+	intel_dp->channel_eq_status ? "Passed" : "Failed", clock,

lane_count);

Review

Quoted 13 lines
drivers/gpu/drm/i915/intel_ddi.c +9 -0
+
+	/* Disable port followed by PLL for next retry/clean up */
+	intel_ddi_post_disable(encoder);
+	pll->funcs.disable(dev_priv, pll);
+
+	pll->config = tmp_pll_config;
+	return intel_dp->channel_eq_status;
+}
+
 void intel_ddi_init(struct drm_device *dev, enum port port)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_dp.c

drivers/gpu/drm/i915/intel_dp.c intel_dp_max_link_bw(struct intel_dp

Quoted 4 lines

index 817897c..394e62d 100644

drivers/gpu/drm/i915/intel_dp.c +0 -0
@@ -153,12 +153,21 @@ intel_dp_max_link_bw(struct intel_dp

*intel_dp)

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_common_rates(struct

Quoted 24 lines
drivers/gpu/drm/i915/intel_dp.c +11 -2
 static u8 intel_dp_max_lane_count(struct intel_dp *intel_dp)
 {
 	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
-	u8 source_max, sink_max;
+	u8 temp, source_max, sink_max;
 
 	source_max = intel_dig_port->max_lanes;
 	sink_max = drm_dp_max_lane_count(intel_dp->dpcd);
 
-	return min(source_max, sink_max);
+	temp = min(source_max, sink_max);
+
+	/*
+	 * Limit max lanes w.r.t to the max value found
+	 * using Upfront link training also.
+	 */
+	if (intel_dp->max_lanes_upfront)
+		return min(temp, intel_dp->max_lanes_upfront);
+	else
+		return temp;
 }
 
 /*
@@ -1380,6 +1389,15 @@ static int intel_dp_common_rates(struct

intel_dp *intel_dp,

Quoted 85 lines
drivers/gpu/drm/i915/intel_dp.c +9 -0
 	int source_len, sink_len;
 
 	sink_len = intel_dp_sink_rates(intel_dp, &sink_rates);
+
+	/* Cap sink rates w.r.t upfront values */
+	if (intel_dp->max_link_rate_upfront) {
+		int len = sink_len - 1;
+		while (len > 0 && sink_rates[len] > intel_dp-
 max_link_rate_upfront)
+			len--;
+		sink_len = len + 1;
+	}
+
 	source_len = intel_dp_source_rates(intel_dp, &source_rates);
 
drivers/gpu/drm/i915/intel_dp.c +65 -0
 	return intersect_rates(source_rates, source_len,
@@ -4208,6 +4226,114 @@ intel_dp_unset_edid(struct intel_dp *intel_dp)
 	intel_dp->has_audio = false;
 }
 
+static int intel_dp_upfront_crtc_disable(struct intel_crtc *crtc,
+				struct drm_modeset_acquire_ctx *ctx,
+				bool enable)
+{
+	int ret;
+	struct drm_atomic_state *state;
+	struct intel_crtc_state *crtc_state;
+	struct drm_device *dev = crtc->base.dev;
+	enum pipe pipe = crtc->pipe;
+
+	state = drm_atomic_state_alloc(dev);
+	if (!state)
+		return -ENOMEM;
+
+	state->acquire_ctx = ctx;
+
+	crtc_state = intel_atomic_get_crtc_state(state, crtc);
+	if (IS_ERR(crtc_state)) {
+		ret = PTR_ERR(crtc_state);
+		drm_atomic_state_free(state);
+		return ret;
+	}
+
+	DRM_DEBUG_KMS("%sabling crtc %c %s upfront link train\n",
+			enable ? "En" : "Dis",
+			pipe_name(pipe),
+			enable ? "after" : "before");
+
+	crtc_state->base.active = enable;
+	ret = drm_atomic_commit(state);
+	if (ret)
+		drm_atomic_state_free(state);
+
+	return ret;
+}
+
+static bool intel_dp_upfront_link_train(struct intel_dp *intel_dp)
+{
+	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
+	struct intel_encoder *intel_encoder = &intel_dig_port->base;
+	struct drm_device *dev = intel_encoder->base.dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
+	struct drm_mode_config *config = &dev->mode_config;
+	struct drm_modeset_acquire_ctx ctx;
+	struct intel_crtc *intel_crtc;
+	struct drm_crtc *crtc = NULL;
+	int ret;
+	bool done = false;
+	uint8_t lane_count, max_lanes = 4;
+	int common_rates[DP_MAX_SUPPORTED_RATES] = {};
+	int clock, common_len;
+
+	common_len = intel_dp_common_rates(intel_dp, common_rates);
+	if (WARN_ON(common_len <= 0))
+		return true;
+
+	drm_modeset_acquire_init(&ctx, 0);
+retry:
+	ret = drm_modeset_lock(&config->connection_mutex, &ctx);
+	if (ret)
+		goto exit_fail;
+
+	if (intel_encoder->base.crtc) {
+		crtc = intel_encoder->base.crtc;
+

drivers/gpu/drm/i915/intel_dp.c intel_dp_unset_edid(struct intel_dp *intel_dp) · line 4303

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +10 -0
+		ret = drm_modeset_lock(&crtc->mutex, &ctx);
+		if (ret)
+			goto exit_fail;
+
+		ret = drm_modeset_lock(&crtc->primary->mutex, &ctx);
+		if (ret)
+			goto exit_fail;
+
+		intel_crtc = to_intel_crtc(crtc);
+		ret = intel_dp_upfront_crtc_disable(intel_crtc, &ctx, false);

Still seems wrong to just disable things here. And if we can't disable things, then what can we do?

I believe there are people working on a proper USB type-C framework, and once that materializes, I'm hoping it could just signal us whenever the cable mode gets changed. I assume the biggest mess for us would be how to detect that we're dealing with a type-C port, so that we'd know when to register for these notifications.

Quoted 6 lines
Quoted 4 lines

Anyway, once there's a proper framework for this stuff, I don't think we'd need any upfront link training snymore. I guess we could use it as a temporary thing, and garbage collect it if/when the proper USB stuff happens?

Sure, I am fine with this as a temporary stuff..

Honestly, I think we should keep the upfront link training support in place for the long term. There are advantages to knowing the maximum lane count and link rate that we could successfully train early (vs. assuming the max that DP supports; we've seen cables and dongles that limit lane count or link rate to a level lower than what the DP spec calls out.) We can do a better job of making sure that we will have enough link bandwidth to support a given mode by knowing the highest link configuration that we can successfully train at. It also gives us a more sane default for the DP MST case, rather than assuming the maximum lane count and link rate (which, again, may not be trainable in all cases.)

Jim

Quoted 193 lines

Thanks,
Durga

Quoted 181 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
+		if (ret)
+			goto exit_fail;
+	}
+

drivers/gpu/drm/i915/intel_dp.c intel_dp_unset_edid(struct intel_dp *intel_dp)

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +9 -0
+	mutex_lock(&dev_priv->dpll_lock);
+
+	for (lane_count = max_lanes; lane_count >= 1 && !done; lane_count
 >= 1) {
+		for (clock = common_len - 1; clock >= 0 && !done; clock--) {
+			done = intel_dp->upfront_link_train(intel_dp,
+					common_rates[clock], lane_count);
+			if (done) {
+				intel_dp->max_lanes_upfront = lane_count;
+				intel_dp->max_link_rate_upfront =

common_rates[clock];

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector

Quoted 24 lines
drivers/gpu/drm/i915/intel_dp.c +20 -0
+				break;
+			}
+		}
+	}
+
+	mutex_unlock(&dev_priv->dpll_lock);
+
+	if (crtc)
+		ret = intel_dp_upfront_crtc_disable(intel_crtc, &ctx, true);
+
+exit_fail:
+	if (ret == -EDEADLK) {
+		drm_modeset_backoff(&ctx);
+		goto retry;
+	}
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
+	return done;
+}
+
 static void
 intel_dp_long_pulse(struct intel_connector *intel_connector)

{

drivers/gpu/drm/i915/intel_dp.c +0 -0
@@ -4218,7 +4344,7 @@ intel_dp_long_pulse(struct intel_connector

*intel_connector)

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector *intel_connector)

Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +1 -1
 	struct drm_device *dev = connector->dev;
 	enum drm_connector_status status;
 	enum intel_display_power_domain power_domain;
-	bool ret;
+	bool ret, do_upfront_link_train;
 	u8 sink_irq_vector;
 
 	power_domain =

intel_display_port_aux_power_domain(intel_encoder);

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector

Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +0 -0
@@ -4303,10 +4429,23 @@ intel_dp_long_pulse(struct intel_connector

*intel_connector)

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector · line 4429

Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +0 -0
 			DRM_DEBUG_DRIVER("CP or sink specific irq

unhandled\n");

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector *intel_connector)

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
 	}
 
+	/* Do not do upfront link train, if it is a compliance request */
+	do_upfront_link_train = intel_dp->upfront_link_train &&
+				!intel_dp->upfront_done &&
+				intel_encoder->type == INTEL_OUTPUT_DP

&&

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector · line 4436

Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +1 -0
+				intel_dp->compliance_test_type !=

DP_TEST_LINK_TRAINING;

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector *intel_connector)

Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +3 -0
+
+	if (do_upfront_link_train) {
+		intel_dp->upfront_done =

intel_dp_upfront_link_train(intel_dp);

drivers/gpu/drm/i915/intel_dp.c intel_dp_init_connector(struct intel_digital_port

Quoted 15 lines
drivers/gpu/drm/i915/intel_dp.c +7 -2
+		if (!intel_dp->upfront_done)
+			status = connector_status_disconnected;
+	}
+
 out:
-	if ((status != connector_status_connected) &&
-	    (intel_dp->is_mst == false))
+	if (status != connector_status_connected && !intel_dp->is_mst) {
 		intel_dp_unset_edid(intel_dp);
+		intel_dp->upfront_done = false;
+	}
 
 	intel_display_power_put(to_i915(dev), power_domain);
 	return;
@@ -5562,6 +5701,12 @@ intel_dp_init_connector(struct intel_digital_port

*intel_dig_port,

drivers/gpu/drm/i915/intel_dp.c intel_dp_init_connector(struct intel_digital_port *intel_dig_port,

Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
 	if (type == DRM_MODE_CONNECTOR_eDP)
 		intel_encoder->type = INTEL_OUTPUT_EDP;
 
+	/* Initialize upfront link training vfunc for DP */
+	if (intel_encoder->type != INTEL_OUTPUT_EDP) {
+		if (IS_BROXTON(dev))
+			intel_dp->upfront_link_train =

intel_bxt_upfront_link_train;

Review

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +2 -0
+	}
+
 	/* eDP only on port B and/or C on vlv/chv */
 	if (WARN_ON((IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) &&
 		    is_edp(intel_dp) && port != PORT_B && port != PORT_C))
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_dp_link_training.c

drivers/gpu/drm/i915/intel_dp_link_training.c static u32 intel_dp_training_pattern(struct intel_dp

Quoted 4 lines

index 60fb39c..e58442a 100644

drivers/gpu/drm/i915/intel_dp_link_training.c +0 -0
@@ -232,7 +232,6 @@ static u32 intel_dp_training_pattern(struct intel_dp

*intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct

Quoted 8 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +0 -1
 static void
 intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 {
-	bool channel_eq = false;
 	int tries, cr_tries;
 	u32 training_pattern;
 
@@ -248,7 +247,7 @@ intel_dp_link_training_channel_equalization(struct

intel_dp *intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct

Quoted 9 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 	tries = 0;
 	cr_tries = 0;
-	channel_eq = false;
+	intel_dp->channel_eq_status = false;
 	for (;;) {
 		uint8_t link_status[DP_LINK_STATUS_SIZE];
 
@@ -276,7 +275,7 @@ intel_dp_link_training_channel_equalization(struct

intel_dp *intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct

Quoted 9 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 		if (drm_dp_channel_eq_ok(link_status,
 					 intel_dp->lane_count)) {
-			channel_eq = true;
+			intel_dp->channel_eq_status = true;
 			break;
 		}
 
@@ -302,7 +301,7 @@ intel_dp_link_training_channel_equalization(struct

intel_dp *intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 	intel_dp_set_idle_link_train(intel_dp);
 
-	if (channel_eq)
+	if (intel_dp->channel_eq_status)
 		DRM_DEBUG_KMS("Channel EQ done. DP Training

successful\n");

Review

Quoted 3 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +0 -0
 }
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_drv.h

drivers/gpu/drm/i915/intel_drv.h void intel_ddi_clock_get(struct intel_encoder

Quoted 31 lines

index 16f70d4..88306fc 100644

drivers/gpu/drm/i915/intel_drv.h +13 -0
@@ -851,6 +851,15 @@ struct intel_dp {
 	enum hdmi_force_audio force_audio;
 	bool limited_color_range;
 	bool color_range_auto;
+
+	/* Whether Channel Equalization was achieved during Link training */
+	bool channel_eq_status;
+
+	/* Upfront link train parameters */
+	int max_link_rate_upfront;
+	uint8_t max_lanes_upfront;
+	bool upfront_done;
+
 	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];
 	uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE];
 	uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
@@ -908,6 +917,10 @@ struct intel_dp {
 	/* This is called before a link training is starterd */
 	void (*prepare_link_retrain)(struct intel_dp *intel_dp);
 
+	/* For Upfront link training */
+	bool (*upfront_link_train)(struct intel_dp *intel_dp, int clock,
+				uint8_t lane_count);
+
 	/* Displayport compliance testing */
 	unsigned long compliance_test_type;
 	unsigned long compliance_test_data;
@@ -1127,6 +1140,8 @@ void intel_ddi_clock_get(struct intel_encoder

*encoder,

Quoted 6 lines
drivers/gpu/drm/i915/intel_drv.h +2 -0
 			 struct intel_crtc_state *pipe_config);
 void intel_ddi_set_vc_payload_alloc(struct drm_crtc *crtc, bool state);
 uint32_t ddi_signal_levels(struct intel_dp *intel_dp);
+bool intel_bxt_upfront_link_train(struct intel_dp *intel_dp,
+				int clock, uint8_t lane_count);
 
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_drv.h +0 -1
 /* intel_frontbuffer.c */
 void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
--

1.9.1

--
Ville Syrjälä
Intel OTC

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

#9 lore raw

Re: [PATCHv7 5/5] drm/i915/dp: Enable Upfront link training for typeC DP support on BXT

In reply to Ville Syrjälä

Hi Ville,

Thanks for looking at it..

Quoted 252 lines

-----Original Message-----
From: Ville Syrjälä [mailto:[email protected]]
Sent: Wednesday, July 27, 2016 3:28 PM
To: R, Durgadoss <[email protected]>
Cc: [email protected]; Conselvan De Oliveira, Ander <[email protected]>; Bride, Jim <[email protected]>; Navare, Manasi D <[email protected]>
Subject: Re: [PATCHv7 5/5] drm/i915/dp: Enable Upfront link training for typeC DP support on BXT

Quoted 49 lines · Durgadoss R

To support USB type C alternate DP mode, the display driver needs to know the number of lanes required by the DP panel as well as number of lanes that can be supported by the type-C cable. Sometimes, the type-C cable may limit the bandwidth even if Panel can support more lanes. To address these scenarios, the display driver will start link training with max lanes, and if that fails, the driver falls back to x2 lanes; and repeats this procedure for all bandwidth/lane configurations.

* Since link training is done before modeset only the port (and not pipe/planes) and its associated PLLs are enabled.
* On DP hotplug: Directly start link training on the DP encoder.
* On Connected boot scenarios: When booted with an LFP and a DP, sometimes BIOS brings up DP. In these cases, we disable the crtc and then do upfront link training; and bring it back up.
* All local changes made for upfront link training are reset to their previous values once it is done; so that the subsequent modeset is not aware of these changes.

Changes since v6:
* Fix some initialization bugs on link_rate (Jim Bride)
* Use link_rate (and not link_bw) for upfront (Ville)
* Make intel_dp_upfront*() as a vfunc (Ander)
* The train_set_valid variable in intel_dp was removed due to issues in fast link training. So, to indicate the link train status, move the channel_eq inside intel_dp.
Changes since v5:
* Moved retry logic in upfront to intel_dp.c so that it can be used for all platforms.
Changes since v4:
* Removed usage of crtc_state in upfront link training; Hence no need to find free crtc to do upfront now.
* Re-enable crtc if it was disabled for upfront.
* Use separate variables to track max lane count
and link rate found by upfront, without modifying the original DPCD read from panel.
Changes since v3:
* Fixed a return value on BXT check
* Reworked on top of bxt_ddi_pll_select split from Ander
* Renamed from ddi_upfront to bxt_upfront since the upfront logic includes BXT specific functions for now.
Changes since v2:
* Rebased on top of latest dpll_mgr.c code and latest HPD related clean ups.
* Corrected return values from upfront (Ander)
* Corrected atomic locking for upfront in intel_dp.c (Ville) Changes since v1:
* all pll related functions inside ddi.c

Quoted 4 lines
---
 drivers/gpu/drm/i915/intel_ddi.c              |  45 ++++++++
 drivers/gpu/drm/i915/intel_dp.c               | 155

+++++++++++++++++++++++++-

Review

Quoted 5 lines
 drivers/gpu/drm/i915/intel_dp_link_training.c |   7 +-
 drivers/gpu/drm/i915/intel_drv.h              |  15 +++
 4 files changed, 213 insertions(+), 9 deletions(-)
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_ddi.c

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct

Quoted 4 lines

index ab1745a..3bad01b 100644

drivers/gpu/drm/i915/intel_ddi.c +0 -0
@@ -2356,6 +2356,51 @@ intel_ddi_init_hdmi_connector(struct

intel_digital_port *intel_dig_port)

Quoted 12 lines
drivers/gpu/drm/i915/intel_ddi.c +9 -0
 	return connector;
 }
 
+bool intel_bxt_upfront_link_train(struct intel_dp *intel_dp,
+				int clock, uint8_t lane_count)
+{
+	struct intel_connector *connector = intel_dp->attached_connector;
+	struct intel_encoder *encoder = connector->encoder;
+	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
+	struct intel_shared_dpll *pll;
+	struct intel_shared_dpll_config tmp_pll_config;
+	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port)

Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +10 -0
+	enum intel_dpll_id dpll_id = (enum intel_dpll_id)dig_port->port;
+
+	/*
+	 * FIXME: Works only for BXT.
+	 * Select the required PLL. This works for platforms where
+	 * there is no shared DPLL.
+	 */
+	pll = &dev_priv->shared_dplls[dpll_id];
+	if (WARN_ON(pll->active_mask)) {
+		DRM_ERROR("Shared DPLL already in use.

active_mask:%x\n", pll->active_mask);

Quoted 6 lines
drivers/gpu/drm/i915/intel_ddi.c +6 -0
+		return false;
+	}
+
+	tmp_pll_config = pll->config;
+
+	if (!bxt_ddi_dp_set_dpll_hw_state(clock, &pll->config.hw_state)) {

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct intel_digital_port *intel_dig_port)

Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +10 -0
+		DRM_ERROR("Could not setup DPLL\n");
+		pll->config = tmp_pll_config;
+		return false;
+	}
+
+	/* Enable PLL followed by port */
+	pll->funcs.enable(dev_priv, pll);
+	intel_ddi_pre_enable_dp(encoder, clock, lane_count, pll);
+
+	DRM_DEBUG_KMS("Upfront link train %s: link_clock:%d

lanes:%d\n",

drivers/gpu/drm/i915/intel_ddi.c intel_ddi_init_hdmi_connector(struct · line 2394

Quoted 1 line
drivers/gpu/drm/i915/intel_ddi.c +1 -0
+	intel_dp->channel_eq_status ? "Passed" : "Failed", clock,

lane_count);

Review

Quoted 13 lines
drivers/gpu/drm/i915/intel_ddi.c +9 -0
+
+	/* Disable port followed by PLL for next retry/clean up */
+	intel_ddi_post_disable(encoder);
+	pll->funcs.disable(dev_priv, pll);
+
+	pll->config = tmp_pll_config;
+	return intel_dp->channel_eq_status;
+}
+
 void intel_ddi_init(struct drm_device *dev, enum port port)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_dp.c

drivers/gpu/drm/i915/intel_dp.c intel_dp_max_link_bw(struct intel_dp

Quoted 4 lines

index 817897c..394e62d 100644

drivers/gpu/drm/i915/intel_dp.c +0 -0
@@ -153,12 +153,21 @@ intel_dp_max_link_bw(struct intel_dp

*intel_dp)

drivers/gpu/drm/i915/intel_dp.c static int intel_dp_common_rates(struct

Quoted 24 lines
drivers/gpu/drm/i915/intel_dp.c +11 -2
 static u8 intel_dp_max_lane_count(struct intel_dp *intel_dp)
 {
 	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
-	u8 source_max, sink_max;
+	u8 temp, source_max, sink_max;
 
 	source_max = intel_dig_port->max_lanes;
 	sink_max = drm_dp_max_lane_count(intel_dp->dpcd);
 
-	return min(source_max, sink_max);
+	temp = min(source_max, sink_max);
+
+	/*
+	 * Limit max lanes w.r.t to the max value found
+	 * using Upfront link training also.
+	 */
+	if (intel_dp->max_lanes_upfront)
+		return min(temp, intel_dp->max_lanes_upfront);
+	else
+		return temp;
 }
 
 /*
@@ -1380,6 +1389,15 @@ static int intel_dp_common_rates(struct

intel_dp *intel_dp,

Quoted 90 lines
drivers/gpu/drm/i915/intel_dp.c +9 -0
 	int source_len, sink_len;
 
 	sink_len = intel_dp_sink_rates(intel_dp, &sink_rates);
+
+	/* Cap sink rates w.r.t upfront values */
+	if (intel_dp->max_link_rate_upfront) {
+		int len = sink_len - 1;
+		while (len > 0 && sink_rates[len] > intel_dp-
 max_link_rate_upfront)
+			len--;
+		sink_len = len + 1;
+	}
+
 	source_len = intel_dp_source_rates(intel_dp, &source_rates);
 
drivers/gpu/drm/i915/intel_dp.c +70 -0
 	return intersect_rates(source_rates, source_len,
@@ -4208,6 +4226,114 @@ intel_dp_unset_edid(struct intel_dp *intel_dp)
 	intel_dp->has_audio = false;
 }
 
+static int intel_dp_upfront_crtc_disable(struct intel_crtc *crtc,
+				struct drm_modeset_acquire_ctx *ctx,
+				bool enable)
+{
+	int ret;
+	struct drm_atomic_state *state;
+	struct intel_crtc_state *crtc_state;
+	struct drm_device *dev = crtc->base.dev;
+	enum pipe pipe = crtc->pipe;
+
+	state = drm_atomic_state_alloc(dev);
+	if (!state)
+		return -ENOMEM;
+
+	state->acquire_ctx = ctx;
+
+	crtc_state = intel_atomic_get_crtc_state(state, crtc);
+	if (IS_ERR(crtc_state)) {
+		ret = PTR_ERR(crtc_state);
+		drm_atomic_state_free(state);
+		return ret;
+	}
+
+	DRM_DEBUG_KMS("%sabling crtc %c %s upfront link train\n",
+			enable ? "En" : "Dis",
+			pipe_name(pipe),
+			enable ? "after" : "before");
+
+	crtc_state->base.active = enable;
+	ret = drm_atomic_commit(state);
+	if (ret)
+		drm_atomic_state_free(state);
+
+	return ret;
+}
+
+static bool intel_dp_upfront_link_train(struct intel_dp *intel_dp)
+{
+	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
+	struct intel_encoder *intel_encoder = &intel_dig_port->base;
+	struct drm_device *dev = intel_encoder->base.dev;
+	struct drm_i915_private *dev_priv = to_i915(dev);
+	struct drm_mode_config *config = &dev->mode_config;
+	struct drm_modeset_acquire_ctx ctx;
+	struct intel_crtc *intel_crtc;
+	struct drm_crtc *crtc = NULL;
+	int ret;
+	bool done = false;
+	uint8_t lane_count, max_lanes = 4;
+	int common_rates[DP_MAX_SUPPORTED_RATES] = {};
+	int clock, common_len;
+
+	common_len = intel_dp_common_rates(intel_dp, common_rates);
+	if (WARN_ON(common_len <= 0))
+		return true;
+
+	drm_modeset_acquire_init(&ctx, 0);
+retry:
+	ret = drm_modeset_lock(&config->connection_mutex, &ctx);
+	if (ret)
+		goto exit_fail;
+
+	if (intel_encoder->base.crtc) {
+		crtc = intel_encoder->base.crtc;
+
+		ret = drm_modeset_lock(&crtc->mutex, &ctx);
+		if (ret)
+			goto exit_fail;
+
+		ret = drm_modeset_lock(&crtc->primary->mutex, &ctx);
Quoted 8 lines

drivers/gpu/drm/i915/intel_dp.c intel_dp_unset_edid(struct intel_dp *intel_dp) · line 4303

Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +5 -0
+		if (ret)
+			goto exit_fail;
+
+		intel_crtc = to_intel_crtc(crtc);
+		ret = intel_dp_upfront_crtc_disable(intel_crtc, &ctx, false);

Still seems wrong to just disable things here. And if we can't disable things, then what can we do?

We try to disable CRTC if BIOS had enabled it during connected boot cases. This disabling happens through atomic modeset path with pll sort of global locks held.

As of now, if we can't disable crtc, we do not do upfront link training. [So, that leaves us with default assumption of 4 lanes]

Please let us know if you see better options..

Quoted 11 lines

I believe there are people working on a proper USB type-C framework, and once that materializes, I'm hoping it could just signal us whenever the cable mode gets changed. I assume the biggest mess for us would be how to detect that we're dealing with a type-C port, so that we'd know when to register for these notifications.

Anyway, once there's a proper framework for this stuff, I don't think we'd need any upfront link training snymore. I guess we could use it as a temporary thing, and garbage collect it if/when the proper USB stuff happens?

Sure, I am fine with this as a temporary stuff..

Thanks,
Durga

Quoted 181 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
+		if (ret)
+			goto exit_fail;
+	}
+

drivers/gpu/drm/i915/intel_dp.c intel_dp_unset_edid(struct intel_dp *intel_dp)

Quoted 10 lines
drivers/gpu/drm/i915/intel_dp.c +9 -0
+	mutex_lock(&dev_priv->dpll_lock);
+
+	for (lane_count = max_lanes; lane_count >= 1 && !done; lane_count
 >= 1) {
+		for (clock = common_len - 1; clock >= 0 && !done; clock--) {
+			done = intel_dp->upfront_link_train(intel_dp,
+					common_rates[clock], lane_count);
+			if (done) {
+				intel_dp->max_lanes_upfront = lane_count;
+				intel_dp->max_link_rate_upfront =

common_rates[clock];

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector

Quoted 24 lines
drivers/gpu/drm/i915/intel_dp.c +20 -0
+				break;
+			}
+		}
+	}
+
+	mutex_unlock(&dev_priv->dpll_lock);
+
+	if (crtc)
+		ret = intel_dp_upfront_crtc_disable(intel_crtc, &ctx, true);
+
+exit_fail:
+	if (ret == -EDEADLK) {
+		drm_modeset_backoff(&ctx);
+		goto retry;
+	}
+	drm_modeset_drop_locks(&ctx);
+	drm_modeset_acquire_fini(&ctx);
+	return done;
+}
+
 static void
 intel_dp_long_pulse(struct intel_connector *intel_connector)

{

drivers/gpu/drm/i915/intel_dp.c +0 -0
@@ -4218,7 +4344,7 @@ intel_dp_long_pulse(struct intel_connector

*intel_connector)

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector *intel_connector)

Quoted 8 lines
drivers/gpu/drm/i915/intel_dp.c +1 -1
 	struct drm_device *dev = connector->dev;
 	enum drm_connector_status status;
 	enum intel_display_power_domain power_domain;
-	bool ret;
+	bool ret, do_upfront_link_train;
 	u8 sink_irq_vector;
 
 	power_domain =

intel_display_port_aux_power_domain(intel_encoder);

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector

Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +0 -0
@@ -4303,10 +4429,23 @@ intel_dp_long_pulse(struct intel_connector

*intel_connector)

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector · line 4429

Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +0 -0
 			DRM_DEBUG_DRIVER("CP or sink specific irq

unhandled\n");

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector *intel_connector)

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
 	}
 
+	/* Do not do upfront link train, if it is a compliance request */
+	do_upfront_link_train = intel_dp->upfront_link_train &&
+				!intel_dp->upfront_done &&
+				intel_encoder->type == INTEL_OUTPUT_DP

&&

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector · line 4436

Quoted 1 line
drivers/gpu/drm/i915/intel_dp.c +1 -0
+				intel_dp->compliance_test_type !=

DP_TEST_LINK_TRAINING;

drivers/gpu/drm/i915/intel_dp.c intel_dp_long_pulse(struct intel_connector *intel_connector)

Quoted 3 lines
drivers/gpu/drm/i915/intel_dp.c +3 -0
+
+	if (do_upfront_link_train) {
+		intel_dp->upfront_done =

intel_dp_upfront_link_train(intel_dp);

drivers/gpu/drm/i915/intel_dp.c intel_dp_init_connector(struct intel_digital_port

Quoted 15 lines
drivers/gpu/drm/i915/intel_dp.c +7 -2
+		if (!intel_dp->upfront_done)
+			status = connector_status_disconnected;
+	}
+
 out:
-	if ((status != connector_status_connected) &&
-	    (intel_dp->is_mst == false))
+	if (status != connector_status_connected && !intel_dp->is_mst) {
 		intel_dp_unset_edid(intel_dp);
+		intel_dp->upfront_done = false;
+	}
 
 	intel_display_power_put(to_i915(dev), power_domain);
 	return;
@@ -5562,6 +5701,12 @@ intel_dp_init_connector(struct intel_digital_port

*intel_dig_port,

drivers/gpu/drm/i915/intel_dp.c intel_dp_init_connector(struct intel_digital_port *intel_dig_port,

Quoted 7 lines
drivers/gpu/drm/i915/intel_dp.c +4 -0
 	if (type == DRM_MODE_CONNECTOR_eDP)
 		intel_encoder->type = INTEL_OUTPUT_EDP;
 
+	/* Initialize upfront link training vfunc for DP */
+	if (intel_encoder->type != INTEL_OUTPUT_EDP) {
+		if (IS_BROXTON(dev))
+			intel_dp->upfront_link_train =

intel_bxt_upfront_link_train;

Review

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp.c +2 -0
+	}
+
 	/* eDP only on port B and/or C on vlv/chv */
 	if (WARN_ON((IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev)) &&
 		    is_edp(intel_dp) && port != PORT_B && port != PORT_C))
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_dp_link_training.c

drivers/gpu/drm/i915/intel_dp_link_training.c static u32 intel_dp_training_pattern(struct intel_dp

Quoted 4 lines

index 60fb39c..e58442a 100644

drivers/gpu/drm/i915/intel_dp_link_training.c +0 -0
@@ -232,7 +232,6 @@ static u32 intel_dp_training_pattern(struct intel_dp

*intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct

Quoted 8 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +0 -1
 static void
 intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)
 {
-	bool channel_eq = false;
 	int tries, cr_tries;
 	u32 training_pattern;
 
@@ -248,7 +247,7 @@ intel_dp_link_training_channel_equalization(struct

intel_dp *intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct

Quoted 9 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 	tries = 0;
 	cr_tries = 0;
-	channel_eq = false;
+	intel_dp->channel_eq_status = false;
 	for (;;) {
 		uint8_t link_status[DP_LINK_STATUS_SIZE];
 
@@ -276,7 +275,7 @@ intel_dp_link_training_channel_equalization(struct

intel_dp *intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct

Quoted 9 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 		if (drm_dp_channel_eq_ok(link_status,
 					 intel_dp->lane_count)) {
-			channel_eq = true;
+			intel_dp->channel_eq_status = true;
 			break;
 		}
 
@@ -302,7 +301,7 @@ intel_dp_link_training_channel_equalization(struct

intel_dp *intel_dp)

drivers/gpu/drm/i915/intel_dp_link_training.c intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp)

Quoted 6 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +1 -1
 	intel_dp_set_idle_link_train(intel_dp);
 
-	if (channel_eq)
+	if (intel_dp->channel_eq_status)
 		DRM_DEBUG_KMS("Channel EQ done. DP Training

successful\n");

Review

Quoted 3 lines
drivers/gpu/drm/i915/intel_dp_link_training.c +0 -0
 }
 
(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_drv.h

drivers/gpu/drm/i915/intel_drv.h void intel_ddi_clock_get(struct intel_encoder

Quoted 31 lines

index 16f70d4..88306fc 100644

drivers/gpu/drm/i915/intel_drv.h +13 -0
@@ -851,6 +851,15 @@ struct intel_dp {
 	enum hdmi_force_audio force_audio;
 	bool limited_color_range;
 	bool color_range_auto;
+
+	/* Whether Channel Equalization was achieved during Link training */
+	bool channel_eq_status;
+
+	/* Upfront link train parameters */
+	int max_link_rate_upfront;
+	uint8_t max_lanes_upfront;
+	bool upfront_done;
+
 	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];
 	uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE];
 	uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS];
@@ -908,6 +917,10 @@ struct intel_dp {
 	/* This is called before a link training is starterd */
 	void (*prepare_link_retrain)(struct intel_dp *intel_dp);
 
+	/* For Upfront link training */
+	bool (*upfront_link_train)(struct intel_dp *intel_dp, int clock,
+				uint8_t lane_count);
+
 	/* Displayport compliance testing */
 	unsigned long compliance_test_type;
 	unsigned long compliance_test_data;
@@ -1127,6 +1140,8 @@ void intel_ddi_clock_get(struct intel_encoder

*encoder,

Quoted 6 lines
drivers/gpu/drm/i915/intel_drv.h +2 -0
 			 struct intel_crtc_state *pipe_config);
 void intel_ddi_set_vc_payload_alloc(struct drm_crtc *crtc, bool state);
 uint32_t ddi_signal_levels(struct intel_dp *intel_dp);
+bool intel_bxt_upfront_link_train(struct intel_dp *intel_dp,
+				int clock, uint8_t lane_count);
 
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_drv.h +0 -1
 /* intel_frontbuffer.c */
 void intel_fb_obj_invalidate(struct drm_i915_gem_object *obj,
--

1.9.1

--
Ville Syrjälä
Intel OTC

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

#10 lore raw

✗ Ro.CI.BAT: failure for Add USB typeC based DP support for BXT platform (rev9)

In reply to Durgadoss R
== Series Details ==

== Series Details ==

Series: Add USB typeC based DP support for BXT platform (rev9)
URL : https://patchwork.freedesktop.org/series/1731/
State : failure

== Summary ==

Series 1731v9 Add USB typeC based DP support for BXT platform
http://patchwork.freedesktop.org/api/1.0/series/1731/revisions/9/mbox

Test drv_module_reload_basic:

                pass       -> SKIP       (ro-byt-n2820)
Test gem_exec_nop:
        Subgroup basic:
                pass       -> INCOMPLETE (ro-byt-n2820)
Test gem_sync:
        Subgroup basic-store-each:
                pass       -> DMESG-FAIL (ro-bdw-i7-5600u)
Test kms_flip:
        Subgroup basic-flip-vs-wf_vblank:
                pass       -> FAIL       (ro-ivb-i7-3770)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                dmesg-warn -> SKIP       (ro-bdw-i7-5557U)
ro-bdw-i5-5250u  total:237  pass:213  dwarn:1   dfail:0   fail:7   skip:16 
ro-bdw-i7-5557U  total:237  pass:213  dwarn:1   dfail:0   fail:7   skip:16 
ro-bdw-i7-5600u  total:237  pass:198  dwarn:0   dfail:1   fail:7   skip:31 
ro-bsw-n3050     total:218  pass:172  dwarn:0   dfail:0   fail:3   skip:42 
ro-byt-n2820     total:93   pass:67   dwarn:0   dfail:0   fail:1   skip:24 
ro-hsw-i3-4010u  total:237  pass:206  dwarn:0   dfail:0   fail:7   skip:24 
ro-hsw-i7-4770r  total:237  pass:206  dwarn:0   dfail:0   fail:7   skip:24 
ro-ilk-i7-620lm  total:237  pass:166  dwarn:0   dfail:0   fail:8   skip:63 
ro-ilk1-i5-650   total:232  pass:166  dwarn:0   dfail:0   fail:8   skip:58 
ro-ivb-i7-3770   total:237  pass:196  dwarn:0   dfail:0   fail:8   skip:33 
ro-skl3-i5-6260u total:237  pass:217  dwarn:1   dfail:0   fail:7   skip:12 
ro-snb-i7-2620M  total:237  pass:188  dwarn:0   dfail:0   fail:8   skip:41 

Results at /archive/results/CI_IGT_test/RO_Patchwork_1481/

9561f5c drm-intel-nightly: 2016y-07m-12d-15h-14m-43s UTC integration manifest 87befaf drm/i915/dp: Enable Upfront link training for typeC DP support on BXT 6d0912a drm/i915: Split bxt_ddi_pll_select()
130608b drm/i915: Split intel_ddi_pre_enable() into DP and HDMI versions fbeb061 drm/i915: Remove ddi_pll_sel from intel_crtc_state 8f1cf7f drm/i915: Don't pass crtc_state to intel_dp_set_link_params()

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

#11 lore raw

✗ Ro.CI.BAT: failure for Add USB typeC based DP support for BXT platform (rev9)

In reply to Durgadoss R
== Series Details ==

== Series Details ==

Series: Add USB typeC based DP support for BXT platform (rev9)
URL : https://patchwork.freedesktop.org/series/1731/
State : failure

== Summary ==

Series 1731v9 Add USB typeC based DP support for BXT platform
http://patchwork.freedesktop.org/api/1.0/series/1731/revisions/9/mbox

Test gem_exec_suspend:

        Subgroup basic-s3:
                pass       -> DMESG-WARN (fi-skl-i5-6260u)
Test gem_sync:
        Subgroup basic-store-each:
                pass       -> FAIL       (ro-bdw-i7-5600u)
fi-hsw-i7-4770k  total:242  pass:210  dwarn:0   dfail:0   fail:12  skip:20 
fi-kbl-qkkr      total:242  pass:176  dwarn:29  dfail:0   fail:10  skip:27 
fi-skl-i5-6260u  total:242  pass:218  dwarn:1   dfail:0   fail:11  skip:12 
fi-skl-i7-6700k  total:107  pass:84   dwarn:0   dfail:0   fail:0   skip:22 
fi-snb-i7-2600   total:242  pass:190  dwarn:0   dfail:0   fail:12  skip:40 
ro-bdw-i5-5250u  total:243  pass:214  dwarn:4   dfail:0   fail:12  skip:13 
ro-bdw-i7-5557U  total:243  pass:215  dwarn:0   dfail:0   fail:12  skip:16 
ro-bdw-i7-5600u  total:243  pass:199  dwarn:0   dfail:0   fail:12  skip:32 
ro-bsw-n3050     total:219  pass:173  dwarn:0   dfail:0   fail:3   skip:42 
ro-byt-n2820     total:243  pass:191  dwarn:0   dfail:0   fail:14  skip:38 
ro-hsw-i3-4010u  total:243  pass:206  dwarn:0   dfail:0   fail:13  skip:24 
ro-hsw-i7-4770r  total:243  pass:206  dwarn:0   dfail:0   fail:13  skip:24 
ro-ilk-i7-620lm  total:243  pass:166  dwarn:0   dfail:0   fail:14  skip:63 
ro-ilk1-i5-650   total:238  pass:166  dwarn:0   dfail:0   fail:14  skip:58 
ro-ivb-i7-3770   total:243  pass:197  dwarn:0   dfail:0   fail:13  skip:33 
ro-skl3-i5-6260u total:243  pass:218  dwarn:1   dfail:0   fail:12  skip:12 
ro-snb-i7-2620M  total:243  pass:188  dwarn:0   dfail:0   fail:13  skip:42 

fi-bsw-n3050 failed to connect after reboot

Results at /archive/results/CI_IGT_test/RO_Patchwork_1516/

74bd981 drm-intel-nightly: 2016y-07m-18d-10h-05m-42s UTC integration manifest a7ac62f drm/i915/dp: Enable Upfront link training for typeC DP support on BXT c5a2999 drm/i915: Split bxt_ddi_pll_select()
89072288 drm/i915: Split intel_ddi_pre_enable() into DP and HDMI versions 08cfe4b drm/i915: Remove ddi_pll_sel from intel_crtc_state 4da3a47 drm/i915: Don't pass crtc_state to intel_dp_set_link_params()

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