Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/4] drm/i915/dp: Use the VBT eDP fast link training params
@ 2026-11-16 13:59 Lee Shawn C
  2026-11-16 13:59 ` [PATCH v2 1/4] drm/i915/bios: Split out parsing the " Lee Shawn C
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Lee Shawn C @ 2026-11-16 13:59 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: Jani Nikula, Ville Syrjälä

From: Shawn Lee <shawn.c.lee@intel.corp-partner.google.com>

The VBT provides per-panel eDP fast link training params, which the
driver parses but doesn't use. Use them when fast link training is
enabled in the VBT:

- Patch 1-2: parse the params only if the enable bit is set.
- Patch 3: start link training from the VBT vswing/pre-emphasis levels.
- Patch 4: use the VBT link rate and lane count.

The existing AUX handshake based link training sequence is kept; link
training without AUX handshake is not implemented.

v2:
- Discard the params if the rate exceeds the max link rate. (Ville)
- Require drm_dp_fast_training_cap(). (Ville)

Lee Shawn C (4):
  drm/i915/bios: Split out parsing the eDP fast link training params
  drm/i915/bios: Parse eDP fast link training params only if enabled
  drm/i915/dp: Start eDP link training from VBT fast link train
    vswing/pre-emphasis levels
  drm/i915/dp: Use the VBT fast link training link config for eDP

 drivers/gpu/drm/i915/display/intel_bios.c     |  94 +++++++++++----
 .../drm/i915/display/intel_display_types.h    |   1 +
 drivers/gpu/drm/i915/display/intel_dp.c       |  50 ++++++++
 .../drm/i915/display/intel_dp_link_training.c | 114 ++++++++++++++++++
 4 files changed, 235 insertions(+), 24 deletions(-)

-- 
2.53.0


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2 1/4] drm/i915/bios: Split out parsing the eDP fast link training params
  2026-11-16 13:59 [PATCH v2 0/4] drm/i915/dp: Use the VBT eDP fast link training params Lee Shawn C
@ 2026-11-16 13:59 ` Lee Shawn C
  2026-11-16 13:59 ` [PATCH v2 2/4] drm/i915/bios: Parse eDP fast link training params only if enabled Lee Shawn C
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Lee Shawn C @ 2026-11-16 13:59 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: Jani Nikula, Ville Syrjälä

Move parsing the eDP fast link training link rate, lane count,
pre-emphasis and voltage swing params from parse_edp() to a separate
function, in preparation for parsing these params only if fast link
training is enabled for the panel.

No functional change.

Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com>
---
 drivers/gpu/drm/i915/display/intel_bios.c | 61 +++++++++++++----------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 7b6a6f8c3cf1..6b2924c56cae 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -1440,34 +1440,13 @@ static void vbt_edp_to_pps_delays(struct intel_pps_delays *pps,
 }
 
 static void
-parse_edp(struct intel_display *display,
-	  struct intel_panel *panel)
+parse_edp_fast_link_params(struct intel_display *display,
+			   struct intel_panel *panel,
+			   const struct bdb_edp *edp)
 {
-	const struct bdb_edp *edp;
-	const struct edp_fast_link_params *edp_link_params;
 	int panel_type = panel->vbt.panel_type;
-
-	edp = bdb_find_section(display, BDB_EDP);
-	if (!edp)
-		return;
-
-	switch (panel_bits(edp->color_depth, panel_type, 2)) {
-	case EDP_18BPP:
-		panel->vbt.edp.bpp = 18;
-		break;
-	case EDP_24BPP:
-		panel->vbt.edp.bpp = 24;
-		break;
-	case EDP_30BPP:
-		panel->vbt.edp.bpp = 30;
-		break;
-	}
-
-	/* Get the eDP sequencing and link info */
-	edp_link_params = &edp->fast_link_params[panel_type];
-
-	vbt_edp_to_pps_delays(&panel->vbt.edp.pps,
-			      &edp->power_seqs[panel_type]);
+	const struct edp_fast_link_params *edp_link_params =
+		&edp->fast_link_params[panel_type];
 
 	if (display->vbt.version >= 224) {
 		panel->vbt.edp.rate =
@@ -1547,6 +1526,36 @@ parse_edp(struct intel_display *display,
 			    edp_link_params->vswing);
 		break;
 	}
+}
+
+static void
+parse_edp(struct intel_display *display,
+	  struct intel_panel *panel)
+{
+	const struct bdb_edp *edp;
+	int panel_type = panel->vbt.panel_type;
+
+	edp = bdb_find_section(display, BDB_EDP);
+	if (!edp)
+		return;
+
+	switch (panel_bits(edp->color_depth, panel_type, 2)) {
+	case EDP_18BPP:
+		panel->vbt.edp.bpp = 18;
+		break;
+	case EDP_24BPP:
+		panel->vbt.edp.bpp = 24;
+		break;
+	case EDP_30BPP:
+		panel->vbt.edp.bpp = 30;
+		break;
+	}
+
+	/* Get the eDP sequencing info */
+	vbt_edp_to_pps_delays(&panel->vbt.edp.pps,
+			      &edp->power_seqs[panel_type]);
+
+	parse_edp_fast_link_params(display, panel, edp);
 
 	if (display->vbt.version >= 173) {
 		u8 vswing;
-- 
2.53.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2 2/4] drm/i915/bios: Parse eDP fast link training params only if enabled
  2026-11-16 13:59 [PATCH v2 0/4] drm/i915/dp: Use the VBT eDP fast link training params Lee Shawn C
  2026-11-16 13:59 ` [PATCH v2 1/4] drm/i915/bios: Split out parsing the " Lee Shawn C
