Commit cf725620 authored by José Roberto de Souza's avatar José Roberto de Souza
Browse files

drm/i915/display/ehl: Limit eDP to HBR2 



Recent update in documentation defeatured eDP HBR3 for EHL and JSL.

v2:
- Remove dead code in ehl_get_combo_buf_trans()

v3:
- Rebase

BSpec: 32247
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Vidya Srinivas <vidya.srinivas@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201005175447.93430-1-jose.souza@intel.com
parent 0e2497e3

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

+2 −7
Original line number Diff line number Diff line
@@ -1142,14 +1142,9 @@ ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, 
	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);



	if (dev_priv->vbt.edp.low_vswing) {

		if (crtc_state->port_clock > 540000) {

			*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr3);

			return icl_combo_phy_ddi_translations_edp_hbr3;

		} else {

		*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2);

		return icl_combo_phy_ddi_translations_edp_hbr2;

	}

	}



	return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries);

}

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

+10 −1
Original line number Diff line number Diff line
@@ -277,13 +277,20 @@ static int icl_max_source_rate(struct intel_dp *intel_dp) 
	enum phy phy = intel_port_to_phy(dev_priv, dig_port->base.port);



	if (intel_phy_is_combo(dev_priv, phy) &&

	    !IS_ELKHARTLAKE(dev_priv) &&

	    !intel_dp_is_edp(intel_dp))

		return 540000;



	return 810000;

}



static int ehl_max_source_rate(struct intel_dp *intel_dp)

{

	if (intel_dp_is_edp(intel_dp))

		return 540000;



	return 810000;

}



static void

intel_dp_set_source_rates(struct intel_dp *intel_dp)

{
@@ -318,6 +325,8 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp) 
		size = ARRAY_SIZE(cnl_rates);

		if (IS_GEN(dev_priv, 10))

			max_rate = cnl_max_source_rate(intel_dp);

		else if (IS_ELKHARTLAKE(dev_priv))

			max_rate = ehl_max_source_rate(intel_dp);

		else

			max_rate = icl_max_source_rate(intel_dp);

	} else if (IS_GEN9_LP(dev_priv)) {