Commit 1ba1014d authored by Tejas Upadhyay's avatar Tejas Upadhyay Committed by José Roberto de Souza
Browse files

drm/i915/edp/jsl: Update vswing table for HBR and HBR2 



JSL has update in vswing table for eDP.

BSpec: 21257

Changes since V1:
        - Fixed few checkpatch errors

Cc: Souza Jose <jose.souza@intel.com>
Signed-off-by: default avatarTejas Upadhyay <tejaskumarx.surendrakumar.upadhyay@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201020053657.99890-1-tejaskumarx.surendrakumar.upadhyay@intel.com
parent 11ffe972

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

+85 −2
Original line number Diff line number Diff line
@@ -582,6 +582,34 @@ static const struct cnl_ddi_buf_trans ehl_combo_phy_ddi_translations_dp[] = { 
	{ 0x6, 0x7F, 0x3F, 0x00, 0x00 },	/* 900   900      0.0   */

};



static const struct cnl_ddi_buf_trans jsl_combo_phy_ddi_translations_edp_hbr[] = {

						/* NT mV Trans mV db    */

	{ 0x8, 0x7F, 0x3F, 0x00, 0x00 },        /* 200   200      0.0   */

	{ 0x8, 0x7F, 0x38, 0x00, 0x07 },        /* 200   250      1.9   */

	{ 0x1, 0x7F, 0x33, 0x00, 0x0C },        /* 200   300      3.5   */

	{ 0xA, 0x35, 0x36, 0x00, 0x09 },        /* 200   350      4.9   */

	{ 0x8, 0x7F, 0x3F, 0x00, 0x00 },        /* 250   250      0.0   */

	{ 0x1, 0x7F, 0x38, 0x00, 0x07 },        /* 250   300      1.6   */

	{ 0xA, 0x35, 0x35, 0x00, 0x0A },        /* 250   350      2.9   */

	{ 0x1, 0x7F, 0x3F, 0x00, 0x00 },        /* 300   300      0.0   */

	{ 0xA, 0x35, 0x38, 0x00, 0x07 },        /* 300   350      1.3   */

	{ 0xA, 0x35, 0x3F, 0x00, 0x00 },        /* 350   350      0.0   */

};



static const struct cnl_ddi_buf_trans jsl_combo_phy_ddi_translations_edp_hbr2[] = {

						/* NT mV Trans mV db    */

	{ 0x8, 0x7F, 0x3F, 0x00, 0x00 },        /* 200   200      0.0   */

	{ 0x8, 0x7F, 0x3F, 0x00, 0x00 },        /* 200   250      1.9   */

	{ 0x1, 0x7F, 0x3D, 0x00, 0x02 },        /* 200   300      3.5   */

	{ 0xA, 0x35, 0x38, 0x00, 0x07 },        /* 200   350      4.9   */

	{ 0x8, 0x7F, 0x3F, 0x00, 0x00 },        /* 250   250      0.0   */

	{ 0x1, 0x7F, 0x3F, 0x00, 0x00 },        /* 250   300      1.6   */

	{ 0xA, 0x35, 0x3A, 0x00, 0x05 },        /* 250   350      2.9   */

	{ 0x1, 0x7F, 0x3F, 0x00, 0x00 },        /* 300   300      0.0   */

	{ 0xA, 0x35, 0x38, 0x00, 0x07 },        /* 300   350      1.3   */

	{ 0xA, 0x35, 0x3F, 0x00, 0x00 },        /* 350   350      0.0   */

};



struct icl_mg_phy_ddi_buf_trans {

	u32 cri_txdeemph_override_11_6;

	u32 cri_txdeemph_override_5_0;
@@ -1162,6 +1190,57 @@ ehl_get_combo_buf_trans(struct intel_encoder *encoder, 
		return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries);

}



static const struct cnl_ddi_buf_trans *

jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder,

			     const struct intel_crtc_state *crtc_state,

			     int *n_entries)

{

	*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_hdmi);

	return icl_combo_phy_ddi_translations_hdmi;

}



static const struct cnl_ddi_buf_trans *

jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder,

			   const struct intel_crtc_state *crtc_state,

			   int *n_entries)

{

	*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_dp_hbr2);

	return icl_combo_phy_ddi_translations_dp_hbr2;

}



static const struct cnl_ddi_buf_trans *

jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder,

			    const struct intel_crtc_state *crtc_state,

			    int *n_entries)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);



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

		if (crtc_state->port_clock > 270000) {

			*n_entries = ARRAY_SIZE(jsl_combo_phy_ddi_translations_edp_hbr2);

			return jsl_combo_phy_ddi_translations_edp_hbr2;

		} else {

			*n_entries = ARRAY_SIZE(jsl_combo_phy_ddi_translations_edp_hbr);

			return jsl_combo_phy_ddi_translations_edp_hbr;

		}

	}



	return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries);

}



static const struct cnl_ddi_buf_trans *

jsl_get_combo_buf_trans(struct intel_encoder *encoder,

			const struct intel_crtc_state *crtc_state,

			int *n_entries)

{

	if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))

		return jsl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries);

	else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP))

		return jsl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries);

	else

		return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries);

}



static const struct cnl_ddi_buf_trans *

tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder,

			     const struct intel_crtc_state *crtc_state,
@@ -2363,7 +2442,9 @@ static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp, 
		else

			tgl_get_dkl_buf_trans(encoder, crtc_state, &n_entries);

	} else if (INTEL_GEN(dev_priv) == 11) {

		if (IS_JSL_EHL(dev_priv))

		if (IS_PLATFORM(dev_priv, INTEL_JASPERLAKE))

			jsl_get_combo_buf_trans(encoder, crtc_state, &n_entries);

		else if (IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE))

			ehl_get_combo_buf_trans(encoder, crtc_state, &n_entries);

		else if (intel_phy_is_combo(dev_priv, phy))

			icl_get_combo_buf_trans(encoder, crtc_state, &n_entries);
@@ -2544,7 +2625,9 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, 


	if (INTEL_GEN(dev_priv) >= 12)

		ddi_translations = tgl_get_combo_buf_trans(encoder, crtc_state, &n_entries);

	else if (IS_JSL_EHL(dev_priv))

	else if (IS_PLATFORM(dev_priv, INTEL_JASPERLAKE))

		ddi_translations = jsl_get_combo_buf_trans(encoder, crtc_state, &n_entries);

	else if (IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE))

		ddi_translations = ehl_get_combo_buf_trans(encoder, crtc_state, &n_entries);

	else

		ddi_translations = icl_get_combo_buf_trans(encoder, crtc_state, &n_entries);

CRA Git | Maintained and supported by SUSTech CRA and CCSE