@ 2026-11-16 13:59 ` Lee Shawn C
  2026-11-16 13:59 ` [PATCH v2 3/4] drm/i915/dp: Start eDP link training from VBT fast link train vswing/pre-emphasis levels Lee Shawn C
  2026-11-16 13:59 ` [PATCH v2 4/4] drm/i915/dp: Use the VBT fast link training link config for eDP Lee Shawn C
  3 siblings, 0 replies; 6+ messages in thread
From: Lee Shawn C @ 2026-11-16 13:59 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: Jani Nikula, Ville Syrjälä

The VBT eDP fast link training params are parsed regardless of the
per-panel fast link training enable bit (VBT 182+), which itself is not
parsed. Parse the enable bit into panel->vbt.edp.fast_link_training and
parse the params only if it is set.

Like the Windows driver, discard the params if the fast link training
rate exceeds the eDP max port link rate.

The VBT default fast link training lane count is 1, while hardly any
eDP panel uses a single lane, so treat a lane count of 1 as not
specified (0).

The params have no users yet; a follow-up patch uses them for eDP link
training.

Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com>
---
 drivers/gpu/drm/i915/display/intel_bios.c     | 41 ++++++++++++++++++-
 .../drm/i915/display/intel_display_types.h    |  1 +
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 6b2924c56cae..3471a0128c51 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -1448,6 +1448,10 @@ parse_edp_fast_link_params(struct intel_display *display,
 	const struct edp_fast_link_params *edp_link_params =
 		&edp->fast_link_params[panel_type];
 
+	if (display->vbt.version < 182 ||
+	    !panel_bool(edp->fast_link_training, panel_type))
+		return;
+
 	if (display->vbt.version >= 224) {
 		panel->vbt.edp.rate =
 			edp->edp_fast_link_training_rate[panel_type] * 20;
@@ -1526,6 +1530,38 @@ parse_edp_fast_link_params(struct intel_display *display,
 			    edp_link_params->vswing);
 		break;
 	}
+
+	/*
+	 * Like the Windows driver, discard the fast link training params if
+	 * the rate exceeds the eDP max port link rate.
+	 */
+	if (panel->vbt.edp.rate && panel->vbt.edp.max_link_rate &&
+	    panel->vbt.edp.rate > panel->vbt.edp.max_link_rate) {
+		drm_dbg_kms(display->drm,
+			    "VBT eDP fast link training rate %d exceeds max link rate %d, ignoring fast link training params\n",
+			    panel->vbt.edp.rate, panel->vbt.edp.max_link_rate);
+		panel->vbt.edp.rate = 0;
+		panel->vbt.edp.lanes = 0;
+		panel->vbt.edp.preemphasis = 0;
+		panel->vbt.edp.vswing = 0;
+		return;
+	}
+
+	/*
+	 * The VBT default fast link training lane count is 1, while hardly
+	 * any eDP panel uses a single lane. Treat a lane count of 1 as not
+	 * specified.
+	 */
+	if (panel->vbt.edp.lanes == 1)
+		panel->vbt.edp.lanes = 0;
+
+	panel->vbt.edp.fast_link_training = true;
+
+	drm_dbg_kms(display->drm,
+		    "VBT eDP fast link training enabled: rate %d, lanes %d, vswing %d, pre-emphasis %d\n",
+		    panel->vbt.edp.rate, panel->vbt.edp.lanes,
+		    panel->vbt.edp.vswing >> DP_TRAIN_VOLTAGE_SWING_SHIFT,
+		    panel->vbt.edp.preemphasis >> DP_TRAIN_PRE_EMPHASIS_SHIFT);
 }
 
 static void
@@ -1555,8 +1591,6 @@ parse_edp(struct intel_display *display,
 	vbt_edp_to_pps_delays(&panel->vbt.edp.pps,
 			      &edp->power_seqs[panel_type]);
 
-	parse_edp_fast_link_params(display, panel, edp);
-
 	if (display->vbt.version >= 173) {
 		u8 vswing;
 
@@ -1577,6 +1611,9 @@ parse_edp(struct intel_display *display,
 		panel->vbt.edp.max_link_rate =
 			edp->edp_max_port_link_rate[panel_type] * 20;
 
+	/* Depends on max_link_rate */
+	parse_edp_fast_link_params(display, panel, edp);
+
 	if (display->vbt.version >= 251)
 		panel->vbt.edp.dsc_disable =
 			panel_bool(edp->edp_dsc_disable, panel_type);
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 90a5d29169c6..11f90ab1654c 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -354,6 +354,7 @@ struct intel_vbt_panel_data {
 		int bpp;
 		struct intel_pps_delays pps;
 		u8 drrs_msa_timing_delay;
+		bool fast_link_training;
 		bool low_vswing;
 		bool hobl;
 		bool dsc_disable;
-- 
2.53.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2 3/4] drm/i915/dp: Start eDP link training from VBT fast link train vswing/pre-emphasis levels
  2026-11-16 13:59 [PATCH v2 0/4] drm/i915/dp: Use the VBT eDP fast link training params Lee Shawn C
  2026-11-16 13:59 ` [PATCH v2 1/4] drm/i915/bios: Split out parsing the " Lee Shawn C
  2026-11-16 13:59 ` [PATCH v2 2/4] drm/i915/bios: Parse eDP fast link training params only if enabled Lee Shawn C
@ 2026-11-16 13:59 ` Lee Shawn C
  2026-11-16 13:59 ` [PATCH v2 4/4] drm/i915/dp: Use the VBT fast link training link config for eDP Lee Shawn C
  3 siblings, 0 replies; 6+ messages in thread
From: Lee Shawn C @ 2026-11-16 13:59 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: Jani Nikula, Ville Syrjälä

Link training starts clock recovery at voltage swing/pre-emphasis level
0. If the VBT enables fast link training for the eDP panel and, like
the Windows driver requires, the sink supports link training without
AUX handshake, start from the VBT fast link training vswing/pre-emphasis
levels instead, if the link rate and lane count match the VBT params.
The sink's adjust requests are still followed as before, with the
clock recovery retry and max vswing tracking accounting for the
non-zero initial levels.

If link training with the VBT levels fails, the retry starts from level
0 as before, since the VBT levels are only used while link recovery is
idle.

Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com>
---
 .../drm/i915/display/intel_dp_link_training.c | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
index ac1aff6edf05..54fe5900b584 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c
@@ -422,6 +422,7 @@
  *
  * See also:
  *   - DOC: DisplayPort link training
+ *   - link_recovery_is_idle()
  *   - link_recovery_autoretrain_pending()
  *   - link_recovery_autoretrain_allowed()
  *   - link_recovery_has_no_fallback()
@@ -455,6 +456,12 @@ static struct intel_dp_link_training *connector_to_link_training(struct intel_co
 	return intel_attached_dp(connector)->link.training;
 }
 
+static bool
+link_recovery_is_idle(struct intel_dp_link_training *link_training)
+{
+	return link_training->recovery_state == INTEL_DP_LINK_RECOVERY_IDLE;
+}
+
 static void intel_dp_reset_lttpr_common_caps(struct intel_dp *intel_dp)
 {
 	memset(intel_dp->lttpr_common_caps, 0, sizeof(intel_dp->lttpr_common_caps));
@@ -1025,6 +1032,76 @@ void intel_dp_set_signal_levels(struct intel_dp *intel_dp,
 		encoder->set_signal_levels(encoder, crtc_state);
 }
 
+/*
+ * Use the VBT eDP fast link training vswing/pre-emphasis levels as the
+ * starting point of link training, if the VBT enables fast link training
+ * for the panel and the link config matches the VBT fast link training
+ * params the levels were provided for. Only do this while link recovery
+ * is idle, so that the retry after a failed link training starts from
+ * the default levels.
+ */
+static bool
+intel_dp_use_vbt_fast_link_levels(struct intel_dp *intel_dp,
+				  const struct intel_crtc_state *crtc_state,
+				  enum drm_dp_phy dp_phy)
+{
+	const struct intel_panel *panel = &intel_dp->attached_connector->panel;
+
+	if (dp_phy != DP_PHY_DPRX || !intel_dp_is_edp(intel_dp) ||
+	    intel_dp_is_uhbr(crtc_state))
+		return false;
+
+	/*
+	 * Like the Windows driver, use the VBT params only if the sink also
+	 * supports link training without AUX handshake.
+	 */
+	if (!panel->vbt.edp.fast_link_training ||
+	    !drm_dp_fast_training_cap(intel_dp->dpcd))
+		return false;
+
+	if (panel->vbt.edp.rate &&
+	    panel->vbt.edp.rate != crtc_state->port_clock)
+		return false;
+
+	if (panel->vbt.edp.lanes &&
+	    panel->vbt.edp.lanes != crtc_state->lane_count)
+		return false;
+
+	return link_recovery_is_idle(intel_dp->link.training);
+}
+
+/*
+ * Clamp the VBT levels to the PHY limits in the same way as the levels
+ * requested by the sink in intel_dp_get_lane_adjust_vswing_preemph().
+ */
+static void
+intel_dp_init_train_set_from_vbt(struct intel_dp *intel_dp,
+				 const struct intel_crtc_state *crtc_state,
+				 enum drm_dp_phy dp_phy)
+{
+	const struct intel_panel *panel = &intel_dp->attached_connector->panel;
+	u8 v = panel->vbt.edp.vswing;
+	u8 p = panel->vbt.edp.preemphasis;
+	u8 preemph_max, voltage_max;
+
+	preemph_max = intel_dp_phy_preemph_max(intel_dp, dp_phy);
+	if (p >= preemph_max)
+		p = preemph_max | DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;
+
+	v = min(v, dp_voltage_max(p));
+
+	voltage_max = intel_dp_phy_voltage_max(intel_dp, crtc_state, dp_phy);
+	if (v >= voltage_max)
+		v = voltage_max | DP_TRAIN_MAX_SWING_REACHED;
+
+	memset(intel_dp->train_set, v | p, sizeof(intel_dp->train_set));
+
+	lt_dbg(intel_dp, dp_phy,
+	       "Using VBT fast link training levels: vswing %d, pre-emphasis %d\n",
+	       (v & DP_TRAIN_VOLTAGE_SWING_MASK) >> DP_TRAIN_VOLTAGE_SWING_SHIFT,
+	       (p & DP_TRAIN_PRE_EMPHASIS_MASK) >> DP_TRAIN_PRE_EMPHASIS_SHIFT);
+}
+
 static bool
 intel_dp_reset_link_train(struct intel_dp *intel_dp,
 			  const struct intel_crtc_state *crtc_state,
@@ -1032,6 +1109,10 @@ intel_dp_reset_link_train(struct intel_dp *intel_dp,
 			  u8 dp_train_pat)
 {
 	memset(intel_dp->train_set, 0, sizeof(intel_dp->train_set));
+
+	if (intel_dp_use_vbt_fast_link_levels(intel_dp, crtc_state, dp_phy))
+		intel_dp_init_train_set_from_vbt(intel_dp, crtc_state, dp_phy);
+
 	intel_dp_set_signal_levels(intel_dp, crtc_state, dp_phy);
 	return intel_dp_set_link_train(intel_dp, crtc_state, dp_phy, dp_train_pat);
 }
@@ -1350,6 +1431,35 @@ intel_dp_dump_link_status(struct intel_dp *intel_dp, enum drm_dp_phy dp_phy,
  * Perform the link training clock recovery phase on the given DP PHY using
  * training pattern 1.
  */
+/*
+ * Fill in the adjust request fields of @link_status with the current
+ * vswing/pre-emphasis levels, so that the first adjust request from the
+ * sink is compared against the levels actually used for the first clock
+ * recovery attempt, which may be non-zero (see
+ * intel_dp_init_train_set_from_vbt()).
+ */
+static void
+intel_dp_train_set_to_adjust_request(struct intel_dp *intel_dp,
+				     const struct intel_crtc_state *crtc_state,
+				     u8 link_status[DP_LINK_STATUS_SIZE])
+{
+	int lane;
+
+	for (lane = 0; lane < crtc_state->lane_count; lane++) {
+		u8 train_set = intel_dp->train_set[lane];
+		u8 v = (train_set & DP_TRAIN_VOLTAGE_SWING_MASK) >>
+			DP_TRAIN_VOLTAGE_SWING_SHIFT;
+		u8 p = (train_set & DP_TRAIN_PRE_EMPHASIS_MASK) >>
+			DP_TRAIN_PRE_EMPHASIS_SHIFT;
+		int i = DP_ADJUST_REQUEST_LANE0_1 - DP_LANE0_1_STATUS + (lane >> 1);
+		int shift = (lane & 1) * 4;
+
+		link_status[i] &= ~(0xf << shift);
+		link_status[i] |= (v << DP_ADJUST_VOLTAGE_SWING_LANE0_SHIFT |
+				   p << DP_ADJUST_PRE_EMPHASIS_LANE0_SHIFT) << shift;
+	}
+}
+
 static bool
 intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp,
 				      const struct intel_crtc_state *crtc_state,
@@ -1373,6 +1483,10 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp,
 		return false;
 	}
 
+	/* The initial levels may be non-zero, see intel_dp_reset_link_train() */
+	intel_dp_train_set_to_adjust_request(intel_dp, crtc_state, old_link_status);
+	max_vswing_reached = intel_dp_link_max_vswing_reached(intel_dp, crtc_state);
+
 	/*
 	 * The DP 1.4 spec defines the max clock recovery retries value
 	 * as 10 but for pre-DP 1.4 devices we set a very tolerant
-- 
2.53.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2 4/4] drm/i915/dp: Use the VBT fast link training link config for eDP
  2026-11-16 13:59 [PATCH v2 0/4] drm/i915/dp: Use the VBT eDP fast link training params Lee Shawn C
                   ` (2 preceding siblings ...)
  2026-11-16 13:59 ` [PATCH v2 3/4] drm/i915/dp: Start eDP link training from VBT fast link train vswing/pre-emphasis levels Lee Shawn C
@ 2026-11-16 13:59 ` Lee Shawn C
  2026-11-16 14:19   ` sashiko-bot
  3 siblings, 1 reply; 6+ messages in thread
From: Lee Shawn C @ 2026-11-16 13:59 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: Jani Nikula, Ville Syrjälä

When eDP fast link training is enabled in the VBT and the sink supports
link training without AUX handshake, restrict the link configs
considered during compute config to the VBT fast link training link
rate and lane count.

If none of the allowed link configs match, ignore the VBT params and
select the link config as before.

Signed-off-by: Lee Shawn C <shawn.c.lee@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 50 +++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index ef164a797618..d5829bef801a 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -2824,6 +2824,54 @@ intel_dp_compute_m_n_ratio_limits(struct intel_dp *intel_dp,
 	return true;
 }
 
+static void
+intel_dp_apply_vbt_edp_link_config(struct intel_dp *intel_dp,
+				   struct intel_connector *connector,
+				   struct link_config_limits *limits)
+{
+	struct intel_display *display = to_intel_display(intel_dp);
+	struct intel_dp_link_caps *link_caps = intel_dp->link.caps;
+	struct intel_dp_link_caps_filter vbt_filter = INTEL_DP_LINK_CAPS_FILTER_NONE;
+	struct intel_dp_link_caps_iter iter;
+	struct intel_dp_link_config config;
+	int vbt_rate = connector->panel.vbt.edp.rate;
+	int vbt_lanes = connector->panel.vbt.edp.lanes;
+
+	if (!intel_dp_is_edp(intel_dp) ||
+	    !connector->panel.vbt.edp.fast_link_training ||
+	    !drm_dp_fast_training_cap(intel_dp->dpcd) ||
+	    (!vbt_rate && !vbt_lanes))
+		return;
+
+	intel_dp_link_caps_iter_start(&iter, link_caps,
+				      intel_dp_link_caps_connector_compute_order(connector),
+				      limits->link_config_filter);
+	for_each_dp_link_config(&iter, &config) {
+		if (vbt_rate && config.rate != vbt_rate)
+			continue;
+		if (vbt_lanes && config.lane_count != vbt_lanes)
+			continue;
+
+		intel_dp_link_caps_filter_add(link_caps, &vbt_filter, &config);
+	}
+	intel_dp_link_caps_iter_end(&iter);
+
+	if (!vbt_filter.config_mask) {
+		drm_dbg_kms(display->drm,
+			    "[CONNECTOR:%d:%s] VBT eDP link config (lanes %d, rate %d) not in allowed link configs, ignoring\n",
+			    connector->base.base.id, connector->base.name,
+			    vbt_lanes, vbt_rate);
+		return;
+	}
+
+	drm_dbg_kms(display->drm,
+		    "[CONNECTOR:%d:%s] Limiting link configs to VBT eDP lanes %d, rate %d\n",
+		    connector->base.base.id, connector->base.name,
+		    vbt_lanes, vbt_rate);
+
+	limits->link_config_filter = vbt_filter;
+}
+
 bool
 intel_dp_compute_config_limits(struct intel_dp *intel_dp,
 			       struct drm_connector_state *conn_state,
@@ -2940,6 +2988,8 @@ intel_dp_compute_config_limits(struct intel_dp *intel_dp,
 		limits->link_config_filter = new_filter;
 	}
 
+	intel_dp_apply_vbt_edp_link_config(intel_dp, connector, limits);
+
 	if (!intel_dp_compute_m_n_ratio_limits(intel_dp, conn_state, crtc_state, limits))
 		return false;
 
-- 
2.53.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 4/4] drm/i915/dp: Use the VBT fast link training link config for eDP
  2026-11-16 13:59 ` [PATCH v2 4/4] drm/i915/dp: Use the VBT fast link training link config for eDP Lee Shawn C
@ 2026-11-16 14:19   ` sashiko-bot
  0 siblings, 0 replies; 6+ messages in thread
From: sashiko-bot @ 2026-11-16 14:19 UTC (permalink / raw)
  To: Lee Shawn C, intel-gfx, intel-xe

Thank you for your contribution! Sashiko AI review found 2 potential
issues to consider:
- [High] drm/i915/dp: missing M/N and BW fallback in
  intel_dp_apply_vbt_edp_link_config()
- [High] drm/i915/dp: use_max_params overrides
  intel_dp_apply_vbt_edp_link_config()
--

commit 7ebafd17f2c671a09a03aeab471e356e0295de7d
Author: Lee Shawn C <shawn.c.lee@intel.com>

drm/i915/dp: Use the VBT fast link training link config for eDP

This commit restricts eDP link configurations during compute config to the
VBT fast link training rate and lane count when eDP fast link training is
enabled in the VBT and supported by the sink.

> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> index ef164a7976187..d5829bef801af 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -2824,6 +2824,54 @@ intel_dp_compute_m_n_ratio_limits(struct intel_dp *intel_dp,
>  	return true;
>  }
>  
> +static void
> +intel_dp_apply_vbt_edp_link_config(struct intel_dp *intel_dp,
> +				   struct intel_connector *connector,
> +				   struct link_config_limits *limits)
> +{
> +	struct intel_display *display = to_intel_display(intel_dp);
> +	struct intel_dp_link_caps *link_caps = intel_dp->link.caps;
> +	struct intel_dp_link_caps_filter vbt_filter = INTEL_DP_LINK_CAPS_FILTER_NONE;
> +	struct intel_dp_link_caps_iter iter;
> +	struct intel_dp_link_config config;
> +	int vbt_rate = connector->panel.vbt.edp.rate;
> +	int vbt_lanes = connector->panel.vbt.edp.lanes;
> +
> +	if (!intel_dp_is_edp(intel_dp) ||
> +	    !connector->panel.vbt.edp.fast_link_training ||
> +	    !drm_dp_fast_training_cap(intel_dp->dpcd) ||
> +	    (!vbt_rate && !vbt_lanes))
> +		return;
> +
> +	intel_dp_link_caps_iter_start(&iter, link_caps,
> +				      intel_dp_link_caps_connector_compute_order(connector),
> +				      limits->link_config_filter);
> +	for_each_dp_link_config(&iter, &config) {
> +		if (vbt_rate && config.rate != vbt_rate)
> +			continue;
> +		if (vbt_lanes && config.lane_count != vbt_lanes)
> +			continue;
> +
> +		intel_dp_link_caps_filter_add(link_caps, &vbt_filter, &config);
> +	}
> +	intel_dp_link_caps_iter_end(&iter);

[Severity: High]
Does intersecting against limits->link_config_filter after the
intel_dp->use_max_params check cause VBT fast link training configs to be
ignored whenever use_max_params is true?

intel_edp_init_dpcd() sets intel_dp->use_max_params to true on all eDP < 1.4
panels, and intel_dp_compute_config_limits() narrows
limits->link_config_filter to a single max_config entry before calling
intel_dp_apply_vbt_edp_link_config(). Any VBT rate or lane count lower than
max_config will not match that single-entry filter, leaving
vbt_filter.config_mask zero so the VBT config (and its voltage swing and
pre-emphasis levels in intel_dp_use_vbt_fast_link_levels()) is bypassed.

On eDP >= 1.4 panels, if link training fails on the VBT config,
intel_dp_get_link_train_fallback_values() sets intel_dp->use_max_params =
true and returns without calling intel_dp_link_caps_disable_config(), either
retrying the same failed config if the VBT config was already max_config or
leaving a failed lower VBT config enabled in link_caps for subsequent
fallbacks.

> +
> +	if (!vbt_filter.config_mask) {
> +		drm_dbg_kms(display->drm,
> +			    "[CONNECTOR:%d:%s] VBT eDP link config (lanes %d, rate %d) not in allowed link configs, ignoring\n",
> +			    connector->base.base.id, connector->base.name,
> +			    vbt_lanes, vbt_rate);
> +		return;
> +	}
> +
> +	drm_dbg_kms(display->drm,
> +		    "[CONNECTOR:%d:%s] Limiting link configs to VBT eDP lanes %d, rate %d\n",
> +		    connector->base.base.id, connector->base.name,
> +		    vbt_lanes, vbt_rate);
> +
> +	limits->link_config_filter = vbt_filter;
> +}
> +
>  bool
>  intel_dp_compute_config_limits(struct intel_dp *intel_dp,
>  			       struct drm_connector_state *conn_state,
> @@ -2940,6 +2988,8 @@ intel_dp_compute_config_limits(struct intel_dp *intel_dp,
>  		limits->link_config_filter = new_filter;
>  	}
>  
> +	intel_dp_apply_vbt_edp_link_config(intel_dp, connector, limits);
> +
>  	if (!intel_dp_compute_m_n_ratio_limits(intel_dp, conn_state, crtc_state, limits))
>  		return false;

[Severity: High]
Can restricting limits->link_config_filter to vbt_filter here cause the
modeset to fail instead of falling back when the VBT link config is in
link_caps but cannot support the mode's M/N ratio or required bandwidth?

link_caps contains all common source and sink rates and lane counts (for
example 1.62 Gbps RBR, which is also the 0-value encoding in VBT versions
182..223 in parse_edp_fast_link_params()), so an under-provisioned VBT
config still matches in intel_dp_apply_vbt_edp_link_config() and overwrites
limits->link_config_filter.

If vbt_rate is too low for intel_dp_can_support_m_n(),
intel_dp_compute_m_n_ratio_limits() then sees only vbt_filter and returns
false even when higher rates in link_caps could support the mode. Even when
the M/N check passes, if the VBT config lacks bandwidth for the mode,
intel_dp_compute_link_config_wide() degrades pipe_bpp or returns -EINVAL
without retrying against the unfiltered link_caps, failing the modeset on
non-DSC eDP panels or selecting the VBT link config without a bandwidth
check in dsc_compute_compressed_bpp() on DSC-capable eDP panels:

drivers/gpu/drm/i915/display/intel_dp.c:dsc_compute_compressed_bpp() {
    ...
	if ( intel_dp_is_edp(intel_dp)) {
		struct intel_dp_link_config max_link_config;

		if (!intel_dp_get_connector_max_link_config(connector, limits, &max_link_config))
			return -EINVAL;

		pipe_config->port_clock = max_link_config.rate;
		pipe_config->lane_count = max_link_config.lane_count;

		pipe_config->dsc.compressed_bpp_x16 = max_bpp_x16;
    ...
}

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261116135904.59365-1-shawn.c.lee@intel.com?part=4

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2026-11-16 14:19 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-16 13:59 [PATCH v2 0/4] drm/i915/dp: Use the VBT eDP fast link training params Lee Shawn C
2026-11-16 13:59 ` [PATCH v2 1/4] drm/i915/bios: Split out parsing the " Lee Shawn C
2026-11-16 13:59 ` [PATCH v2 2/4] drm/i915/bios: Parse eDP fast link training params only if enabled Lee Shawn C
2026-11-16 13:59 ` [PATCH v2 3/4] drm/i915/dp: Start eDP link training from VBT fast link train vswing/pre-emphasis levels Lee Shawn C
2026-11-16 13:59 ` [PATCH v2 4/4] drm/i915/dp: Use the VBT fast link training link config for eDP Lee Shawn C
2026-11-16 14:19   ` sashiko-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox