* [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes
@ 2021-06-08 7:35 Ville Syrjala
2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 01/17] drm/i915: s/intel/hsw/ for hsw/bdw/skl buf trans Ville Syrjala
` (21 more replies)
0 siblings, 22 replies; 39+ messages in thread
From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw)
To: intel-gfx
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
The DDI buf trans functions keep turning into bad
spaghetti every time a new platform gets added.
Split the platforms up properly and turn the whole
thing into a vfunc to make it easier to manage
multiple platforms.
v2: Rebase due to adl-p landing in the meantime
Ville Syrjälä (17):
drm/i915: s/intel/hsw/ for hsw/bdw/skl buf trans
drm/i915: Introduce hsw_get_buf_trans()
drm/i915: Wrap the platform specific buf trans structs into a union
drm/i915: Rename dkl phy buf trans tables
drm/i915: Wrap the buf trans tables into a struct
drm/i915: Introduce intel_get_buf_trans()
drm/i915; Return the whole buf_trans struct from get_buf_trans()
drm/i915: Store the HDMI default entry in the bug trans struct
drm/i915: Introduce encoder->get_buf_trans()
drm/i915: Clean up hsw/bdw/skl/kbl buf trans funcs
drm/i915: Introduce rkl_get_combo_buf_trans()
drm/i915: Fix dg1 buf trans tables
drm/i915: Deduplicate icl DP HBR2 vs. eDP HBR3 table
drm/i915: Fix ehl edp hbr2 vswing table
drm/i915: Clean up jsl/ehl buf trans functions
drm/i915: Nuke buf_trans hdmi functions
drm/i915: Add the missing adls vswing tables
drivers/gpu/drm/i915/display/intel_crt.c | 3 +
drivers/gpu/drm/i915/display/intel_ddi.c | 167 +-
drivers/gpu/drm/i915/display/intel_ddi.h | 4 +-
.../drm/i915/display/intel_ddi_buf_trans.c | 2437 ++++++++++-------
.../drm/i915/display/intel_ddi_buf_trans.h | 68 +-
.../drm/i915/display/intel_display_types.h | 4 +
drivers/gpu/drm/i915/display/intel_fdi.c | 5 +-
7 files changed, 1473 insertions(+), 1215 deletions(-)
--
2.31.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 39+ messages in thread* [Intel-gfx] [PATCH v2 01/17] drm/i915: s/intel/hsw/ for hsw/bdw/skl buf trans 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 02/17] drm/i915: Introduce hsw_get_buf_trans() Ville Syrjala ` (20 subsequent siblings) 21 siblings, 0 replies; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> Give the hsw/bdw/skl buf trans stuff a better namespace. Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_ddi.c | 39 +++++---- drivers/gpu/drm/i915/display/intel_ddi.h | 4 +- .../drm/i915/display/intel_ddi_buf_trans.c | 79 +++++++++---------- .../drm/i915/display/intel_ddi_buf_trans.h | 20 +++-- drivers/gpu/drm/i915/display/intel_fdi.c | 4 +- 5 files changed, 70 insertions(+), 76 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 390869bd6b63..107e4903b697 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -95,24 +95,21 @@ static int intel_ddi_hdmi_level(struct intel_encoder *encoder, * values in advance. This function programs the correct values for * DP/eDP/FDI use cases. */ -void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state) +void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); u32 iboost_bit = 0; int i, n_entries; enum port port = encoder->port; - const struct ddi_buf_trans *ddi_translations; + const struct hsw_ddi_buf_trans *ddi_translations; if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_ANALOG)) - ddi_translations = intel_ddi_get_buf_trans_fdi(dev_priv, - &n_entries); + ddi_translations = hsw_ddi_get_buf_trans_fdi(dev_priv, &n_entries); else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) - ddi_translations = intel_ddi_get_buf_trans_edp(encoder, - &n_entries); + ddi_translations = hsw_ddi_get_buf_trans_edp(encoder, &n_entries); else - ddi_translations = intel_ddi_get_buf_trans_dp(encoder, - &n_entries); + ddi_translations = hsw_ddi_get_buf_trans_dp(encoder, &n_entries); /* If we're boosting the current, set bit 31 of trans1 */ if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv) && @@ -132,16 +129,16 @@ void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder, * values in advance. This function programs the correct values for * HDMI/DVI use cases. */ -static void intel_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, - int level) +static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, + int level) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); u32 iboost_bit = 0; int n_entries; enum port port = encoder->port; - const struct ddi_buf_trans *ddi_translations; + const struct hsw_ddi_buf_trans *ddi_translations; - ddi_translations = intel_ddi_get_buf_trans_hdmi(encoder, &n_entries); + ddi_translations = hsw_ddi_get_buf_trans_hdmi(encoder, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; @@ -948,15 +945,15 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, iboost = intel_bios_encoder_dp_boost_level(encoder->devdata); if (iboost == 0) { - const struct ddi_buf_trans *ddi_translations; + const struct hsw_ddi_buf_trans *ddi_translations; int n_entries; if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - ddi_translations = intel_ddi_get_buf_trans_hdmi(encoder, &n_entries); + ddi_translations = hsw_ddi_get_buf_trans_hdmi(encoder, &n_entries); else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) - ddi_translations = intel_ddi_get_buf_trans_edp(encoder, &n_entries); + ddi_translations = hsw_ddi_get_buf_trans_edp(encoder, &n_entries); else - ddi_translations = intel_ddi_get_buf_trans_dp(encoder, &n_entries); + ddi_translations = hsw_ddi_get_buf_trans_dp(encoder, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; @@ -1031,9 +1028,9 @@ static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp, bxt_get_buf_trans(encoder, crtc_state, &n_entries); } else { if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) - intel_ddi_get_buf_trans_edp(encoder, &n_entries); + hsw_ddi_get_buf_trans_edp(encoder, &n_entries); else - intel_ddi_get_buf_trans_dp(encoder, &n_entries); + hsw_ddi_get_buf_trans_dp(encoder, &n_entries); } if (drm_WARN_ON(&dev_priv->drm, n_entries < 1)) @@ -2702,7 +2699,7 @@ static void hsw_ddi_pre_enable_dp(struct intel_atomic_state *state, else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) bxt_ddi_vswing_sequence(encoder, crtc_state, level); else - intel_prepare_dp_ddi_buffers(encoder, crtc_state); + hsw_prepare_dp_ddi_buffers(encoder, crtc_state); intel_ddi_power_up_lanes(encoder, crtc_state); @@ -3149,7 +3146,7 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state, else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) bxt_ddi_vswing_sequence(encoder, crtc_state, level); else - intel_prepare_hdmi_ddi_buffers(encoder, level); + hsw_prepare_hdmi_ddi_buffers(encoder, level); if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) skl_ddi_set_iboost(encoder, crtc_state, level); diff --git a/drivers/gpu/drm/i915/display/intel_ddi.h b/drivers/gpu/drm/i915/display/intel_ddi.h index 59c6b01d4199..7d448485d887 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.h +++ b/drivers/gpu/drm/i915/display/intel_ddi.h @@ -40,8 +40,8 @@ bool hsw_ddi_is_clock_enabled(struct intel_encoder *encoder); void hsw_ddi_get_config(struct intel_encoder *encoder, struct intel_crtc_state *crtc_state); struct intel_shared_dpll *icl_ddi_combo_get_pll(struct intel_encoder *encoder); -void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state); +void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state); void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv, enum port port); void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port); diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index 8bfd00f49f2a..e8e46d7a6cef 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -13,7 +13,7 @@ * them for both DP and FDI transports, allowing those ports to * automatically adapt to HDMI connections as well */ -static const struct ddi_buf_trans hsw_ddi_translations_dp[] = { +static const struct hsw_ddi_buf_trans hsw_ddi_translations_dp[] = { { 0x00FFFFFF, 0x0006000E, 0x0 }, { 0x00D75FFF, 0x0005000A, 0x0 }, { 0x00C30FFF, 0x00040006, 0x0 }, @@ -25,7 +25,7 @@ static const struct ddi_buf_trans hsw_ddi_translations_dp[] = { { 0x80D75FFF, 0x000B0000, 0x0 }, }; -static const struct ddi_buf_trans hsw_ddi_translations_fdi[] = { +static const struct hsw_ddi_buf_trans hsw_ddi_translations_fdi[] = { { 0x00FFFFFF, 0x0007000E, 0x0 }, { 0x00D75FFF, 0x000F000A, 0x0 }, { 0x00C30FFF, 0x00060006, 0x0 }, @@ -37,7 +37,7 @@ static const struct ddi_buf_trans hsw_ddi_translations_fdi[] = { { 0x00D75FFF, 0x001E0000, 0x0 }, }; -static const struct ddi_buf_trans hsw_ddi_translations_hdmi[] = { +static const struct hsw_ddi_buf_trans hsw_ddi_translations_hdmi[] = { /* Idx NT mV d T mV d db */ { 0x00FFFFFF, 0x0006000E, 0x0 },/* 0: 400 400 0 */ { 0x00E79FFF, 0x000E000C, 0x0 },/* 1: 400 500 2 */ @@ -53,7 +53,7 @@ static const struct ddi_buf_trans hsw_ddi_translations_hdmi[] = { { 0x80FFFFFF, 0x00030002, 0x0 },/* 11: 1000 1000 0 */ }; -static const struct ddi_buf_trans bdw_ddi_translations_edp[] = { +static const struct hsw_ddi_buf_trans bdw_ddi_translations_edp[] = { { 0x00FFFFFF, 0x00000012, 0x0 }, { 0x00EBAFFF, 0x00020011, 0x0 }, { 0x00C71FFF, 0x0006000F, 0x0 }, @@ -65,7 +65,7 @@ static const struct ddi_buf_trans bdw_ddi_translations_edp[] = { { 0x00DB6FFF, 0x000A000C, 0x0 }, }; -static const struct ddi_buf_trans bdw_ddi_translations_dp[] = { +static const struct hsw_ddi_buf_trans bdw_ddi_translations_dp[] = { { 0x00FFFFFF, 0x0007000E, 0x0 }, { 0x00D75FFF, 0x000E000A, 0x0 }, { 0x00BEFFFF, 0x00140006, 0x0 }, @@ -77,7 +77,7 @@ static const struct ddi_buf_trans bdw_ddi_translations_dp[] = { { 0x80D75FFF, 0x001B0002, 0x0 }, }; -static const struct ddi_buf_trans bdw_ddi_translations_fdi[] = { +static const struct hsw_ddi_buf_trans bdw_ddi_translations_fdi[] = { { 0x00FFFFFF, 0x0001000E, 0x0 }, { 0x00D75FFF, 0x0004000A, 0x0 }, { 0x00C30FFF, 0x00070006, 0x0 }, @@ -89,7 +89,7 @@ static const struct ddi_buf_trans bdw_ddi_translations_fdi[] = { { 0x00D75FFF, 0x000C0000, 0x0 }, }; -static const struct ddi_buf_trans bdw_ddi_translations_hdmi[] = { +static const struct hsw_ddi_buf_trans bdw_ddi_translations_hdmi[] = { /* Idx NT mV d T mV df db */ { 0x00FFFFFF, 0x0007000E, 0x0 },/* 0: 400 400 0 */ { 0x00D75FFF, 0x000E000A, 0x0 },/* 1: 400 600 3.5 */ @@ -104,7 +104,7 @@ static const struct ddi_buf_trans bdw_ddi_translations_hdmi[] = { }; /* Skylake H and S */ -static const struct ddi_buf_trans skl_ddi_translations_dp[] = { +static const struct hsw_ddi_buf_trans skl_ddi_translations_dp[] = { { 0x00002016, 0x000000A0, 0x0 }, { 0x00005012, 0x0000009B, 0x0 }, { 0x00007011, 0x00000088, 0x0 }, @@ -117,7 +117,7 @@ static const struct ddi_buf_trans skl_ddi_translations_dp[] = { }; /* Skylake U */ -static const struct ddi_buf_trans skl_u_ddi_translations_dp[] = { +static const struct hsw_ddi_buf_trans skl_u_ddi_translations_dp[] = { { 0x0000201B, 0x000000A2, 0x0 }, { 0x00005012, 0x00000088, 0x0 }, { 0x80007011, 0x000000CD, 0x1 }, @@ -130,7 +130,7 @@ static const struct ddi_buf_trans skl_u_ddi_translations_dp[] = { }; /* Skylake Y */ -static const struct ddi_buf_trans skl_y_ddi_translations_dp[] = { +static const struct hsw_ddi_buf_trans skl_y_ddi_translations_dp[] = { { 0x00000018, 0x000000A2, 0x0 }, { 0x00005012, 0x00000088, 0x0 }, { 0x80007011, 0x000000CD, 0x3 }, @@ -143,7 +143,7 @@ static const struct ddi_buf_trans skl_y_ddi_translations_dp[] = { }; /* Kabylake H and S */ -static const struct ddi_buf_trans kbl_ddi_translations_dp[] = { +static const struct hsw_ddi_buf_trans kbl_ddi_translations_dp[] = { { 0x00002016, 0x000000A0, 0x0 }, { 0x00005012, 0x0000009B, 0x0 }, { 0x00007011, 0x00000088, 0x0 }, @@ -156,7 +156,7 @@ static const struct ddi_buf_trans kbl_ddi_translations_dp[] = { }; /* Kabylake U */ -static const struct ddi_buf_trans kbl_u_ddi_translations_dp[] = { +static const struct hsw_ddi_buf_trans kbl_u_ddi_translations_dp[] = { { 0x0000201B, 0x000000A1, 0x0 }, { 0x00005012, 0x00000088, 0x0 }, { 0x80007011, 0x000000CD, 0x3 }, @@ -169,7 +169,7 @@ static const struct ddi_buf_trans kbl_u_ddi_translations_dp[] = { }; /* Kabylake Y */ -static const struct ddi_buf_trans kbl_y_ddi_translations_dp[] = { +static const struct hsw_ddi_buf_trans kbl_y_ddi_translations_dp[] = { { 0x00001017, 0x000000A1, 0x0 }, { 0x00005012, 0x00000088, 0x0 }, { 0x80007011, 0x000000CD, 0x3 }, @@ -185,7 +185,7 @@ static const struct ddi_buf_trans kbl_y_ddi_translations_dp[] = { * Skylake/Kabylake H and S * eDP 1.4 low vswing translation parameters */ -static const struct ddi_buf_trans skl_ddi_translations_edp[] = { +static const struct hsw_ddi_buf_trans skl_ddi_translations_edp[] = { { 0x00000018, 0x000000A8, 0x0 }, { 0x00004013, 0x000000A9, 0x0 }, { 0x00007011, 0x000000A2, 0x0 }, @@ -202,7 +202,7 @@ static const struct ddi_buf_trans skl_ddi_translations_edp[] = { * Skylake/Kabylake U * eDP 1.4 low vswing translation parameters */ -static const struct ddi_buf_trans skl_u_ddi_translations_edp[] = { +static const struct hsw_ddi_buf_trans skl_u_ddi_translations_edp[] = { { 0x00000018, 0x000000A8, 0x0 }, { 0x00004013, 0x000000A9, 0x0 }, { 0x00007011, 0x000000A2, 0x0 }, @@ -219,7 +219,7 @@ static const struct ddi_buf_trans skl_u_ddi_translations_edp[] = { * Skylake/Kabylake Y * eDP 1.4 low vswing translation parameters */ -static const struct ddi_buf_trans skl_y_ddi_translations_edp[] = { +static const struct hsw_ddi_buf_trans skl_y_ddi_translations_edp[] = { { 0x00000018, 0x000000A8, 0x0 }, { 0x00004013, 0x000000AB, 0x0 }, { 0x00007011, 0x000000A4, 0x0 }, @@ -233,7 +233,7 @@ static const struct ddi_buf_trans skl_y_ddi_translations_edp[] = { }; /* Skylake/Kabylake U, H and S */ -static const struct ddi_buf_trans skl_ddi_translations_hdmi[] = { +static const struct hsw_ddi_buf_trans skl_ddi_translations_hdmi[] = { { 0x00000018, 0x000000AC, 0x0 }, { 0x00005012, 0x0000009D, 0x0 }, { 0x00007011, 0x00000088, 0x0 }, @@ -248,7 +248,7 @@ static const struct ddi_buf_trans skl_ddi_translations_hdmi[] = { }; /* Skylake/Kabylake Y */ -static const struct ddi_buf_trans skl_y_ddi_translations_hdmi[] = { +static const struct hsw_ddi_buf_trans skl_y_ddi_translations_hdmi[] = { { 0x00000018, 0x000000A1, 0x0 }, { 0x00005012, 0x000000DF, 0x0 }, { 0x80007011, 0x000000CB, 0x3 }, @@ -262,7 +262,6 @@ static const struct ddi_buf_trans skl_y_ddi_translations_hdmi[] = { { 0x80000018, 0x000000C0, 0x3 }, }; - static const struct bxt_ddi_buf_trans bxt_ddi_translations_dp[] = { /* Idx NT mV diff db */ { 52, 0x9A, 0, 128, }, /* 0: 400 0 */ @@ -768,7 +767,7 @@ bool is_hobl_buf_trans(const struct cnl_ddi_buf_trans *table) return table == tgl_combo_phy_ddi_translations_edp_hbr2_hobl; } -static const struct ddi_buf_trans * +static const struct hsw_ddi_buf_trans * bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -782,7 +781,7 @@ bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) } } -static const struct ddi_buf_trans * +static const struct hsw_ddi_buf_trans * skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -799,7 +798,7 @@ skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) } } -static const struct ddi_buf_trans * +static const struct hsw_ddi_buf_trans * kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -820,7 +819,7 @@ kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) } } -static const struct ddi_buf_trans * +static const struct hsw_ddi_buf_trans * skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -852,7 +851,7 @@ skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) return skl_get_buf_trans_dp(encoder, n_entries); } -static const struct ddi_buf_trans * +static const struct hsw_ddi_buf_trans * skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries) { if (IS_SKL_ULX(dev_priv) || @@ -876,20 +875,20 @@ static int skl_buf_trans_num_entries(enum port port, int n_entries) return min(n_entries, 9); } -const struct ddi_buf_trans * -intel_ddi_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) +const struct hsw_ddi_buf_trans * +hsw_ddi_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv) || IS_COMETLAKE(dev_priv)) { - const struct ddi_buf_trans *ddi_translations = + const struct hsw_ddi_buf_trans *ddi_translations = kbl_get_buf_trans_dp(encoder, n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); return ddi_translations; } else if (IS_SKYLAKE(dev_priv)) { - const struct ddi_buf_trans *ddi_translations = + const struct hsw_ddi_buf_trans *ddi_translations = skl_get_buf_trans_dp(encoder, n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); return ddi_translations; @@ -905,13 +904,13 @@ intel_ddi_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) return NULL; } -const struct ddi_buf_trans * -intel_ddi_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) +const struct hsw_ddi_buf_trans * +hsw_ddi_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) { - const struct ddi_buf_trans *ddi_translations = + const struct hsw_ddi_buf_trans *ddi_translations = skl_get_buf_trans_edp(encoder, n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); return ddi_translations; @@ -926,9 +925,9 @@ intel_ddi_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) return NULL; } -const struct ddi_buf_trans * -intel_ddi_get_buf_trans_fdi(struct drm_i915_private *dev_priv, - int *n_entries) +const struct hsw_ddi_buf_trans * +hsw_ddi_get_buf_trans_fdi(struct drm_i915_private *dev_priv, + int *n_entries) { if (IS_BROADWELL(dev_priv)) { *n_entries = ARRAY_SIZE(bdw_ddi_translations_fdi); @@ -942,9 +941,9 @@ intel_ddi_get_buf_trans_fdi(struct drm_i915_private *dev_priv, return NULL; } -const struct ddi_buf_trans * -intel_ddi_get_buf_trans_hdmi(struct intel_encoder *encoder, - int *n_entries) +const struct hsw_ddi_buf_trans * +hsw_ddi_get_buf_trans_hdmi(struct intel_encoder *encoder, + int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1428,13 +1427,13 @@ int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, bxt_get_buf_trans_hdmi(encoder, &n_entries); *default_entry = n_entries - 1; } else if (DISPLAY_VER(dev_priv) == 9) { - intel_ddi_get_buf_trans_hdmi(encoder, &n_entries); + hsw_ddi_get_buf_trans_hdmi(encoder, &n_entries); *default_entry = 8; } else if (IS_BROADWELL(dev_priv)) { - intel_ddi_get_buf_trans_hdmi(encoder, &n_entries); + hsw_ddi_get_buf_trans_hdmi(encoder, &n_entries); *default_entry = 7; } else if (IS_HASWELL(dev_priv)) { - intel_ddi_get_buf_trans_hdmi(encoder, &n_entries); + hsw_ddi_get_buf_trans_hdmi(encoder, &n_entries); *default_entry = 6; } else { drm_WARN(&dev_priv->drm, 1, "ddi translation table missing\n"); diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h index 4c2efab38642..1b8d3ef7f06f 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h @@ -12,7 +12,7 @@ struct drm_i915_private; struct intel_encoder; struct intel_crtc_state; -struct ddi_buf_trans { +struct hsw_ddi_buf_trans { u32 trans1; /* balance leg enable, de-emph level */ u32 trans2; /* vref sel, vswing */ u8 i_boost; /* SKL: I_boost; valid: 0x0, 0x1, 0x3, 0x7 */ @@ -51,16 +51,14 @@ int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *default_entry); -const struct ddi_buf_trans * -intel_ddi_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries); -const struct ddi_buf_trans * -intel_ddi_get_buf_trans_fdi(struct drm_i915_private *dev_priv, - int *n_entries); -const struct ddi_buf_trans * -intel_ddi_get_buf_trans_hdmi(struct intel_encoder *encoder, - int *n_entries); -const struct ddi_buf_trans * -intel_ddi_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries); +const struct hsw_ddi_buf_trans * +hsw_ddi_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries); +const struct hsw_ddi_buf_trans * +hsw_ddi_get_buf_trans_fdi(struct drm_i915_private *dev_priv, int *n_entries); +const struct hsw_ddi_buf_trans * +hsw_ddi_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries); +const struct hsw_ddi_buf_trans * +hsw_ddi_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries); const struct bxt_ddi_buf_trans * bxt_get_buf_trans(struct intel_encoder *encoder, diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c index cef1061fd6cb..a806e1b83613 100644 --- a/drivers/gpu/drm/i915/display/intel_fdi.c +++ b/drivers/gpu/drm/i915/display/intel_fdi.c @@ -569,9 +569,9 @@ void hsw_fdi_link_train(struct intel_encoder *encoder, u32 temp, i, rx_ctl_val; int n_entries; - intel_ddi_get_buf_trans_fdi(dev_priv, &n_entries); + hsw_ddi_get_buf_trans_fdi(dev_priv, &n_entries); - intel_prepare_dp_ddi_buffers(encoder, crtc_state); + hsw_prepare_dp_ddi_buffers(encoder, crtc_state); /* Set the FDI_RX_MISC pwrdn lanes and the 2 workarounds listed at the * mode set "sequence for CRT port" document: -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 02/17] drm/i915: Introduce hsw_get_buf_trans() 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 01/17] drm/i915: s/intel/hsw/ for hsw/bdw/skl buf trans Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 03/17] drm/i915: Wrap the platform specific buf trans structs into a union Ville Syrjala ` (19 subsequent siblings) 21 siblings, 0 replies; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> All the other platforms handle the output_type stuff in their *_get_buf_trans() functions. Do the same for hsw/bdw/skl. Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_ddi.c | 27 ++++-------- .../drm/i915/display/intel_ddi_buf_trans.c | 43 +++++++++++++------ .../drm/i915/display/intel_ddi_buf_trans.h | 10 ++--- drivers/gpu/drm/i915/display/intel_fdi.c | 2 +- 4 files changed, 43 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 107e4903b697..33e94030090f 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -104,12 +104,10 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, enum port port = encoder->port; const struct hsw_ddi_buf_trans *ddi_translations; - if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_ANALOG)) - ddi_translations = hsw_ddi_get_buf_trans_fdi(dev_priv, &n_entries); - else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) - ddi_translations = hsw_ddi_get_buf_trans_edp(encoder, &n_entries); - else - ddi_translations = hsw_ddi_get_buf_trans_dp(encoder, &n_entries); + ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); + + if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) + return; /* If we're boosting the current, set bit 31 of trans1 */ if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv) && @@ -130,6 +128,7 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, * HDMI/DVI use cases. */ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, int level) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -138,7 +137,7 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, enum port port = encoder->port; const struct hsw_ddi_buf_trans *ddi_translations; - ddi_translations = hsw_ddi_get_buf_trans_hdmi(encoder, &n_entries); + ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; @@ -948,12 +947,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, const struct hsw_ddi_buf_trans *ddi_translations; int n_entries; - if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - ddi_translations = hsw_ddi_get_buf_trans_hdmi(encoder, &n_entries); - else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) - ddi_translations = hsw_ddi_get_buf_trans_edp(encoder, &n_entries); - else - ddi_translations = hsw_ddi_get_buf_trans_dp(encoder, &n_entries); + ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; @@ -1027,10 +1021,7 @@ static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp, } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) { bxt_get_buf_trans(encoder, crtc_state, &n_entries); } else { - if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) - hsw_ddi_get_buf_trans_edp(encoder, &n_entries); - else - hsw_ddi_get_buf_trans_dp(encoder, &n_entries); + hsw_get_buf_trans(encoder, crtc_state, &n_entries); } if (drm_WARN_ON(&dev_priv->drm, n_entries < 1)) @@ -3146,7 +3137,7 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state, else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) bxt_ddi_vswing_sequence(encoder, crtc_state, level); else - hsw_prepare_hdmi_ddi_buffers(encoder, level); + hsw_prepare_hdmi_ddi_buffers(encoder, crtc_state, level); if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) skl_ddi_set_iboost(encoder, crtc_state, level); diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index e8e46d7a6cef..f7b7178363e8 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -875,8 +875,8 @@ static int skl_buf_trans_num_entries(enum port port, int n_entries) return min(n_entries, 9); } -const struct hsw_ddi_buf_trans * -hsw_ddi_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) +static const struct hsw_ddi_buf_trans * +hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -904,8 +904,8 @@ hsw_ddi_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) return NULL; } -const struct hsw_ddi_buf_trans * -hsw_ddi_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) +static const struct hsw_ddi_buf_trans * +hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -925,10 +925,12 @@ hsw_ddi_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) return NULL; } -const struct hsw_ddi_buf_trans * -hsw_ddi_get_buf_trans_fdi(struct drm_i915_private *dev_priv, - int *n_entries) +static const struct hsw_ddi_buf_trans * +hsw_get_buf_trans_fdi(struct intel_encoder *encoder, + int *n_entries) { + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + if (IS_BROADWELL(dev_priv)) { *n_entries = ARRAY_SIZE(bdw_ddi_translations_fdi); return bdw_ddi_translations_fdi; @@ -941,9 +943,9 @@ hsw_ddi_get_buf_trans_fdi(struct drm_i915_private *dev_priv, return NULL; } -const struct hsw_ddi_buf_trans * -hsw_ddi_get_buf_trans_hdmi(struct intel_encoder *encoder, - int *n_entries) +static const struct hsw_ddi_buf_trans * +hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, + int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -961,6 +963,21 @@ hsw_ddi_get_buf_trans_hdmi(struct intel_encoder *encoder, return NULL; } +const struct hsw_ddi_buf_trans * +hsw_get_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_ANALOG)) + return hsw_get_buf_trans_fdi(encoder, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) + return hsw_get_buf_trans_hdmi(encoder, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) + return hsw_get_buf_trans_edp(encoder, n_entries); + else + return hsw_get_buf_trans_dp(encoder, n_entries); +} + static const struct bxt_ddi_buf_trans * bxt_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { @@ -1427,13 +1444,13 @@ int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, bxt_get_buf_trans_hdmi(encoder, &n_entries); *default_entry = n_entries - 1; } else if (DISPLAY_VER(dev_priv) == 9) { - hsw_ddi_get_buf_trans_hdmi(encoder, &n_entries); + hsw_get_buf_trans_hdmi(encoder, &n_entries); *default_entry = 8; } else if (IS_BROADWELL(dev_priv)) { - hsw_ddi_get_buf_trans_hdmi(encoder, &n_entries); + hsw_get_buf_trans_hdmi(encoder, &n_entries); *default_entry = 7; } else if (IS_HASWELL(dev_priv)) { - hsw_ddi_get_buf_trans_hdmi(encoder, &n_entries); + hsw_get_buf_trans_hdmi(encoder, &n_entries); *default_entry = 6; } else { drm_WARN(&dev_priv->drm, 1, "ddi translation table missing\n"); diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h index 1b8d3ef7f06f..428f1f343341 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h @@ -52,13 +52,9 @@ int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, int *default_entry); const struct hsw_ddi_buf_trans * -hsw_ddi_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries); -const struct hsw_ddi_buf_trans * -hsw_ddi_get_buf_trans_fdi(struct drm_i915_private *dev_priv, int *n_entries); -const struct hsw_ddi_buf_trans * -hsw_ddi_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries); -const struct hsw_ddi_buf_trans * -hsw_ddi_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries); +hsw_get_buf_trans(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries); const struct bxt_ddi_buf_trans * bxt_get_buf_trans(struct intel_encoder *encoder, diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c index a806e1b83613..c602ed17c4fb 100644 --- a/drivers/gpu/drm/i915/display/intel_fdi.c +++ b/drivers/gpu/drm/i915/display/intel_fdi.c @@ -569,7 +569,7 @@ void hsw_fdi_link_train(struct intel_encoder *encoder, u32 temp, i, rx_ctl_val; int n_entries; - hsw_ddi_get_buf_trans_fdi(dev_priv, &n_entries); + hsw_get_buf_trans(encoder, crtc_state, &n_entries); hsw_prepare_dp_ddi_buffers(encoder, crtc_state); -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 03/17] drm/i915: Wrap the platform specific buf trans structs into a union 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 01/17] drm/i915: s/intel/hsw/ for hsw/bdw/skl buf trans Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 02/17] drm/i915: Introduce hsw_get_buf_trans() Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-18 12:04 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 04/17] drm/i915: Rename dkl phy buf trans tables Ville Syrjala ` (18 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> In order to abstact the buf trans stuff let's wrap the platform specific structs into a union. v2: Handle adl-p Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_ddi.c | 76 +- .../drm/i915/display/intel_ddi_buf_trans.c | 1370 ++++++++--------- .../drm/i915/display/intel_ddi_buf_trans.h | 30 +- 3 files changed, 742 insertions(+), 734 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 33e94030090f..f3fba535812c 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -102,7 +102,7 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, u32 iboost_bit = 0; int i, n_entries; enum port port = encoder->port; - const struct hsw_ddi_buf_trans *ddi_translations; + const union intel_ddi_buf_trans_entry *ddi_translations; ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); @@ -116,9 +116,9 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, for (i = 0; i < n_entries; i++) { intel_de_write(dev_priv, DDI_BUF_TRANS_LO(port, i), - ddi_translations[i].trans1 | iboost_bit); + ddi_translations[i].hsw.trans1 | iboost_bit); intel_de_write(dev_priv, DDI_BUF_TRANS_HI(port, i), - ddi_translations[i].trans2); + ddi_translations[i].hsw.trans2); } } @@ -135,7 +135,7 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, u32 iboost_bit = 0; int n_entries; enum port port = encoder->port; - const struct hsw_ddi_buf_trans *ddi_translations; + const union intel_ddi_buf_trans_entry *ddi_translations; ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); @@ -151,9 +151,9 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, /* Entry 9 is for HDMI: */ intel_de_write(dev_priv, DDI_BUF_TRANS_LO(port, 9), - ddi_translations[level].trans1 | iboost_bit); + ddi_translations[level].hsw.trans1 | iboost_bit); intel_de_write(dev_priv, DDI_BUF_TRANS_HI(port, 9), - ddi_translations[level].trans2); + ddi_translations[level].hsw.trans2); } void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv, @@ -944,7 +944,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, iboost = intel_bios_encoder_dp_boost_level(encoder->devdata); if (iboost == 0) { - const struct hsw_ddi_buf_trans *ddi_translations; + const union intel_ddi_buf_trans_entry *ddi_translations; int n_entries; ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); @@ -954,7 +954,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) level = n_entries - 1; - iboost = ddi_translations[level].i_boost; + iboost = ddi_translations[level].hsw.i_boost; } /* Make sure that the requested I_boost is valid */ @@ -974,7 +974,7 @@ static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder, int level) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - const struct bxt_ddi_buf_trans *ddi_translations; + const union intel_ddi_buf_trans_entry *ddi_translations; enum port port = encoder->port; int n_entries; @@ -985,10 +985,10 @@ static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder, level = n_entries - 1; bxt_ddi_phy_set_signal_level(dev_priv, port, - ddi_translations[level].margin, - ddi_translations[level].scale, - ddi_translations[level].enable, - ddi_translations[level].deemphasis); + ddi_translations[level].bxt.margin, + ddi_translations[level].bxt.scale, + ddi_translations[level].bxt.enable, + ddi_translations[level].bxt.deemphasis); } static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp, @@ -1049,7 +1049,7 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, int level) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - const struct cnl_ddi_buf_trans *ddi_translations; + const union intel_ddi_buf_trans_entry *ddi_translations; enum port port = encoder->port; int n_entries, ln; u32 val; @@ -1071,8 +1071,8 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, val = intel_de_read(dev_priv, CNL_PORT_TX_DW2_LN0(port)); val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK | RCOMP_SCALAR_MASK); - val |= SWING_SEL_UPPER(ddi_translations[level].dw2_swing_sel); - val |= SWING_SEL_LOWER(ddi_translations[level].dw2_swing_sel); + val |= SWING_SEL_UPPER(ddi_translations[level].cnl.dw2_swing_sel); + val |= SWING_SEL_LOWER(ddi_translations[level].cnl.dw2_swing_sel); /* Rcomp scalar is fixed as 0x98 for every table entry */ val |= RCOMP_SCALAR(0x98); intel_de_write(dev_priv, CNL_PORT_TX_DW2_GRP(port), val); @@ -1083,9 +1083,9 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, val = intel_de_read(dev_priv, CNL_PORT_TX_DW4_LN(ln, port)); val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK | CURSOR_COEFF_MASK); - val |= POST_CURSOR_1(ddi_translations[level].dw4_post_cursor_1); - val |= POST_CURSOR_2(ddi_translations[level].dw4_post_cursor_2); - val |= CURSOR_COEFF(ddi_translations[level].dw4_cursor_coeff); + val |= POST_CURSOR_1(ddi_translations[level].cnl.dw4_post_cursor_1); + val |= POST_CURSOR_2(ddi_translations[level].cnl.dw4_post_cursor_2); + val |= CURSOR_COEFF(ddi_translations[level].cnl.dw4_cursor_coeff); intel_de_write(dev_priv, CNL_PORT_TX_DW4_LN(ln, port), val); } @@ -1100,7 +1100,7 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, /* Program PORT_TX_DW7 */ val = intel_de_read(dev_priv, CNL_PORT_TX_DW7_LN0(port)); val &= ~N_SCALAR_MASK; - val |= N_SCALAR(ddi_translations[level].dw7_n_scalar); + val |= N_SCALAR(ddi_translations[level].cnl.dw7_n_scalar); intel_de_write(dev_priv, CNL_PORT_TX_DW7_GRP(port), val); } @@ -1170,7 +1170,7 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, int level) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - const struct cnl_ddi_buf_trans *ddi_translations; + const union intel_ddi_buf_trans_entry *ddi_translations; enum phy phy = intel_port_to_phy(dev_priv, encoder->port); int n_entries, ln; u32 val; @@ -1211,8 +1211,8 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, val = intel_de_read(dev_priv, ICL_PORT_TX_DW2_LN0(phy)); val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK | RCOMP_SCALAR_MASK); - val |= SWING_SEL_UPPER(ddi_translations[level].dw2_swing_sel); - val |= SWING_SEL_LOWER(ddi_translations[level].dw2_swing_sel); + val |= SWING_SEL_UPPER(ddi_translations[level].cnl.dw2_swing_sel); + val |= SWING_SEL_LOWER(ddi_translations[level].cnl.dw2_swing_sel); /* Program Rcomp scalar for every table entry */ val |= RCOMP_SCALAR(0x98); intel_de_write(dev_priv, ICL_PORT_TX_DW2_GRP(phy), val); @@ -1223,16 +1223,16 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, val = intel_de_read(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy)); val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK | CURSOR_COEFF_MASK); - val |= POST_CURSOR_1(ddi_translations[level].dw4_post_cursor_1); - val |= POST_CURSOR_2(ddi_translations[level].dw4_post_cursor_2); - val |= CURSOR_COEFF(ddi_translations[level].dw4_cursor_coeff); + val |= POST_CURSOR_1(ddi_translations[level].cnl.dw4_post_cursor_1); + val |= POST_CURSOR_2(ddi_translations[level].cnl.dw4_post_cursor_2); + val |= CURSOR_COEFF(ddi_translations[level].cnl.dw4_cursor_coeff); intel_de_write(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy), val); } /* Program PORT_TX_DW7 */ val = intel_de_read(dev_priv, ICL_PORT_TX_DW7_LN0(phy)); val &= ~N_SCALAR_MASK; - val |= N_SCALAR(ddi_translations[level].dw7_n_scalar); + val |= N_SCALAR(ddi_translations[level].cnl.dw7_n_scalar); intel_de_write(dev_priv, ICL_PORT_TX_DW7_GRP(phy), val); } @@ -1303,7 +1303,7 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port); - const struct icl_mg_phy_ddi_buf_trans *ddi_translations; + const union intel_ddi_buf_trans_entry *ddi_translations; int n_entries, ln; u32 val; @@ -1333,13 +1333,13 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, val = intel_de_read(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port)); val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK; val |= CRI_TXDEEMPH_OVERRIDE_17_12( - ddi_translations[level].cri_txdeemph_override_17_12); + ddi_translations[level].mg.cri_txdeemph_override_17_12); intel_de_write(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port), val); val = intel_de_read(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port)); val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK; val |= CRI_TXDEEMPH_OVERRIDE_17_12( - ddi_translations[level].cri_txdeemph_override_17_12); + ddi_translations[level].mg.cri_txdeemph_override_17_12); intel_de_write(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port), val); } @@ -1349,9 +1349,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK | CRI_TXDEEMPH_OVERRIDE_5_0_MASK); val |= CRI_TXDEEMPH_OVERRIDE_5_0( - ddi_translations[level].cri_txdeemph_override_5_0) | + ddi_translations[level].mg.cri_txdeemph_override_5_0) | CRI_TXDEEMPH_OVERRIDE_11_6( - ddi_translations[level].cri_txdeemph_override_11_6) | + ddi_translations[level].mg.cri_txdeemph_override_11_6) | CRI_TXDEEMPH_OVERRIDE_EN; intel_de_write(dev_priv, MG_TX1_DRVCTRL(ln, tc_port), val); @@ -1359,9 +1359,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK | CRI_TXDEEMPH_OVERRIDE_5_0_MASK); val |= CRI_TXDEEMPH_OVERRIDE_5_0( - ddi_translations[level].cri_txdeemph_override_5_0) | + ddi_translations[level].mg.cri_txdeemph_override_5_0) | CRI_TXDEEMPH_OVERRIDE_11_6( - ddi_translations[level].cri_txdeemph_override_11_6) | + ddi_translations[level].mg.cri_txdeemph_override_11_6) | CRI_TXDEEMPH_OVERRIDE_EN; intel_de_write(dev_priv, MG_TX2_DRVCTRL(ln, tc_port), val); @@ -1441,7 +1441,7 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port); - const struct tgl_dkl_phy_ddi_buf_trans *ddi_translations; + const union intel_ddi_buf_trans_entry *ddi_translations; u32 val, dpcnt_mask, dpcnt_val; int n_entries, ln; @@ -1461,9 +1461,9 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, dpcnt_mask = (DKL_TX_PRESHOOT_COEFF_MASK | DKL_TX_DE_EMPAHSIS_COEFF_MASK | DKL_TX_VSWING_CONTROL_MASK); - dpcnt_val = DKL_TX_VSWING_CONTROL(ddi_translations[level].dkl_vswing_control); - dpcnt_val |= DKL_TX_DE_EMPHASIS_COEFF(ddi_translations[level].dkl_de_emphasis_control); - dpcnt_val |= DKL_TX_PRESHOOT_COEFF(ddi_translations[level].dkl_preshoot_control); + dpcnt_val = DKL_TX_VSWING_CONTROL(ddi_translations[level].dkl.dkl_vswing_control); + dpcnt_val |= DKL_TX_DE_EMPHASIS_COEFF(ddi_translations[level].dkl.dkl_de_emphasis_control); + dpcnt_val |= DKL_TX_PRESHOOT_COEFF(ddi_translations[level].dkl.dkl_preshoot_control); for (ln = 0; ln < 2; ln++) { intel_de_write(dev_priv, HIP_INDEX_REG(tc_port), diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index f7b7178363e8..3f38267b7dd6 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -13,761 +13,761 @@ * them for both DP and FDI transports, allowing those ports to * automatically adapt to HDMI connections as well */ -static const struct hsw_ddi_buf_trans hsw_ddi_translations_dp[] = { - { 0x00FFFFFF, 0x0006000E, 0x0 }, - { 0x00D75FFF, 0x0005000A, 0x0 }, - { 0x00C30FFF, 0x00040006, 0x0 }, - { 0x80AAAFFF, 0x000B0000, 0x0 }, - { 0x00FFFFFF, 0x0005000A, 0x0 }, - { 0x00D75FFF, 0x000C0004, 0x0 }, - { 0x80C30FFF, 0x000B0000, 0x0 }, - { 0x00FFFFFF, 0x00040006, 0x0 }, - { 0x80D75FFF, 0x000B0000, 0x0 }, +static const union intel_ddi_buf_trans_entry hsw_ddi_translations_dp[] = { + { .hsw = { 0x00FFFFFF, 0x0006000E, 0x0 } }, + { .hsw = { 0x00D75FFF, 0x0005000A, 0x0 } }, + { .hsw = { 0x00C30FFF, 0x00040006, 0x0 } }, + { .hsw = { 0x80AAAFFF, 0x000B0000, 0x0 } }, + { .hsw = { 0x00FFFFFF, 0x0005000A, 0x0 } }, + { .hsw = { 0x00D75FFF, 0x000C0004, 0x0 } }, + { .hsw = { 0x80C30FFF, 0x000B0000, 0x0 } }, + { .hsw = { 0x00FFFFFF, 0x00040006, 0x0 } }, + { .hsw = { 0x80D75FFF, 0x000B0000, 0x0 } }, }; -static const struct hsw_ddi_buf_trans hsw_ddi_translations_fdi[] = { - { 0x00FFFFFF, 0x0007000E, 0x0 }, - { 0x00D75FFF, 0x000F000A, 0x0 }, - { 0x00C30FFF, 0x00060006, 0x0 }, - { 0x00AAAFFF, 0x001E0000, 0x0 }, - { 0x00FFFFFF, 0x000F000A, 0x0 }, - { 0x00D75FFF, 0x00160004, 0x0 }, - { 0x00C30FFF, 0x001E0000, 0x0 }, - { 0x00FFFFFF, 0x00060006, 0x0 }, - { 0x00D75FFF, 0x001E0000, 0x0 }, +static const union intel_ddi_buf_trans_entry hsw_ddi_translations_fdi[] = { + { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, + { .hsw = { 0x00D75FFF, 0x000F000A, 0x0 } }, + { .hsw = { 0x00C30FFF, 0x00060006, 0x0 } }, + { .hsw = { 0x00AAAFFF, 0x001E0000, 0x0 } }, + { .hsw = { 0x00FFFFFF, 0x000F000A, 0x0 } }, + { .hsw = { 0x00D75FFF, 0x00160004, 0x0 } }, + { .hsw = { 0x00C30FFF, 0x001E0000, 0x0 } }, + { .hsw = { 0x00FFFFFF, 0x00060006, 0x0 } }, + { .hsw = { 0x00D75FFF, 0x001E0000, 0x0 } }, }; -static const struct hsw_ddi_buf_trans hsw_ddi_translations_hdmi[] = { - /* Idx NT mV d T mV d db */ - { 0x00FFFFFF, 0x0006000E, 0x0 },/* 0: 400 400 0 */ - { 0x00E79FFF, 0x000E000C, 0x0 },/* 1: 400 500 2 */ - { 0x00D75FFF, 0x0005000A, 0x0 },/* 2: 400 600 3.5 */ - { 0x00FFFFFF, 0x0005000A, 0x0 },/* 3: 600 600 0 */ - { 0x00E79FFF, 0x001D0007, 0x0 },/* 4: 600 750 2 */ - { 0x00D75FFF, 0x000C0004, 0x0 },/* 5: 600 900 3.5 */ - { 0x00FFFFFF, 0x00040006, 0x0 },/* 6: 800 800 0 */ - { 0x80E79FFF, 0x00030002, 0x0 },/* 7: 800 1000 2 */ - { 0x00FFFFFF, 0x00140005, 0x0 },/* 8: 850 850 0 */ - { 0x00FFFFFF, 0x000C0004, 0x0 },/* 9: 900 900 0 */ - { 0x00FFFFFF, 0x001C0003, 0x0 },/* 10: 950 950 0 */ - { 0x80FFFFFF, 0x00030002, 0x0 },/* 11: 1000 1000 0 */ +static const union intel_ddi_buf_trans_entry hsw_ddi_translations_hdmi[] = { + /* Idx NT mV d T mV d db */ + { .hsw = { 0x00FFFFFF, 0x0006000E, 0x0 } }, /* 0: 400 400 0 */ + { .hsw = { 0x00E79FFF, 0x000E000C, 0x0 } }, /* 1: 400 500 2 */ + { .hsw = { 0x00D75FFF, 0x0005000A, 0x0 } }, /* 2: 400 600 3.5 */ + { .hsw = { 0x00FFFFFF, 0x0005000A, 0x0 } }, /* 3: 600 600 0 */ + { .hsw = { 0x00E79FFF, 0x001D0007, 0x0 } }, /* 4: 600 750 2 */ + { .hsw = { 0x00D75FFF, 0x000C0004, 0x0 } }, /* 5: 600 900 3.5 */ + { .hsw = { 0x00FFFFFF, 0x00040006, 0x0 } }, /* 6: 800 800 0 */ + { .hsw = { 0x80E79FFF, 0x00030002, 0x0 } }, /* 7: 800 1000 2 */ + { .hsw = { 0x00FFFFFF, 0x00140005, 0x0 } }, /* 8: 850 850 0 */ + { .hsw = { 0x00FFFFFF, 0x000C0004, 0x0 } }, /* 9: 900 900 0 */ + { .hsw = { 0x00FFFFFF, 0x001C0003, 0x0 } }, /* 10: 950 950 0 */ + { .hsw = { 0x80FFFFFF, 0x00030002, 0x0 } }, /* 11: 1000 1000 0 */ }; -static const struct hsw_ddi_buf_trans bdw_ddi_translations_edp[] = { - { 0x00FFFFFF, 0x00000012, 0x0 }, - { 0x00EBAFFF, 0x00020011, 0x0 }, - { 0x00C71FFF, 0x0006000F, 0x0 }, - { 0x00AAAFFF, 0x000E000A, 0x0 }, - { 0x00FFFFFF, 0x00020011, 0x0 }, - { 0x00DB6FFF, 0x0005000F, 0x0 }, - { 0x00BEEFFF, 0x000A000C, 0x0 }, - { 0x00FFFFFF, 0x0005000F, 0x0 }, - { 0x00DB6FFF, 0x000A000C, 0x0 }, +static const union intel_ddi_buf_trans_entry bdw_ddi_translations_edp[] = { + { .hsw = { 0x00FFFFFF, 0x00000012, 0x0 } }, + { .hsw = { 0x00EBAFFF, 0x00020011, 0x0 } }, + { .hsw = { 0x00C71FFF, 0x0006000F, 0x0 } }, + { .hsw = { 0x00AAAFFF, 0x000E000A, 0x0 } }, + { .hsw = { 0x00FFFFFF, 0x00020011, 0x0 } }, + { .hsw = { 0x00DB6FFF, 0x0005000F, 0x0 } }, + { .hsw = { 0x00BEEFFF, 0x000A000C, 0x0 } }, + { .hsw = { 0x00FFFFFF, 0x0005000F, 0x0 } }, + { .hsw = { 0x00DB6FFF, 0x000A000C, 0x0 } }, }; -static const struct hsw_ddi_buf_trans bdw_ddi_translations_dp[] = { - { 0x00FFFFFF, 0x0007000E, 0x0 }, - { 0x00D75FFF, 0x000E000A, 0x0 }, - { 0x00BEFFFF, 0x00140006, 0x0 }, - { 0x80B2CFFF, 0x001B0002, 0x0 }, - { 0x00FFFFFF, 0x000E000A, 0x0 }, - { 0x00DB6FFF, 0x00160005, 0x0 }, - { 0x80C71FFF, 0x001A0002, 0x0 }, - { 0x00F7DFFF, 0x00180004, 0x0 }, - { 0x80D75FFF, 0x001B0002, 0x0 }, +static const union intel_ddi_buf_trans_entry bdw_ddi_translations_dp[] = { + { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, + { .hsw = { 0x00D75FFF, 0x000E000A, 0x0 } }, + { .hsw = { 0x00BEFFFF, 0x00140006, 0x0 } }, + { .hsw = { 0x80B2CFFF, 0x001B0002, 0x0 } }, + { .hsw = { 0x00FFFFFF, 0x000E000A, 0x0 } }, + { .hsw = { 0x00DB6FFF, 0x00160005, 0x0 } }, + { .hsw = { 0x80C71FFF, 0x001A0002, 0x0 } }, + { .hsw = { 0x00F7DFFF, 0x00180004, 0x0 } }, + { .hsw = { 0x80D75FFF, 0x001B0002, 0x0 } }, }; -static const struct hsw_ddi_buf_trans bdw_ddi_translations_fdi[] = { - { 0x00FFFFFF, 0x0001000E, 0x0 }, - { 0x00D75FFF, 0x0004000A, 0x0 }, - { 0x00C30FFF, 0x00070006, 0x0 }, - { 0x00AAAFFF, 0x000C0000, 0x0 }, - { 0x00FFFFFF, 0x0004000A, 0x0 }, - { 0x00D75FFF, 0x00090004, 0x0 }, - { 0x00C30FFF, 0x000C0000, 0x0 }, - { 0x00FFFFFF, 0x00070006, 0x0 }, - { 0x00D75FFF, 0x000C0000, 0x0 }, +static const union intel_ddi_buf_trans_entry bdw_ddi_translations_fdi[] = { + { .hsw = { 0x00FFFFFF, 0x0001000E, 0x0 } }, + { .hsw = { 0x00D75FFF, 0x0004000A, 0x0 } }, + { .hsw = { 0x00C30FFF, 0x00070006, 0x0 } }, + { .hsw = { 0x00AAAFFF, 0x000C0000, 0x0 } }, + { .hsw = { 0x00FFFFFF, 0x0004000A, 0x0 } }, + { .hsw = { 0x00D75FFF, 0x00090004, 0x0 } }, + { .hsw = { 0x00C30FFF, 0x000C0000, 0x0 } }, + { .hsw = { 0x00FFFFFF, 0x00070006, 0x0 } }, + { .hsw = { 0x00D75FFF, 0x000C0000, 0x0 } }, }; -static const struct hsw_ddi_buf_trans bdw_ddi_translations_hdmi[] = { - /* Idx NT mV d T mV df db */ - { 0x00FFFFFF, 0x0007000E, 0x0 },/* 0: 400 400 0 */ - { 0x00D75FFF, 0x000E000A, 0x0 },/* 1: 400 600 3.5 */ - { 0x00BEFFFF, 0x00140006, 0x0 },/* 2: 400 800 6 */ - { 0x00FFFFFF, 0x0009000D, 0x0 },/* 3: 450 450 0 */ - { 0x00FFFFFF, 0x000E000A, 0x0 },/* 4: 600 600 0 */ - { 0x00D7FFFF, 0x00140006, 0x0 },/* 5: 600 800 2.5 */ - { 0x80CB2FFF, 0x001B0002, 0x0 },/* 6: 600 1000 4.5 */ - { 0x00FFFFFF, 0x00140006, 0x0 },/* 7: 800 800 0 */ - { 0x80E79FFF, 0x001B0002, 0x0 },/* 8: 800 1000 2 */ - { 0x80FFFFFF, 0x001B0002, 0x0 },/* 9: 1000 1000 0 */ +static const union intel_ddi_buf_trans_entry bdw_ddi_translations_hdmi[] = { + /* Idx NT mV d T mV df db */ + { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, /* 0: 400 400 0 */ + { .hsw = { 0x00D75FFF, 0x000E000A, 0x0 } }, /* 1: 400 600 3.5 */ + { .hsw = { 0x00BEFFFF, 0x00140006, 0x0 } }, /* 2: 400 800 6 */ + { .hsw = { 0x00FFFFFF, 0x0009000D, 0x0 } }, /* 3: 450 450 0 */ + { .hsw = { 0x00FFFFFF, 0x000E000A, 0x0 } }, /* 4: 600 600 0 */ + { .hsw = { 0x00D7FFFF, 0x00140006, 0x0 } }, /* 5: 600 800 2.5 */ + { .hsw = { 0x80CB2FFF, 0x001B0002, 0x0 } }, /* 6: 600 1000 4.5 */ + { .hsw = { 0x00FFFFFF, 0x00140006, 0x0 } }, /* 7: 800 800 0 */ + { .hsw = { 0x80E79FFF, 0x001B0002, 0x0 } }, /* 8: 800 1000 2 */ + { .hsw = { 0x80FFFFFF, 0x001B0002, 0x0 } }, /* 9: 1000 1000 0 */ }; /* Skylake H and S */ -static const struct hsw_ddi_buf_trans skl_ddi_translations_dp[] = { - { 0x00002016, 0x000000A0, 0x0 }, - { 0x00005012, 0x0000009B, 0x0 }, - { 0x00007011, 0x00000088, 0x0 }, - { 0x80009010, 0x000000C0, 0x1 }, - { 0x00002016, 0x0000009B, 0x0 }, - { 0x00005012, 0x00000088, 0x0 }, - { 0x80007011, 0x000000C0, 0x1 }, - { 0x00002016, 0x000000DF, 0x0 }, - { 0x80005012, 0x000000C0, 0x1 }, +static const union intel_ddi_buf_trans_entry skl_ddi_translations_dp[] = { + { .hsw = { 0x00002016, 0x000000A0, 0x0 } }, + { .hsw = { 0x00005012, 0x0000009B, 0x0 } }, + { .hsw = { 0x00007011, 0x00000088, 0x0 } }, + { .hsw = { 0x80009010, 0x000000C0, 0x1 } }, + { .hsw = { 0x00002016, 0x0000009B, 0x0 } }, + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, + { .hsw = { 0x80007011, 0x000000C0, 0x1 } }, + { .hsw = { 0x00002016, 0x000000DF, 0x0 } }, + { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, }; /* Skylake U */ -static const struct hsw_ddi_buf_trans skl_u_ddi_translations_dp[] = { - { 0x0000201B, 0x000000A2, 0x0 }, - { 0x00005012, 0x00000088, 0x0 }, - { 0x80007011, 0x000000CD, 0x1 }, - { 0x80009010, 0x000000C0, 0x1 }, - { 0x0000201B, 0x0000009D, 0x0 }, - { 0x80005012, 0x000000C0, 0x1 }, - { 0x80007011, 0x000000C0, 0x1 }, - { 0x00002016, 0x00000088, 0x0 }, - { 0x80005012, 0x000000C0, 0x1 }, +static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_dp[] = { + { .hsw = { 0x0000201B, 0x000000A2, 0x0 } }, + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, + { .hsw = { 0x80007011, 0x000000CD, 0x1 } }, + { .hsw = { 0x80009010, 0x000000C0, 0x1 } }, + { .hsw = { 0x0000201B, 0x0000009D, 0x0 } }, + { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, + { .hsw = { 0x80007011, 0x000000C0, 0x1 } }, + { .hsw = { 0x00002016, 0x00000088, 0x0 } }, + { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, }; /* Skylake Y */ -static const struct hsw_ddi_buf_trans skl_y_ddi_translations_dp[] = { - { 0x00000018, 0x000000A2, 0x0 }, - { 0x00005012, 0x00000088, 0x0 }, - { 0x80007011, 0x000000CD, 0x3 }, - { 0x80009010, 0x000000C0, 0x3 }, - { 0x00000018, 0x0000009D, 0x0 }, - { 0x80005012, 0x000000C0, 0x3 }, - { 0x80007011, 0x000000C0, 0x3 }, - { 0x00000018, 0x00000088, 0x0 }, - { 0x80005012, 0x000000C0, 0x3 }, +static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_dp[] = { + { .hsw = { 0x00000018, 0x000000A2, 0x0 } }, + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, + { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, + { .hsw = { 0x80009010, 0x000000C0, 0x3 } }, + { .hsw = { 0x00000018, 0x0000009D, 0x0 } }, + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, + { .hsw = { 0x80007011, 0x000000C0, 0x3 } }, + { .hsw = { 0x00000018, 0x00000088, 0x0 } }, + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, }; /* Kabylake H and S */ -static const struct hsw_ddi_buf_trans kbl_ddi_translations_dp[] = { - { 0x00002016, 0x000000A0, 0x0 }, - { 0x00005012, 0x0000009B, 0x0 }, - { 0x00007011, 0x00000088, 0x0 }, - { 0x80009010, 0x000000C0, 0x1 }, - { 0x00002016, 0x0000009B, 0x0 }, - { 0x00005012, 0x00000088, 0x0 }, - { 0x80007011, 0x000000C0, 0x1 }, - { 0x00002016, 0x00000097, 0x0 }, - { 0x80005012, 0x000000C0, 0x1 }, +static const union intel_ddi_buf_trans_entry kbl_ddi_translations_dp[] = { + { .hsw = { 0x00002016, 0x000000A0, 0x0 } }, + { .hsw = { 0x00005012, 0x0000009B, 0x0 } }, + { .hsw = { 0x00007011, 0x00000088, 0x0 } }, + { .hsw = { 0x80009010, 0x000000C0, 0x1 } }, + { .hsw = { 0x00002016, 0x0000009B, 0x0 } }, + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, + { .hsw = { 0x80007011, 0x000000C0, 0x1 } }, + { .hsw = { 0x00002016, 0x00000097, 0x0 } }, + { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, }; /* Kabylake U */ -static const struct hsw_ddi_buf_trans kbl_u_ddi_translations_dp[] = { - { 0x0000201B, 0x000000A1, 0x0 }, - { 0x00005012, 0x00000088, 0x0 }, - { 0x80007011, 0x000000CD, 0x3 }, - { 0x80009010, 0x000000C0, 0x3 }, - { 0x0000201B, 0x0000009D, 0x0 }, - { 0x80005012, 0x000000C0, 0x3 }, - { 0x80007011, 0x000000C0, 0x3 }, - { 0x00002016, 0x0000004F, 0x0 }, - { 0x80005012, 0x000000C0, 0x3 }, +static const union intel_ddi_buf_trans_entry kbl_u_ddi_translations_dp[] = { + { .hsw = { 0x0000201B, 0x000000A1, 0x0 } }, + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, + { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, + { .hsw = { 0x80009010, 0x000000C0, 0x3 } }, + { .hsw = { 0x0000201B, 0x0000009D, 0x0 } }, + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, + { .hsw = { 0x80007011, 0x000000C0, 0x3 } }, + { .hsw = { 0x00002016, 0x0000004F, 0x0 } }, + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, }; /* Kabylake Y */ -static const struct hsw_ddi_buf_trans kbl_y_ddi_translations_dp[] = { - { 0x00001017, 0x000000A1, 0x0 }, - { 0x00005012, 0x00000088, 0x0 }, - { 0x80007011, 0x000000CD, 0x3 }, - { 0x8000800F, 0x000000C0, 0x3 }, - { 0x00001017, 0x0000009D, 0x0 }, - { 0x80005012, 0x000000C0, 0x3 }, - { 0x80007011, 0x000000C0, 0x3 }, - { 0x00001017, 0x0000004C, 0x0 }, - { 0x80005012, 0x000000C0, 0x3 }, +static const union intel_ddi_buf_trans_entry kbl_y_ddi_translations_dp[] = { + { .hsw = { 0x00001017, 0x000000A1, 0x0 } }, + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, + { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, + { .hsw = { 0x8000800F, 0x000000C0, 0x3 } }, + { .hsw = { 0x00001017, 0x0000009D, 0x0 } }, + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, + { .hsw = { 0x80007011, 0x000000C0, 0x3 } }, + { .hsw = { 0x00001017, 0x0000004C, 0x0 } }, + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, }; /* * Skylake/Kabylake H and S * eDP 1.4 low vswing translation parameters */ -static const struct hsw_ddi_buf_trans skl_ddi_translations_edp[] = { - { 0x00000018, 0x000000A8, 0x0 }, - { 0x00004013, 0x000000A9, 0x0 }, - { 0x00007011, 0x000000A2, 0x0 }, - { 0x00009010, 0x0000009C, 0x0 }, - { 0x00000018, 0x000000A9, 0x0 }, - { 0x00006013, 0x000000A2, 0x0 }, - { 0x00007011, 0x000000A6, 0x0 }, - { 0x00000018, 0x000000AB, 0x0 }, - { 0x00007013, 0x0000009F, 0x0 }, - { 0x00000018, 0x000000DF, 0x0 }, +static const union intel_ddi_buf_trans_entry skl_ddi_translations_edp[] = { + { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, + { .hsw = { 0x00004013, 0x000000A9, 0x0 } }, + { .hsw = { 0x00007011, 0x000000A2, 0x0 } }, + { .hsw = { 0x00009010, 0x0000009C, 0x0 } }, + { .hsw = { 0x00000018, 0x000000A9, 0x0 } }, + { .hsw = { 0x00006013, 0x000000A2, 0x0 } }, + { .hsw = { 0x00007011, 0x000000A6, 0x0 } }, + { .hsw = { 0x00000018, 0x000000AB, 0x0 } }, + { .hsw = { 0x00007013, 0x0000009F, 0x0 } }, + { .hsw = { 0x00000018, 0x000000DF, 0x0 } }, }; /* * Skylake/Kabylake U * eDP 1.4 low vswing translation parameters */ -static const struct hsw_ddi_buf_trans skl_u_ddi_translations_edp[] = { - { 0x00000018, 0x000000A8, 0x0 }, - { 0x00004013, 0x000000A9, 0x0 }, - { 0x00007011, 0x000000A2, 0x0 }, - { 0x00009010, 0x0000009C, 0x0 }, - { 0x00000018, 0x000000A9, 0x0 }, - { 0x00006013, 0x000000A2, 0x0 }, - { 0x00007011, 0x000000A6, 0x0 }, - { 0x00002016, 0x000000AB, 0x0 }, - { 0x00005013, 0x0000009F, 0x0 }, - { 0x00000018, 0x000000DF, 0x0 }, +static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_edp[] = { + { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, + { .hsw = { 0x00004013, 0x000000A9, 0x0 } }, + { .hsw = { 0x00007011, 0x000000A2, 0x0 } }, + { .hsw = { 0x00009010, 0x0000009C, 0x0 } }, + { .hsw = { 0x00000018, 0x000000A9, 0x0 } }, + { .hsw = { 0x00006013, 0x000000A2, 0x0 } }, + { .hsw = { 0x00007011, 0x000000A6, 0x0 } }, + { .hsw = { 0x00002016, 0x000000AB, 0x0 } }, + { .hsw = { 0x00005013, 0x0000009F, 0x0 } }, + { .hsw = { 0x00000018, 0x000000DF, 0x0 } }, }; /* * Skylake/Kabylake Y * eDP 1.4 low vswing translation parameters */ -static const struct hsw_ddi_buf_trans skl_y_ddi_translations_edp[] = { - { 0x00000018, 0x000000A8, 0x0 }, - { 0x00004013, 0x000000AB, 0x0 }, - { 0x00007011, 0x000000A4, 0x0 }, - { 0x00009010, 0x000000DF, 0x0 }, - { 0x00000018, 0x000000AA, 0x0 }, - { 0x00006013, 0x000000A4, 0x0 }, - { 0x00007011, 0x0000009D, 0x0 }, - { 0x00000018, 0x000000A0, 0x0 }, - { 0x00006012, 0x000000DF, 0x0 }, - { 0x00000018, 0x0000008A, 0x0 }, +static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_edp[] = { + { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, + { .hsw = { 0x00004013, 0x000000AB, 0x0 } }, + { .hsw = { 0x00007011, 0x000000A4, 0x0 } }, + { .hsw = { 0x00009010, 0x000000DF, 0x0 } }, + { .hsw = { 0x00000018, 0x000000AA, 0x0 } }, + { .hsw = { 0x00006013, 0x000000A4, 0x0 } }, + { .hsw = { 0x00007011, 0x0000009D, 0x0 } }, + { .hsw = { 0x00000018, 0x000000A0, 0x0 } }, + { .hsw = { 0x00006012, 0x000000DF, 0x0 } }, + { .hsw = { 0x00000018, 0x0000008A, 0x0 } }, }; /* Skylake/Kabylake U, H and S */ -static const struct hsw_ddi_buf_trans skl_ddi_translations_hdmi[] = { - { 0x00000018, 0x000000AC, 0x0 }, - { 0x00005012, 0x0000009D, 0x0 }, - { 0x00007011, 0x00000088, 0x0 }, - { 0x00000018, 0x000000A1, 0x0 }, - { 0x00000018, 0x00000098, 0x0 }, - { 0x00004013, 0x00000088, 0x0 }, - { 0x80006012, 0x000000CD, 0x1 }, - { 0x00000018, 0x000000DF, 0x0 }, - { 0x80003015, 0x000000CD, 0x1 }, /* Default */ - { 0x80003015, 0x000000C0, 0x1 }, - { 0x80000018, 0x000000C0, 0x1 }, +static const union intel_ddi_buf_trans_entry skl_ddi_translations_hdmi[] = { + { .hsw = { 0x00000018, 0x000000AC, 0x0 } }, + { .hsw = { 0x00005012, 0x0000009D, 0x0 } }, + { .hsw = { 0x00007011, 0x00000088, 0x0 } }, + { .hsw = { 0x00000018, 0x000000A1, 0x0 } }, + { .hsw = { 0x00000018, 0x00000098, 0x0 } }, + { .hsw = { 0x00004013, 0x00000088, 0x0 } }, + { .hsw = { 0x80006012, 0x000000CD, 0x1 } }, + { .hsw = { 0x00000018, 0x000000DF, 0x0 } }, + { .hsw = { 0x80003015, 0x000000CD, 0x1 } }, /* Default */ + { .hsw = { 0x80003015, 0x000000C0, 0x1 } }, + { .hsw = { 0x80000018, 0x000000C0, 0x1 } }, }; /* Skylake/Kabylake Y */ -static const struct hsw_ddi_buf_trans skl_y_ddi_translations_hdmi[] = { - { 0x00000018, 0x000000A1, 0x0 }, - { 0x00005012, 0x000000DF, 0x0 }, - { 0x80007011, 0x000000CB, 0x3 }, - { 0x00000018, 0x000000A4, 0x0 }, - { 0x00000018, 0x0000009D, 0x0 }, - { 0x00004013, 0x00000080, 0x0 }, - { 0x80006013, 0x000000C0, 0x3 }, - { 0x00000018, 0x0000008A, 0x0 }, - { 0x80003015, 0x000000C0, 0x3 }, /* Default */ - { 0x80003015, 0x000000C0, 0x3 }, - { 0x80000018, 0x000000C0, 0x3 }, +static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_hdmi[] = { + { .hsw = { 0x00000018, 0x000000A1, 0x0 } }, + { .hsw = { 0x00005012, 0x000000DF, 0x0 } }, + { .hsw = { 0x80007011, 0x000000CB, 0x3 } }, + { .hsw = { 0x00000018, 0x000000A4, 0x0 } }, + { .hsw = { 0x00000018, 0x0000009D, 0x0 } }, + { .hsw = { 0x00004013, 0x00000080, 0x0 } }, + { .hsw = { 0x80006013, 0x000000C0, 0x3 } }, + { .hsw = { 0x00000018, 0x0000008A, 0x0 } }, + { .hsw = { 0x80003015, 0x000000C0, 0x3 } }, /* Default */ + { .hsw = { 0x80003015, 0x000000C0, 0x3 } }, + { .hsw = { 0x80000018, 0x000000C0, 0x3 } }, }; -static const struct bxt_ddi_buf_trans bxt_ddi_translations_dp[] = { - /* Idx NT mV diff db */ - { 52, 0x9A, 0, 128, }, /* 0: 400 0 */ - { 78, 0x9A, 0, 85, }, /* 1: 400 3.5 */ - { 104, 0x9A, 0, 64, }, /* 2: 400 6 */ - { 154, 0x9A, 0, 43, }, /* 3: 400 9.5 */ - { 77, 0x9A, 0, 128, }, /* 4: 600 0 */ - { 116, 0x9A, 0, 85, }, /* 5: 600 3.5 */ - { 154, 0x9A, 0, 64, }, /* 6: 600 6 */ - { 102, 0x9A, 0, 128, }, /* 7: 800 0 */ - { 154, 0x9A, 0, 85, }, /* 8: 800 3.5 */ - { 154, 0x9A, 1, 128, }, /* 9: 1200 0 */ +static const union intel_ddi_buf_trans_entry bxt_ddi_translations_dp[] = { + /* Idx NT mV diff db */ + { .bxt = { 52, 0x9A, 0, 128, } }, /* 0: 400 0 */ + { .bxt = { 78, 0x9A, 0, 85, } }, /* 1: 400 3.5 */ + { .bxt = { 104, 0x9A, 0, 64, } }, /* 2: 400 6 */ + { .bxt = { 154, 0x9A, 0, 43, } }, /* 3: 400 9.5 */ + { .bxt = { 77, 0x9A, 0, 128, } }, /* 4: 600 0 */ + { .bxt = { 116, 0x9A, 0, 85, } }, /* 5: 600 3.5 */ + { .bxt = { 154, 0x9A, 0, 64, } }, /* 6: 600 6 */ + { .bxt = { 102, 0x9A, 0, 128, } }, /* 7: 800 0 */ + { .bxt = { 154, 0x9A, 0, 85, } }, /* 8: 800 3.5 */ + { .bxt = { 154, 0x9A, 1, 128, } }, /* 9: 1200 0 */ }; -static const struct bxt_ddi_buf_trans bxt_ddi_translations_edp[] = { +static const union intel_ddi_buf_trans_entry bxt_ddi_translations_edp[] = { /* Idx NT mV diff db */ - { 26, 0, 0, 128, }, /* 0: 200 0 */ - { 38, 0, 0, 112, }, /* 1: 200 1.5 */ - { 48, 0, 0, 96, }, /* 2: 200 4 */ - { 54, 0, 0, 69, }, /* 3: 200 6 */ - { 32, 0, 0, 128, }, /* 4: 250 0 */ - { 48, 0, 0, 104, }, /* 5: 250 1.5 */ - { 54, 0, 0, 85, }, /* 6: 250 4 */ - { 43, 0, 0, 128, }, /* 7: 300 0 */ - { 54, 0, 0, 101, }, /* 8: 300 1.5 */ - { 48, 0, 0, 128, }, /* 9: 300 0 */ + { .bxt = { 26, 0, 0, 128, } }, /* 0: 200 0 */ + { .bxt = { 38, 0, 0, 112, } }, /* 1: 200 1.5 */ + { .bxt = { 48, 0, 0, 96, } }, /* 2: 200 4 */ + { .bxt = { 54, 0, 0, 69, } }, /* 3: 200 6 */ + { .bxt = { 32, 0, 0, 128, } }, /* 4: 250 0 */ + { .bxt = { 48, 0, 0, 104, } }, /* 5: 250 1.5 */ + { .bxt = { 54, 0, 0, 85, } }, /* 6: 250 4 */ + { .bxt = { 43, 0, 0, 128, } }, /* 7: 300 0 */ + { .bxt = { 54, 0, 0, 101, } }, /* 8: 300 1.5 */ + { .bxt = { 48, 0, 0, 128, } }, /* 9: 300 0 */ }; /* BSpec has 2 recommended values - entries 0 and 8. * Using the entry with higher vswing. */ -static const struct bxt_ddi_buf_trans bxt_ddi_translations_hdmi[] = { - /* Idx NT mV diff db */ - { 52, 0x9A, 0, 128, }, /* 0: 400 0 */ - { 52, 0x9A, 0, 85, }, /* 1: 400 3.5 */ - { 52, 0x9A, 0, 64, }, /* 2: 400 6 */ - { 42, 0x9A, 0, 43, }, /* 3: 400 9.5 */ - { 77, 0x9A, 0, 128, }, /* 4: 600 0 */ - { 77, 0x9A, 0, 85, }, /* 5: 600 3.5 */ - { 77, 0x9A, 0, 64, }, /* 6: 600 6 */ - { 102, 0x9A, 0, 128, }, /* 7: 800 0 */ - { 102, 0x9A, 0, 85, }, /* 8: 800 3.5 */ - { 154, 0x9A, 1, 128, }, /* 9: 1200 0 */ +static const union intel_ddi_buf_trans_entry bxt_ddi_translations_hdmi[] = { + /* Idx NT mV diff db */ + { .bxt = { 52, 0x9A, 0, 128, } }, /* 0: 400 0 */ + { .bxt = { 52, 0x9A, 0, 85, } }, /* 1: 400 3.5 */ + { .bxt = { 52, 0x9A, 0, 64, } }, /* 2: 400 6 */ + { .bxt = { 42, 0x9A, 0, 43, } }, /* 3: 400 9.5 */ + { .bxt = { 77, 0x9A, 0, 128, } }, /* 4: 600 0 */ + { .bxt = { 77, 0x9A, 0, 85, } }, /* 5: 600 3.5 */ + { .bxt = { 77, 0x9A, 0, 64, } }, /* 6: 600 6 */ + { .bxt = { 102, 0x9A, 0, 128, } }, /* 7: 800 0 */ + { .bxt = { 102, 0x9A, 0, 85, } }, /* 8: 800 3.5 */ + { .bxt = { 154, 0x9A, 1, 128, } }, /* 9: 1200 0 */ }; /* Voltage Swing Programming for VccIO 0.85V for DP */ -static const struct cnl_ddi_buf_trans cnl_ddi_translations_dp_0_85V[] = { - /* NT mV Trans mV db */ - { 0xA, 0x5D, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x6A, 0x38, 0x00, 0x07 }, /* 350 500 3.1 */ - { 0xB, 0x7A, 0x32, 0x00, 0x0D }, /* 350 700 6.0 */ - { 0x6, 0x7C, 0x2D, 0x00, 0x12 }, /* 350 900 8.2 */ - { 0xA, 0x69, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xB, 0x7A, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */ - { 0x6, 0x7C, 0x30, 0x00, 0x0F }, /* 500 900 5.1 */ - { 0xB, 0x7D, 0x3C, 0x00, 0x03 }, /* 650 725 0.9 */ - { 0x6, 0x7C, 0x34, 0x00, 0x0B }, /* 600 900 3.5 */ - { 0x6, 0x7B, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_85V[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x5D, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x6A, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ + { .cnl = { 0xB, 0x7A, 0x32, 0x00, 0x0D } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7C, 0x2D, 0x00, 0x12 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x69, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xB, 0x7A, 0x36, 0x00, 0x09 } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7C, 0x30, 0x00, 0x0F } }, /* 500 900 5.1 */ + { .cnl = { 0xB, 0x7D, 0x3C, 0x00, 0x03 } }, /* 650 725 0.9 */ + { .cnl = { 0x6, 0x7C, 0x34, 0x00, 0x0B } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7B, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; /* Voltage Swing Programming for VccIO 0.85V for HDMI */ -static const struct cnl_ddi_buf_trans cnl_ddi_translations_hdmi_0_85V[] = { - /* NT mV Trans mV db */ - { 0xA, 0x60, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */ - { 0xB, 0x73, 0x36, 0x00, 0x09 }, /* 450 650 3.2 */ - { 0x6, 0x7F, 0x31, 0x00, 0x0E }, /* 450 850 5.5 */ - { 0xB, 0x73, 0x3F, 0x00, 0x00 }, /* 650 650 0.0 */ - { 0x6, 0x7F, 0x37, 0x00, 0x08 }, /* 650 850 2.3 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 850 850 0.0 */ - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */ +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_85V[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x60, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ + { .cnl = { 0xB, 0x73, 0x36, 0x00, 0x09 } }, /* 450 650 3.2 */ + { .cnl = { 0x6, 0x7F, 0x31, 0x00, 0x0E } }, /* 450 850 5.5 */ + { .cnl = { 0xB, 0x73, 0x3F, 0x00, 0x00 } }, /* 650 650 0.0 */ + { .cnl = { 0x6, 0x7F, 0x37, 0x00, 0x08 } }, /* 650 850 2.3 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 850 850 0.0 */ + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ }; /* Voltage Swing Programming for VccIO 0.85V for eDP */ -static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_0_85V[] = { - /* NT mV Trans mV db */ - { 0xA, 0x66, 0x3A, 0x00, 0x05 }, /* 384 500 2.3 */ - { 0x0, 0x7F, 0x38, 0x00, 0x07 }, /* 153 200 2.3 */ - { 0x8, 0x7F, 0x38, 0x00, 0x07 }, /* 192 250 2.3 */ - { 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 230 300 2.3 */ - { 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 269 350 2.3 */ - { 0xA, 0x66, 0x3C, 0x00, 0x03 }, /* 446 500 1.0 */ - { 0xB, 0x70, 0x3C, 0x00, 0x03 }, /* 460 600 2.3 */ - { 0xC, 0x75, 0x3C, 0x00, 0x03 }, /* 537 700 2.3 */ - { 0x2, 0x7F, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_85V[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x66, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ + { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ + { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 192 250 2.3 */ + { .cnl = { 0x1, 0x7F, 0x38, 0x00, 0x07 } }, /* 230 300 2.3 */ + { .cnl = { 0x9, 0x7F, 0x38, 0x00, 0x07 } }, /* 269 350 2.3 */ + { .cnl = { 0xA, 0x66, 0x3C, 0x00, 0x03 } }, /* 446 500 1.0 */ + { .cnl = { 0xB, 0x70, 0x3C, 0x00, 0x03 } }, /* 460 600 2.3 */ + { .cnl = { 0xC, 0x75, 0x3C, 0x00, 0x03 } }, /* 537 700 2.3 */ + { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ }; /* Voltage Swing Programming for VccIO 0.95V for DP */ -static const struct cnl_ddi_buf_trans cnl_ddi_translations_dp_0_95V[] = { - /* NT mV Trans mV db */ - { 0xA, 0x5D, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x6A, 0x38, 0x00, 0x07 }, /* 350 500 3.1 */ - { 0xB, 0x7A, 0x32, 0x00, 0x0D }, /* 350 700 6.0 */ - { 0x6, 0x7C, 0x2D, 0x00, 0x12 }, /* 350 900 8.2 */ - { 0xA, 0x69, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xB, 0x7A, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */ - { 0x6, 0x7C, 0x30, 0x00, 0x0F }, /* 500 900 5.1 */ - { 0xB, 0x7D, 0x3C, 0x00, 0x03 }, /* 650 725 0.9 */ - { 0x6, 0x7C, 0x34, 0x00, 0x0B }, /* 600 900 3.5 */ - { 0x6, 0x7B, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_95V[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x5D, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x6A, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ + { .cnl = { 0xB, 0x7A, 0x32, 0x00, 0x0D } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7C, 0x2D, 0x00, 0x12 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x69, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xB, 0x7A, 0x36, 0x00, 0x09 } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7C, 0x30, 0x00, 0x0F } }, /* 500 900 5.1 */ + { .cnl = { 0xB, 0x7D, 0x3C, 0x00, 0x03 } }, /* 650 725 0.9 */ + { .cnl = { 0x6, 0x7C, 0x34, 0x00, 0x0B } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7B, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; /* Voltage Swing Programming for VccIO 0.95V for HDMI */ -static const struct cnl_ddi_buf_trans cnl_ddi_translations_hdmi_0_95V[] = { - /* NT mV Trans mV db */ - { 0xA, 0x5C, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ - { 0xB, 0x69, 0x37, 0x00, 0x08 }, /* 400 600 3.5 */ - { 0x5, 0x76, 0x31, 0x00, 0x0E }, /* 400 800 6.0 */ - { 0xA, 0x5E, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */ - { 0xB, 0x69, 0x3F, 0x00, 0x00 }, /* 600 600 0.0 */ - { 0xB, 0x79, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */ - { 0x6, 0x7D, 0x32, 0x00, 0x0D }, /* 600 1000 4.4 */ - { 0x5, 0x76, 0x3F, 0x00, 0x00 }, /* 800 800 0.0 */ - { 0x6, 0x7D, 0x39, 0x00, 0x06 }, /* 800 1000 1.9 */ - { 0x6, 0x7F, 0x39, 0x00, 0x06 }, /* 850 1050 1.8 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1050 1050 0.0 */ +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_95V[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x5C, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ + { .cnl = { 0xB, 0x69, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ + { .cnl = { 0x5, 0x76, 0x31, 0x00, 0x0E } }, /* 400 800 6.0 */ + { .cnl = { 0xA, 0x5E, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ + { .cnl = { 0xB, 0x69, 0x3F, 0x00, 0x00 } }, /* 600 600 0.0 */ + { .cnl = { 0xB, 0x79, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ + { .cnl = { 0x6, 0x7D, 0x32, 0x00, 0x0D } }, /* 600 1000 4.4 */ + { .cnl = { 0x5, 0x76, 0x3F, 0x00, 0x00 } }, /* 800 800 0.0 */ + { .cnl = { 0x6, 0x7D, 0x39, 0x00, 0x06 } }, /* 800 1000 1.9 */ + { .cnl = { 0x6, 0x7F, 0x39, 0x00, 0x06 } }, /* 850 1050 1.8 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ }; /* Voltage Swing Programming for VccIO 0.95V for eDP */ -static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_0_95V[] = { - /* NT mV Trans mV db */ - { 0xA, 0x61, 0x3A, 0x00, 0x05 }, /* 384 500 2.3 */ - { 0x0, 0x7F, 0x38, 0x00, 0x07 }, /* 153 200 2.3 */ - { 0x8, 0x7F, 0x38, 0x00, 0x07 }, /* 192 250 2.3 */ - { 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 230 300 2.3 */ - { 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 269 350 2.3 */ - { 0xA, 0x61, 0x3C, 0x00, 0x03 }, /* 446 500 1.0 */ - { 0xB, 0x68, 0x39, 0x00, 0x06 }, /* 460 600 2.3 */ - { 0xC, 0x6E, 0x39, 0x00, 0x06 }, /* 537 700 2.3 */ - { 0x4, 0x7F, 0x3A, 0x00, 0x05 }, /* 460 600 2.3 */ - { 0x2, 0x7F, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_95V[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x61, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ + { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ + { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 192 250 2.3 */ + { .cnl = { 0x1, 0x7F, 0x38, 0x00, 0x07 } }, /* 230 300 2.3 */ + { .cnl = { 0x9, 0x7F, 0x38, 0x00, 0x07 } }, /* 269 350 2.3 */ + { .cnl = { 0xA, 0x61, 0x3C, 0x00, 0x03 } }, /* 446 500 1.0 */ + { .cnl = { 0xB, 0x68, 0x39, 0x00, 0x06 } }, /* 460 600 2.3 */ + { .cnl = { 0xC, 0x6E, 0x39, 0x00, 0x06 } }, /* 537 700 2.3 */ + { .cnl = { 0x4, 0x7F, 0x3A, 0x00, 0x05 } }, /* 460 600 2.3 */ + { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ }; /* Voltage Swing Programming for VccIO 1.05V for DP */ -static const struct cnl_ddi_buf_trans cnl_ddi_translations_dp_1_05V[] = { - /* NT mV Trans mV db */ - { 0xA, 0x58, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ - { 0xB, 0x64, 0x37, 0x00, 0x08 }, /* 400 600 3.5 */ - { 0x5, 0x70, 0x31, 0x00, 0x0E }, /* 400 800 6.0 */ - { 0x6, 0x7F, 0x2C, 0x00, 0x13 }, /* 400 1050 8.4 */ - { 0xB, 0x64, 0x3F, 0x00, 0x00 }, /* 600 600 0.0 */ - { 0x5, 0x73, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */ - { 0x6, 0x7F, 0x30, 0x00, 0x0F }, /* 550 1050 5.6 */ - { 0x5, 0x76, 0x3E, 0x00, 0x01 }, /* 850 900 0.5 */ - { 0x6, 0x7F, 0x36, 0x00, 0x09 }, /* 750 1050 2.9 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1050 1050 0.0 */ +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_1_05V[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x58, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ + { .cnl = { 0xB, 0x64, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ + { .cnl = { 0x5, 0x70, 0x31, 0x00, 0x0E } }, /* 400 800 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2C, 0x00, 0x13 } }, /* 400 1050 8.4 */ + { .cnl = { 0xB, 0x64, 0x3F, 0x00, 0x00 } }, /* 600 600 0.0 */ + { .cnl = { 0x5, 0x73, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ + { .cnl = { 0x6, 0x7F, 0x30, 0x00, 0x0F } }, /* 550 1050 5.6 */ + { .cnl = { 0x5, 0x76, 0x3E, 0x00, 0x01 } }, /* 850 900 0.5 */ + { .cnl = { 0x6, 0x7F, 0x36, 0x00, 0x09 } }, /* 750 1050 2.9 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ }; /* Voltage Swing Programming for VccIO 1.05V for HDMI */ -static const struct cnl_ddi_buf_trans cnl_ddi_translations_hdmi_1_05V[] = { - /* NT mV Trans mV db */ - { 0xA, 0x58, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ - { 0xB, 0x64, 0x37, 0x00, 0x08 }, /* 400 600 3.5 */ - { 0x5, 0x70, 0x31, 0x00, 0x0E }, /* 400 800 6.0 */ - { 0xA, 0x5B, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */ - { 0xB, 0x64, 0x3F, 0x00, 0x00 }, /* 600 600 0.0 */ - { 0x5, 0x73, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */ - { 0x6, 0x7C, 0x32, 0x00, 0x0D }, /* 600 1000 4.4 */ - { 0x5, 0x70, 0x3F, 0x00, 0x00 }, /* 800 800 0.0 */ - { 0x6, 0x7C, 0x39, 0x00, 0x06 }, /* 800 1000 1.9 */ - { 0x6, 0x7F, 0x39, 0x00, 0x06 }, /* 850 1050 1.8 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1050 1050 0.0 */ +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_1_05V[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x58, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ + { .cnl = { 0xB, 0x64, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ + { .cnl = { 0x5, 0x70, 0x31, 0x00, 0x0E } }, /* 400 800 6.0 */ + { .cnl = { 0xA, 0x5B, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ + { .cnl = { 0xB, 0x64, 0x3F, 0x00, 0x00 } }, /* 600 600 0.0 */ + { .cnl = { 0x5, 0x73, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ + { .cnl = { 0x6, 0x7C, 0x32, 0x00, 0x0D } }, /* 600 1000 4.4 */ + { .cnl = { 0x5, 0x70, 0x3F, 0x00, 0x00 } }, /* 800 800 0.0 */ + { .cnl = { 0x6, 0x7C, 0x39, 0x00, 0x06 } }, /* 800 1000 1.9 */ + { .cnl = { 0x6, 0x7F, 0x39, 0x00, 0x06 } }, /* 850 1050 1.8 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ }; /* Voltage Swing Programming for VccIO 1.05V for eDP */ -static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_1_05V[] = { - /* NT mV Trans mV db */ - { 0xA, 0x5E, 0x3A, 0x00, 0x05 }, /* 384 500 2.3 */ - { 0x0, 0x7F, 0x38, 0x00, 0x07 }, /* 153 200 2.3 */ - { 0x8, 0x7F, 0x38, 0x00, 0x07 }, /* 192 250 2.3 */ - { 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 230 300 2.3 */ - { 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 269 350 2.3 */ - { 0xA, 0x5E, 0x3C, 0x00, 0x03 }, /* 446 500 1.0 */ - { 0xB, 0x64, 0x39, 0x00, 0x06 }, /* 460 600 2.3 */ - { 0xE, 0x6A, 0x39, 0x00, 0x06 }, /* 537 700 2.3 */ - { 0x2, 0x7F, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_1_05V[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x5E, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ + { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ + { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 192 250 2.3 */ + { .cnl = { 0x1, 0x7F, 0x38, 0x00, 0x07 } }, /* 230 300 2.3 */ + { .cnl = { 0x9, 0x7F, 0x38, 0x00, 0x07 } }, /* 269 350 2.3 */ + { .cnl = { 0xA, 0x5E, 0x3C, 0x00, 0x03 } }, /* 446 500 1.0 */ + { .cnl = { 0xB, 0x64, 0x39, 0x00, 0x06 } }, /* 460 600 2.3 */ + { .cnl = { 0xE, 0x6A, 0x39, 0x00, 0x06 } }, /* 537 700 2.3 */ + { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ }; /* icl_combo_phy_ddi_translations */ -static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hbr2[] = { - /* NT mV Trans mV db */ - { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */ - { 0xC, 0x71, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ - { 0x6, 0x7F, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */ - { 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */ - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ - { 0xC, 0x6C, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */ - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ -}; - -static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr2[] = { - /* NT mV Trans mV db */ - { 0x0, 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 */ - { 0x9, 0x7F, 0x31, 0x00, 0x0E }, /* 200 350 4.9 */ - { 0x8, 0x7F, 0x3F, 0x00, 0x00 }, /* 250 250 0.0 */ - { 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 250 300 1.6 */ - { 0x9, 0x7F, 0x35, 0x00, 0x0A }, /* 250 350 2.9 */ - { 0x1, 0x7F, 0x3F, 0x00, 0x00 }, /* 300 300 0.0 */ - { 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 300 350 1.3 */ - { 0x9, 0x7F, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ -}; - -static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr3[] = { - /* NT mV Trans mV db */ - { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */ - { 0xC, 0x71, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ - { 0x6, 0x7F, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */ - { 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */ - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ - { 0xC, 0x6C, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */ - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ -}; - -static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_hdmi[] = { - /* NT mV Trans mV db */ - { 0xA, 0x60, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */ - { 0xB, 0x73, 0x36, 0x00, 0x09 }, /* 450 650 3.2 */ - { 0x6, 0x7F, 0x31, 0x00, 0x0E }, /* 450 850 5.5 */ - { 0xB, 0x73, 0x3F, 0x00, 0x00 }, /* 650 650 0.0 ALS */ - { 0x6, 0x7F, 0x37, 0x00, 0x08 }, /* 650 850 2.3 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 850 850 0.0 */ - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */ -}; - -static const struct cnl_ddi_buf_trans ehl_combo_phy_ddi_translations_dp[] = { - /* NT mV Trans mV db */ - { 0xA, 0x33, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x47, 0x36, 0x00, 0x09 }, /* 350 500 3.1 */ - { 0xC, 0x64, 0x34, 0x00, 0x0B }, /* 350 700 6.0 */ - { 0x6, 0x7F, 0x30, 0x00, 0x0F }, /* 350 900 8.2 */ - { 0xA, 0x46, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xC, 0x64, 0x38, 0x00, 0x07 }, /* 500 700 2.9 */ - { 0x6, 0x7F, 0x32, 0x00, 0x0D }, /* 500 900 5.1 */ - { 0xC, 0x61, 0x3F, 0x00, 0x00 }, /* 650 700 0.6 */ - { 0x6, 0x7F, 0x38, 0x00, 0x07 }, /* 600 900 3.5 */ - { 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 */ -}; - -static const struct cnl_ddi_buf_trans dg1_combo_phy_ddi_translations_dp_rbr_hbr[] = { - /* NT mV Trans mV db */ - { 0xA, 0x32, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x48, 0x35, 0x00, 0x0A }, /* 350 500 3.1 */ - { 0xC, 0x63, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ - { 0x6, 0x7F, 0x2C, 0x00, 0x13 }, /* 350 900 8.2 */ - { 0xA, 0x43, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xC, 0x60, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */ - { 0x6, 0x7F, 0x30, 0x00, 0x0F }, /* 500 900 5.1 */ - { 0xC, 0x60, 0x3F, 0x00, 0x00 }, /* 650 700 0.6 */ - { 0x6, 0x7F, 0x37, 0x00, 0x08 }, /* 600 900 3.5 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ -}; - -static const struct cnl_ddi_buf_trans dg1_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { - /* NT mV Trans mV db */ - { 0xA, 0x32, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x48, 0x35, 0x00, 0x0A }, /* 350 500 3.1 */ - { 0xC, 0x63, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ - { 0x6, 0x7F, 0x2C, 0x00, 0x13 }, /* 350 900 8.2 */ - { 0xA, 0x43, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xC, 0x60, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */ - { 0x6, 0x7F, 0x30, 0x00, 0x0F }, /* 500 900 5.1 */ - { 0xC, 0x58, 0x3F, 0x00, 0x00 }, /* 650 700 0.6 */ - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ -}; - -static const struct icl_mg_phy_ddi_buf_trans icl_mg_phy_ddi_translations_rbr_hbr[] = { - /* Voltage swing pre-emphasis */ - { 0x18, 0x00, 0x00 }, /* 0 0 */ - { 0x1D, 0x00, 0x05 }, /* 0 1 */ - { 0x24, 0x00, 0x0C }, /* 0 2 */ - { 0x2B, 0x00, 0x14 }, /* 0 3 */ - { 0x21, 0x00, 0x00 }, /* 1 0 */ - { 0x2B, 0x00, 0x08 }, /* 1 1 */ - { 0x30, 0x00, 0x0F }, /* 1 2 */ - { 0x31, 0x00, 0x03 }, /* 2 0 */ - { 0x34, 0x00, 0x0B }, /* 2 1 */ - { 0x3F, 0x00, 0x00 }, /* 3 0 */ -}; - -static const struct icl_mg_phy_ddi_buf_trans icl_mg_phy_ddi_translations_hbr2_hbr3[] = { - /* Voltage swing pre-emphasis */ - { 0x18, 0x00, 0x00 }, /* 0 0 */ - { 0x1D, 0x00, 0x05 }, /* 0 1 */ - { 0x24, 0x00, 0x0C }, /* 0 2 */ - { 0x2B, 0x00, 0x14 }, /* 0 3 */ - { 0x26, 0x00, 0x00 }, /* 1 0 */ - { 0x2C, 0x00, 0x07 }, /* 1 1 */ - { 0x33, 0x00, 0x0C }, /* 1 2 */ - { 0x2E, 0x00, 0x00 }, /* 2 0 */ - { 0x36, 0x00, 0x09 }, /* 2 1 */ - { 0x3F, 0x00, 0x00 }, /* 3 0 */ -}; - -static const struct icl_mg_phy_ddi_buf_trans icl_mg_phy_ddi_translations_hdmi[] = { - /* HDMI Preset VS Pre-emph */ - { 0x1A, 0x0, 0x0 }, /* 1 400mV 0dB */ - { 0x20, 0x0, 0x0 }, /* 2 500mV 0dB */ - { 0x29, 0x0, 0x0 }, /* 3 650mV 0dB */ - { 0x32, 0x0, 0x0 }, /* 4 800mV 0dB */ - { 0x3F, 0x0, 0x0 }, /* 5 1000mV 0dB */ - { 0x3A, 0x0, 0x5 }, /* 6 Full -1.5 dB */ - { 0x39, 0x0, 0x6 }, /* 7 Full -1.8 dB */ - { 0x38, 0x0, 0x7 }, /* 8 Full -2 dB */ - { 0x37, 0x0, 0x8 }, /* 9 Full -2.5 dB */ - { 0x36, 0x0, 0x9 }, /* 10 Full -3 dB */ -}; - -static const struct tgl_dkl_phy_ddi_buf_trans tgl_dkl_phy_dp_ddi_trans[] = { - /* VS pre-emp Non-trans mV Pre-emph dB */ - { 0x7, 0x0, 0x00 }, /* 0 0 400mV 0 dB */ - { 0x5, 0x0, 0x05 }, /* 0 1 400mV 3.5 dB */ - { 0x2, 0x0, 0x0B }, /* 0 2 400mV 6 dB */ - { 0x0, 0x0, 0x18 }, /* 0 3 400mV 9.5 dB */ - { 0x5, 0x0, 0x00 }, /* 1 0 600mV 0 dB */ - { 0x2, 0x0, 0x08 }, /* 1 1 600mV 3.5 dB */ - { 0x0, 0x0, 0x14 }, /* 1 2 600mV 6 dB */ - { 0x2, 0x0, 0x00 }, /* 2 0 800mV 0 dB */ - { 0x0, 0x0, 0x0B }, /* 2 1 800mV 3.5 dB */ - { 0x0, 0x0, 0x00 }, /* 3 0 1200mV 0 dB HDMI default */ -}; - -static const struct tgl_dkl_phy_ddi_buf_trans tgl_dkl_phy_dp_ddi_trans_hbr2[] = { - /* VS pre-emp Non-trans mV Pre-emph dB */ - { 0x7, 0x0, 0x00 }, /* 0 0 400mV 0 dB */ - { 0x5, 0x0, 0x05 }, /* 0 1 400mV 3.5 dB */ - { 0x2, 0x0, 0x0B }, /* 0 2 400mV 6 dB */ - { 0x0, 0x0, 0x19 }, /* 0 3 400mV 9.5 dB */ - { 0x5, 0x0, 0x00 }, /* 1 0 600mV 0 dB */ - { 0x2, 0x0, 0x08 }, /* 1 1 600mV 3.5 dB */ - { 0x0, 0x0, 0x14 }, /* 1 2 600mV 6 dB */ - { 0x2, 0x0, 0x00 }, /* 2 0 800mV 0 dB */ - { 0x0, 0x0, 0x0B }, /* 2 1 800mV 3.5 dB */ - { 0x0, 0x0, 0x00 }, /* 3 0 1200mV 0 dB HDMI default */ -}; - -static const struct tgl_dkl_phy_ddi_buf_trans tgl_dkl_phy_hdmi_ddi_trans[] = { - /* HDMI Preset VS Pre-emph */ - { 0x7, 0x0, 0x0 }, /* 1 400mV 0dB */ - { 0x6, 0x0, 0x0 }, /* 2 500mV 0dB */ - { 0x4, 0x0, 0x0 }, /* 3 650mV 0dB */ - { 0x2, 0x0, 0x0 }, /* 4 800mV 0dB */ - { 0x0, 0x0, 0x0 }, /* 5 1000mV 0dB */ - { 0x0, 0x0, 0x5 }, /* 6 Full -1.5 dB */ - { 0x0, 0x0, 0x6 }, /* 7 Full -1.8 dB */ - { 0x0, 0x0, 0x7 }, /* 8 Full -2 dB */ - { 0x0, 0x0, 0x8 }, /* 9 Full -2.5 dB */ - { 0x0, 0x0, 0xA }, /* 10 Full -3 dB */ -}; - -static const struct cnl_ddi_buf_trans tgl_combo_phy_ddi_translations_dp_hbr[] = { - /* NT mV Trans mV db */ - { 0xA, 0x32, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */ - { 0xC, 0x71, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ - { 0x6, 0x7D, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */ - { 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */ - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ - { 0xC, 0x6C, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */ - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ -}; - -static const struct cnl_ddi_buf_trans tgl_combo_phy_ddi_translations_dp_hbr2[] = { - /* NT mV Trans mV db */ - { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */ - { 0xC, 0x63, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ - { 0x6, 0x7F, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */ - { 0xA, 0x47, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xC, 0x63, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */ - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ - { 0xC, 0x61, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */ - { 0x6, 0x7B, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ -}; - -static const struct cnl_ddi_buf_trans tgl_uy_combo_phy_ddi_translations_dp_hbr2[] = { - /* NT mV Trans mV db */ - { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x4F, 0x36, 0x00, 0x09 }, /* 350 500 3.1 */ - { 0xC, 0x60, 0x32, 0x00, 0x0D }, /* 350 700 6.0 */ - { 0xC, 0x7F, 0x2D, 0x00, 0x12 }, /* 350 900 8.2 */ - { 0xC, 0x47, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xC, 0x6F, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */ - { 0x6, 0x7D, 0x32, 0x00, 0x0D }, /* 500 900 5.1 */ - { 0x6, 0x60, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */ - { 0x6, 0x7F, 0x34, 0x00, 0x0B }, /* 600 900 3.5 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ +static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_dp_hbr2[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x71, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x4C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x73, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x6C, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_hbr2[] = { + /* NT mV Trans mV db */ + { .cnl = { 0x0, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ + { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 200 250 1.9 */ + { .cnl = { 0x1, 0x7F, 0x33, 0x00, 0x0C } }, /* 200 300 3.5 */ + { .cnl = { 0x9, 0x7F, 0x31, 0x00, 0x0E } }, /* 200 350 4.9 */ + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 250 250 0.0 */ + { .cnl = { 0x1, 0x7F, 0x38, 0x00, 0x07 } }, /* 250 300 1.6 */ + { .cnl = { 0x9, 0x7F, 0x35, 0x00, 0x0A } }, /* 250 350 2.9 */ + { .cnl = { 0x1, 0x7F, 0x3F, 0x00, 0x00 } }, /* 300 300 0.0 */ + { .cnl = { 0x9, 0x7F, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ + { .cnl = { 0x9, 0x7F, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ +}; + +static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_hbr3[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x71, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x4C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x73, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x6C, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_hdmi[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x60, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ + { .cnl = { 0xB, 0x73, 0x36, 0x00, 0x09 } }, /* 450 650 3.2 */ + { .cnl = { 0x6, 0x7F, 0x31, 0x00, 0x0E } }, /* 450 850 5.5 */ + { .cnl = { 0xB, 0x73, 0x3F, 0x00, 0x00 } }, /* 650 650 0.0 ALS */ + { .cnl = { 0x6, 0x7F, 0x37, 0x00, 0x08 } }, /* 650 850 2.3 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 850 850 0.0 */ + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ +}; + +static const union intel_ddi_buf_trans_entry ehl_combo_phy_ddi_translations_dp[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x33, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x47, 0x36, 0x00, 0x09 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x64, 0x34, 0x00, 0x0B } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x30, 0x00, 0x0F } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x46, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x64, 0x38, 0x00, 0x07 } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x32, 0x00, 0x0D } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x61, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x38, 0x00, 0x07 } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_hbr[] = { + /* NT mV Trans mV db */ + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ + { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 200 250 1.9 */ + { .cnl = { 0x1, 0x7F, 0x33, 0x00, 0x0C } }, /* 200 300 3.5 */ + { .cnl = { 0xA, 0x35, 0x36, 0x00, 0x09 } }, /* 200 350 4.9 */ + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 250 250 0.0 */ + { .cnl = { 0x1, 0x7F, 0x38, 0x00, 0x07 } }, /* 250 300 1.6 */ + { .cnl = { 0xA, 0x35, 0x35, 0x00, 0x0A } }, /* 250 350 2.9 */ + { .cnl = { 0x1, 0x7F, 0x3F, 0x00, 0x00 } }, /* 300 300 0.0 */ + { .cnl = { 0xA, 0x35, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ +}; + +static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_hbr2[] = { + /* NT mV Trans mV db */ + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 250 1.9 */ + { .cnl = { 0x1, 0x7F, 0x3D, 0x00, 0x02 } }, /* 200 300 3.5 */ + { .cnl = { 0xA, 0x35, 0x38, 0x00, 0x07 } }, /* 200 350 4.9 */ + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 250 250 0.0 */ + { .cnl = { 0x1, 0x7F, 0x3F, 0x00, 0x00 } }, /* 250 300 1.6 */ + { .cnl = { 0xA, 0x35, 0x3A, 0x00, 0x05 } }, /* 250 350 2.9 */ + { .cnl = { 0x1, 0x7F, 0x3F, 0x00, 0x00 } }, /* 300 300 0.0 */ + { .cnl = { 0xA, 0x35, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ +}; + +static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_rbr_hbr[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x48, 0x35, 0x00, 0x0A } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x63, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2C, 0x00, 0x13 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x43, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x60, 0x36, 0x00, 0x09 } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x30, 0x00, 0x0F } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x60, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x37, 0x00, 0x08 } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x48, 0x35, 0x00, 0x0A } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x63, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2C, 0x00, 0x13 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x43, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x60, 0x36, 0x00, 0x09 } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x30, 0x00, 0x0F } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x58, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_rbr_hbr[] = { + /* Voltage swing pre-emphasis */ + { .mg = { 0x18, 0x00, 0x00 } }, /* 0 0 */ + { .mg = { 0x1D, 0x00, 0x05 } }, /* 0 1 */ + { .mg = { 0x24, 0x00, 0x0C } }, /* 0 2 */ + { .mg = { 0x2B, 0x00, 0x14 } }, /* 0 3 */ + { .mg = { 0x21, 0x00, 0x00 } }, /* 1 0 */ + { .mg = { 0x2B, 0x00, 0x08 } }, /* 1 1 */ + { .mg = { 0x30, 0x00, 0x0F } }, /* 1 2 */ + { .mg = { 0x31, 0x00, 0x03 } }, /* 2 0 */ + { .mg = { 0x34, 0x00, 0x0B } }, /* 2 1 */ + { .mg = { 0x3F, 0x00, 0x00 } }, /* 3 0 */ +}; + +static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hbr2_hbr3[] = { + /* Voltage swing pre-emphasis */ + { .mg = { 0x18, 0x00, 0x00 } }, /* 0 0 */ + { .mg = { 0x1D, 0x00, 0x05 } }, /* 0 1 */ + { .mg = { 0x24, 0x00, 0x0C } }, /* 0 2 */ + { .mg = { 0x2B, 0x00, 0x14 } }, /* 0 3 */ + { .mg = { 0x26, 0x00, 0x00 } }, /* 1 0 */ + { .mg = { 0x2C, 0x00, 0x07 } }, /* 1 1 */ + { .mg = { 0x33, 0x00, 0x0C } }, /* 1 2 */ + { .mg = { 0x2E, 0x00, 0x00 } }, /* 2 0 */ + { .mg = { 0x36, 0x00, 0x09 } }, /* 2 1 */ + { .mg = { 0x3F, 0x00, 0x00 } }, /* 3 0 */ +}; + +static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hdmi[] = { + /* HDMI Preset VS Pre-emph */ + { .mg = { 0x1A, 0x0, 0x0 } }, /* 1 400mV 0dB */ + { .mg = { 0x20, 0x0, 0x0 } }, /* 2 500mV 0dB */ + { .mg = { 0x29, 0x0, 0x0 } }, /* 3 650mV 0dB */ + { .mg = { 0x32, 0x0, 0x0 } }, /* 4 800mV 0dB */ + { .mg = { 0x3F, 0x0, 0x0 } }, /* 5 1000mV 0dB */ + { .mg = { 0x3A, 0x0, 0x5 } }, /* 6 Full -1.5 dB */ + { .mg = { 0x39, 0x0, 0x6 } }, /* 7 Full -1.8 dB */ + { .mg = { 0x38, 0x0, 0x7 } }, /* 8 Full -2 dB */ + { .mg = { 0x37, 0x0, 0x8 } }, /* 9 Full -2.5 dB */ + { .mg = { 0x36, 0x0, 0x9 } }, /* 10 Full -3 dB */ +}; + +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans[] = { + /* VS pre-emp Non-trans mV Pre-emph dB */ + { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ + { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ + { .dkl = { 0x2, 0x0, 0x0B } }, /* 0 2 400mV 6 dB */ + { .dkl = { 0x0, 0x0, 0x18 } }, /* 0 3 400mV 9.5 dB */ + { .dkl = { 0x5, 0x0, 0x00 } }, /* 1 0 600mV 0 dB */ + { .dkl = { 0x2, 0x0, 0x08 } }, /* 1 1 600mV 3.5 dB */ + { .dkl = { 0x0, 0x0, 0x14 } }, /* 1 2 600mV 6 dB */ + { .dkl = { 0x2, 0x0, 0x00 } }, /* 2 0 800mV 0 dB */ + { .dkl = { 0x0, 0x0, 0x0B } }, /* 2 1 800mV 3.5 dB */ + { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ +}; + +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans_hbr2[] = { + /* VS pre-emp Non-trans mV Pre-emph dB */ + { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ + { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ + { .dkl = { 0x2, 0x0, 0x0B } }, /* 0 2 400mV 6 dB */ + { .dkl = { 0x0, 0x0, 0x19 } }, /* 0 3 400mV 9.5 dB */ + { .dkl = { 0x5, 0x0, 0x00 } }, /* 1 0 600mV 0 dB */ + { .dkl = { 0x2, 0x0, 0x08 } }, /* 1 1 600mV 3.5 dB */ + { .dkl = { 0x0, 0x0, 0x14 } }, /* 1 2 600mV 6 dB */ + { .dkl = { 0x2, 0x0, 0x00 } }, /* 2 0 800mV 0 dB */ + { .dkl = { 0x0, 0x0, 0x0B } }, /* 2 1 800mV 3.5 dB */ + { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ +}; + +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_hdmi_ddi_trans[] = { + /* HDMI Preset VS Pre-emph */ + { .dkl = { 0x7, 0x0, 0x0 } }, /* 1 400mV 0dB */ + { .dkl = { 0x6, 0x0, 0x0 } }, /* 2 500mV 0dB */ + { .dkl = { 0x4, 0x0, 0x0 } }, /* 3 650mV 0dB */ + { .dkl = { 0x2, 0x0, 0x0 } }, /* 4 800mV 0dB */ + { .dkl = { 0x0, 0x0, 0x0 } }, /* 5 1000mV 0dB */ + { .dkl = { 0x0, 0x0, 0x5 } }, /* 6 Full -1.5 dB */ + { .dkl = { 0x0, 0x0, 0x6 } }, /* 7 Full -1.8 dB */ + { .dkl = { 0x0, 0x0, 0x7 } }, /* 8 Full -2 dB */ + { .dkl = { 0x0, 0x0, 0x8 } }, /* 9 Full -2.5 dB */ + { .dkl = { 0x0, 0x0, 0xA } }, /* 10 Full -3 dB */ +}; + +static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_hbr[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x71, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7D, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x4C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x73, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x6C, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_hbr2[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x63, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x47, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x63, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x61, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7B, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const union intel_ddi_buf_trans_entry tgl_uy_combo_phy_ddi_translations_dp_hbr2[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x4F, 0x36, 0x00, 0x09 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x60, 0x32, 0x00, 0x0D } }, /* 350 700 6.0 */ + { .cnl = { 0xC, 0x7F, 0x2D, 0x00, 0x12 } }, /* 350 900 8.2 */ + { .cnl = { 0xC, 0x47, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x6F, 0x36, 0x00, 0x09 } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7D, 0x32, 0x00, 0x0D } }, /* 500 900 5.1 */ + { .cnl = { 0x6, 0x60, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x34, 0x00, 0x0B } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; /* * Cloned the HOBL entry to comply with the voltage and pre-emphasis entries * that DisplayPort specification requires */ -static const struct cnl_ddi_buf_trans tgl_combo_phy_ddi_translations_edp_hbr2_hobl[] = { - /* VS pre-emp */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 0 0 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 0 1 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 0 2 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 0 3 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1 0 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1 1 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1 2 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 2 0 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 2 1 */ +static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_edp_hbr2_hobl[] = { + /* VS pre-emp */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 0 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 1 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 2 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 3 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1 0 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1 1 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1 2 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 2 0 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 2 1 */ }; -static const struct cnl_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr[] = { - /* NT mV Trans mV db */ - { 0xA, 0x2F, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */ - { 0xC, 0x63, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ - { 0x6, 0x7D, 0x2A, 0x00, 0x15 }, /* 350 900 8.2 */ - { 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */ - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ - { 0xC, 0x6E, 0x3E, 0x00, 0x01 }, /* 650 700 0.6 */ - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ +static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_hbr[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x2F, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x63, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7D, 0x2A, 0x00, 0x15 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x4C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x73, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x6E, 0x3E, 0x00, 0x01 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const struct cnl_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { - /* NT mV Trans mV db */ - { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ - { 0xA, 0x50, 0x38, 0x00, 0x07 }, /* 350 500 3.1 */ - { 0xC, 0x61, 0x33, 0x00, 0x0C }, /* 350 700 6.0 */ - { 0x6, 0x7F, 0x2E, 0x00, 0x11 }, /* 350 900 8.2 */ - { 0xA, 0x47, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ - { 0xC, 0x5F, 0x38, 0x00, 0x07 }, /* 500 700 2.9 */ - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ - { 0xC, 0x5F, 0x3F, 0x00, 0x00 }, /* 650 700 0.6 */ - { 0x6, 0x7E, 0x36, 0x00, 0x09 }, /* 600 900 3.5 */ - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ +static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x50, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x61, 0x33, 0x00, 0x0C } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2E, 0x00, 0x11 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x47, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x5F, 0x38, 0x00, 0x07 } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x5F, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7E, 0x36, 0x00, 0x09 } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const struct tgl_dkl_phy_ddi_buf_trans adlp_dkl_phy_dp_ddi_trans_hbr[] = { - /* VS pre-emp Non-trans mV Pre-emph dB */ - { 0x7, 0x0, 0x01 }, /* 0 0 400mV 0 dB */ - { 0x5, 0x0, 0x06 }, /* 0 1 400mV 3.5 dB */ - { 0x2, 0x0, 0x0B }, /* 0 2 400mV 6 dB */ - { 0x0, 0x0, 0x17 }, /* 0 3 400mV 9.5 dB */ - { 0x5, 0x0, 0x00 }, /* 1 0 600mV 0 dB */ - { 0x2, 0x0, 0x08 }, /* 1 1 600mV 3.5 dB */ - { 0x0, 0x0, 0x14 }, /* 1 2 600mV 6 dB */ - { 0x2, 0x0, 0x00 }, /* 2 0 800mV 0 dB */ - { 0x0, 0x0, 0x0B }, /* 2 1 800mV 3.5 dB */ - { 0x0, 0x0, 0x00 }, /* 3 0 1200mV 0 dB */ +static const union intel_ddi_buf_trans_entry adlp_dkl_phy_dp_ddi_trans_hbr[] = { + /* VS pre-emp Non-trans mV Pre-emph dB */ + { .dkl = { 0x7, 0x0, 0x01 } }, /* 0 0 400mV 0 dB */ + { .dkl = { 0x5, 0x0, 0x06 } }, /* 0 1 400mV 3.5 dB */ + { .dkl = { 0x2, 0x0, 0x0B } }, /* 0 2 400mV 6 dB */ + { .dkl = { 0x0, 0x0, 0x17 } }, /* 0 3 400mV 9.5 dB */ + { .dkl = { 0x5, 0x0, 0x00 } }, /* 1 0 600mV 0 dB */ + { .dkl = { 0x2, 0x0, 0x08 } }, /* 1 1 600mV 3.5 dB */ + { .dkl = { 0x0, 0x0, 0x14 } }, /* 1 2 600mV 6 dB */ + { .dkl = { 0x2, 0x0, 0x00 } }, /* 2 0 800mV 0 dB */ + { .dkl = { 0x0, 0x0, 0x0B } }, /* 2 1 800mV 3.5 dB */ + { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB */ }; -static const struct tgl_dkl_phy_ddi_buf_trans adlp_dkl_phy_dp_ddi_trans_hbr2_hbr3[] = { - /* VS pre-emp Non-trans mV Pre-emph dB */ - { 0x7, 0x0, 0x00 }, /* 0 0 400mV 0 dB */ - { 0x5, 0x0, 0x04 }, /* 0 1 400mV 3.5 dB */ - { 0x2, 0x0, 0x0A }, /* 0 2 400mV 6 dB */ - { 0x0, 0x0, 0x18 }, /* 0 3 400mV 9.5 dB */ - { 0x5, 0x0, 0x00 }, /* 1 0 600mV 0 dB */ - { 0x2, 0x0, 0x06 }, /* 1 1 600mV 3.5 dB */ - { 0x0, 0x0, 0x14 }, /* 1 2 600mV 6 dB */ - { 0x2, 0x0, 0x00 }, /* 2 0 800mV 0 dB */ - { 0x0, 0x0, 0x09 }, /* 2 1 800mV 3.5 dB */ - { 0x0, 0x0, 0x00 }, /* 3 0 1200mV 0 dB */ +static const union intel_ddi_buf_trans_entry adlp_dkl_phy_dp_ddi_trans_hbr2_hbr3[] = { + /* VS pre-emp Non-trans mV Pre-emph dB */ + { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ + { .dkl = { 0x5, 0x0, 0x04 } }, /* 0 1 400mV 3.5 dB */ + { .dkl = { 0x2, 0x0, 0x0A } }, /* 0 2 400mV 6 dB */ + { .dkl = { 0x0, 0x0, 0x18 } }, /* 0 3 400mV 9.5 dB */ + { .dkl = { 0x5, 0x0, 0x00 } }, /* 1 0 600mV 0 dB */ + { .dkl = { 0x2, 0x0, 0x06 } }, /* 1 1 600mV 3.5 dB */ + { .dkl = { 0x0, 0x0, 0x14 } }, /* 1 2 600mV 6 dB */ + { .dkl = { 0x2, 0x0, 0x00 } }, /* 2 0 800mV 0 dB */ + { .dkl = { 0x0, 0x0, 0x09 } }, /* 2 1 800mV 3.5 dB */ + { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB */ }; -bool is_hobl_buf_trans(const struct cnl_ddi_buf_trans *table) +bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table) { return table == tgl_combo_phy_ddi_translations_edp_hbr2_hobl; } -static const struct hsw_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -781,7 +781,7 @@ bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) } } -static const struct hsw_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -798,7 +798,7 @@ skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) } } -static const struct hsw_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -819,7 +819,7 @@ kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) } } -static const struct hsw_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -851,7 +851,7 @@ skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) return skl_get_buf_trans_dp(encoder, n_entries); } -static const struct hsw_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries) { if (IS_SKL_ULX(dev_priv) || @@ -875,7 +875,7 @@ static int skl_buf_trans_num_entries(enum port port, int n_entries) return min(n_entries, 9); } -static const struct hsw_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -883,12 +883,12 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv) || IS_COMETLAKE(dev_priv)) { - const struct hsw_ddi_buf_trans *ddi_translations = + const union intel_ddi_buf_trans_entry *ddi_translations = kbl_get_buf_trans_dp(encoder, n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); return ddi_translations; } else if (IS_SKYLAKE(dev_priv)) { - const struct hsw_ddi_buf_trans *ddi_translations = + const union intel_ddi_buf_trans_entry *ddi_translations = skl_get_buf_trans_dp(encoder, n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); return ddi_translations; @@ -904,13 +904,13 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) return NULL; } -static const struct hsw_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) { - const struct hsw_ddi_buf_trans *ddi_translations = + const union intel_ddi_buf_trans_entry *ddi_translations = skl_get_buf_trans_edp(encoder, n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); return ddi_translations; @@ -925,7 +925,7 @@ hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) return NULL; } -static const struct hsw_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * hsw_get_buf_trans_fdi(struct intel_encoder *encoder, int *n_entries) { @@ -943,7 +943,7 @@ hsw_get_buf_trans_fdi(struct intel_encoder *encoder, return NULL; } -static const struct hsw_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) { @@ -963,7 +963,7 @@ hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, return NULL; } -const struct hsw_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * hsw_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -978,14 +978,14 @@ hsw_get_buf_trans(struct intel_encoder *encoder, return hsw_get_buf_trans_dp(encoder, n_entries); } -static const struct bxt_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * bxt_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { *n_entries = ARRAY_SIZE(bxt_ddi_translations_dp); return bxt_ddi_translations_dp; } -static const struct bxt_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -998,14 +998,14 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) return bxt_get_buf_trans_dp(encoder, n_entries); } -static const struct bxt_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) { *n_entries = ARRAY_SIZE(bxt_ddi_translations_hdmi); return bxt_ddi_translations_hdmi; } -const struct bxt_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * bxt_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1017,7 +1017,7 @@ bxt_get_buf_trans(struct intel_encoder *encoder, return bxt_get_buf_trans_dp(encoder, n_entries); } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1039,7 +1039,7 @@ cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) return NULL; } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1061,7 +1061,7 @@ cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) return NULL; } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1087,7 +1087,7 @@ cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) } } -const struct cnl_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * cnl_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1099,7 +1099,7 @@ cnl_get_buf_trans(struct intel_encoder *encoder, return cnl_get_buf_trans_dp(encoder, n_entries); } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1108,7 +1108,7 @@ icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, return icl_combo_phy_ddi_translations_hdmi; } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1117,7 +1117,7 @@ icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, return icl_combo_phy_ddi_translations_dp_hbr2; } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1141,7 +1141,7 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const struct cnl_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * icl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1154,7 +1154,7 @@ icl_get_combo_buf_trans(struct intel_encoder *encoder, return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -static const struct icl_mg_phy_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1163,7 +1163,7 @@ icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, return icl_mg_phy_ddi_translations_hdmi; } -static const struct icl_mg_phy_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1177,7 +1177,7 @@ icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, } } -const struct icl_mg_phy_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * icl_get_mg_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1188,7 +1188,7 @@ icl_get_mg_buf_trans(struct intel_encoder *encoder, return icl_get_mg_buf_trans_dp(encoder, crtc_state, n_entries); } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1197,7 +1197,7 @@ ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, return icl_combo_phy_ddi_translations_hdmi; } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1206,7 +1206,7 @@ ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, return ehl_combo_phy_ddi_translations_dp; } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1221,7 +1221,7 @@ ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const struct cnl_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * ehl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1234,7 +1234,7 @@ 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 * +static const union intel_ddi_buf_trans_entry * jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1243,7 +1243,7 @@ jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, return icl_combo_phy_ddi_translations_hdmi; } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1252,7 +1252,7 @@ jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, return icl_combo_phy_ddi_translations_dp_hbr2; } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1272,7 +1272,7 @@ jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const struct cnl_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * jsl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1285,7 +1285,7 @@ jsl_get_combo_buf_trans(struct intel_encoder *encoder, return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1294,7 +1294,7 @@ tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, return icl_combo_phy_ddi_translations_hdmi; } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1323,7 +1323,7 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, } } -static const struct cnl_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1345,7 +1345,7 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const struct cnl_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * tgl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1358,7 +1358,7 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder, return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -static const struct tgl_dkl_phy_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1367,7 +1367,7 @@ tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, return tgl_dkl_phy_hdmi_ddi_trans; } -static const struct tgl_dkl_phy_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1381,7 +1381,7 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, } } -const struct tgl_dkl_phy_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * tgl_get_dkl_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1392,7 +1392,7 @@ tgl_get_dkl_buf_trans(struct intel_encoder *encoder, return tgl_get_dkl_buf_trans_dp(encoder, crtc_state, n_entries); } -static const struct tgl_dkl_phy_ddi_buf_trans * +static const union intel_ddi_buf_trans_entry * adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1406,7 +1406,7 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, return adlp_dkl_phy_dp_ddi_trans_hbr; } -const struct tgl_dkl_phy_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * adlp_get_dkl_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h index 428f1f343341..487a4f815470 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h @@ -45,52 +45,60 @@ struct tgl_dkl_phy_ddi_buf_trans { u32 dkl_de_emphasis_control; }; -bool is_hobl_buf_trans(const struct cnl_ddi_buf_trans *table); +union intel_ddi_buf_trans_entry { + struct hsw_ddi_buf_trans hsw; + struct bxt_ddi_buf_trans bxt; + struct cnl_ddi_buf_trans cnl; + struct icl_mg_phy_ddi_buf_trans mg; + struct tgl_dkl_phy_ddi_buf_trans dkl; +}; + +bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table); int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *default_entry); -const struct hsw_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * hsw_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const struct bxt_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * bxt_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const struct tgl_dkl_phy_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * adlp_get_dkl_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const struct cnl_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * tgl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const struct tgl_dkl_phy_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * tgl_get_dkl_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const struct cnl_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * jsl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const struct cnl_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * ehl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const struct cnl_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * icl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const struct icl_mg_phy_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * icl_get_mg_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const struct cnl_ddi_buf_trans * +const union intel_ddi_buf_trans_entry * cnl_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 03/17] drm/i915: Wrap the platform specific buf trans structs into a union 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 03/17] drm/i915: Wrap the platform specific buf trans structs into a union Ville Syrjala @ 2021-06-18 12:04 ` Jani Nikula 0 siblings, 0 replies; 39+ messages in thread From: Jani Nikula @ 2021-06-18 12:04 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > In order to abstact the buf trans stuff let's wrap the platform > specific structs into a union. > > v2: Handle adl-p > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Holds for v2. > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 76 +- > .../drm/i915/display/intel_ddi_buf_trans.c | 1370 ++++++++--------- > .../drm/i915/display/intel_ddi_buf_trans.h | 30 +- > 3 files changed, 742 insertions(+), 734 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 33e94030090f..f3fba535812c 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -102,7 +102,7 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, > u32 iboost_bit = 0; > int i, n_entries; > enum port port = encoder->port; > - const struct hsw_ddi_buf_trans *ddi_translations; > + const union intel_ddi_buf_trans_entry *ddi_translations; > > ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); > > @@ -116,9 +116,9 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, > > for (i = 0; i < n_entries; i++) { > intel_de_write(dev_priv, DDI_BUF_TRANS_LO(port, i), > - ddi_translations[i].trans1 | iboost_bit); > + ddi_translations[i].hsw.trans1 | iboost_bit); > intel_de_write(dev_priv, DDI_BUF_TRANS_HI(port, i), > - ddi_translations[i].trans2); > + ddi_translations[i].hsw.trans2); > } > } > > @@ -135,7 +135,7 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, > u32 iboost_bit = 0; > int n_entries; > enum port port = encoder->port; > - const struct hsw_ddi_buf_trans *ddi_translations; > + const union intel_ddi_buf_trans_entry *ddi_translations; > > ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); > > @@ -151,9 +151,9 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, > > /* Entry 9 is for HDMI: */ > intel_de_write(dev_priv, DDI_BUF_TRANS_LO(port, 9), > - ddi_translations[level].trans1 | iboost_bit); > + ddi_translations[level].hsw.trans1 | iboost_bit); > intel_de_write(dev_priv, DDI_BUF_TRANS_HI(port, 9), > - ddi_translations[level].trans2); > + ddi_translations[level].hsw.trans2); > } > > void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv, > @@ -944,7 +944,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, > iboost = intel_bios_encoder_dp_boost_level(encoder->devdata); > > if (iboost == 0) { > - const struct hsw_ddi_buf_trans *ddi_translations; > + const union intel_ddi_buf_trans_entry *ddi_translations; > int n_entries; > > ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); > @@ -954,7 +954,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, > if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) > level = n_entries - 1; > > - iboost = ddi_translations[level].i_boost; > + iboost = ddi_translations[level].hsw.i_boost; > } > > /* Make sure that the requested I_boost is valid */ > @@ -974,7 +974,7 @@ static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder, > int level) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > - const struct bxt_ddi_buf_trans *ddi_translations; > + const union intel_ddi_buf_trans_entry *ddi_translations; > enum port port = encoder->port; > int n_entries; > > @@ -985,10 +985,10 @@ static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder, > level = n_entries - 1; > > bxt_ddi_phy_set_signal_level(dev_priv, port, > - ddi_translations[level].margin, > - ddi_translations[level].scale, > - ddi_translations[level].enable, > - ddi_translations[level].deemphasis); > + ddi_translations[level].bxt.margin, > + ddi_translations[level].bxt.scale, > + ddi_translations[level].bxt.enable, > + ddi_translations[level].bxt.deemphasis); > } > > static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp, > @@ -1049,7 +1049,7 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, > int level) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > - const struct cnl_ddi_buf_trans *ddi_translations; > + const union intel_ddi_buf_trans_entry *ddi_translations; > enum port port = encoder->port; > int n_entries, ln; > u32 val; > @@ -1071,8 +1071,8 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, > val = intel_de_read(dev_priv, CNL_PORT_TX_DW2_LN0(port)); > val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK | > RCOMP_SCALAR_MASK); > - val |= SWING_SEL_UPPER(ddi_translations[level].dw2_swing_sel); > - val |= SWING_SEL_LOWER(ddi_translations[level].dw2_swing_sel); > + val |= SWING_SEL_UPPER(ddi_translations[level].cnl.dw2_swing_sel); > + val |= SWING_SEL_LOWER(ddi_translations[level].cnl.dw2_swing_sel); > /* Rcomp scalar is fixed as 0x98 for every table entry */ > val |= RCOMP_SCALAR(0x98); > intel_de_write(dev_priv, CNL_PORT_TX_DW2_GRP(port), val); > @@ -1083,9 +1083,9 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, > val = intel_de_read(dev_priv, CNL_PORT_TX_DW4_LN(ln, port)); > val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK | > CURSOR_COEFF_MASK); > - val |= POST_CURSOR_1(ddi_translations[level].dw4_post_cursor_1); > - val |= POST_CURSOR_2(ddi_translations[level].dw4_post_cursor_2); > - val |= CURSOR_COEFF(ddi_translations[level].dw4_cursor_coeff); > + val |= POST_CURSOR_1(ddi_translations[level].cnl.dw4_post_cursor_1); > + val |= POST_CURSOR_2(ddi_translations[level].cnl.dw4_post_cursor_2); > + val |= CURSOR_COEFF(ddi_translations[level].cnl.dw4_cursor_coeff); > intel_de_write(dev_priv, CNL_PORT_TX_DW4_LN(ln, port), val); > } > > @@ -1100,7 +1100,7 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, > /* Program PORT_TX_DW7 */ > val = intel_de_read(dev_priv, CNL_PORT_TX_DW7_LN0(port)); > val &= ~N_SCALAR_MASK; > - val |= N_SCALAR(ddi_translations[level].dw7_n_scalar); > + val |= N_SCALAR(ddi_translations[level].cnl.dw7_n_scalar); > intel_de_write(dev_priv, CNL_PORT_TX_DW7_GRP(port), val); > } > > @@ -1170,7 +1170,7 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, > int level) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > - const struct cnl_ddi_buf_trans *ddi_translations; > + const union intel_ddi_buf_trans_entry *ddi_translations; > enum phy phy = intel_port_to_phy(dev_priv, encoder->port); > int n_entries, ln; > u32 val; > @@ -1211,8 +1211,8 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, > val = intel_de_read(dev_priv, ICL_PORT_TX_DW2_LN0(phy)); > val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK | > RCOMP_SCALAR_MASK); > - val |= SWING_SEL_UPPER(ddi_translations[level].dw2_swing_sel); > - val |= SWING_SEL_LOWER(ddi_translations[level].dw2_swing_sel); > + val |= SWING_SEL_UPPER(ddi_translations[level].cnl.dw2_swing_sel); > + val |= SWING_SEL_LOWER(ddi_translations[level].cnl.dw2_swing_sel); > /* Program Rcomp scalar for every table entry */ > val |= RCOMP_SCALAR(0x98); > intel_de_write(dev_priv, ICL_PORT_TX_DW2_GRP(phy), val); > @@ -1223,16 +1223,16 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, > val = intel_de_read(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy)); > val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK | > CURSOR_COEFF_MASK); > - val |= POST_CURSOR_1(ddi_translations[level].dw4_post_cursor_1); > - val |= POST_CURSOR_2(ddi_translations[level].dw4_post_cursor_2); > - val |= CURSOR_COEFF(ddi_translations[level].dw4_cursor_coeff); > + val |= POST_CURSOR_1(ddi_translations[level].cnl.dw4_post_cursor_1); > + val |= POST_CURSOR_2(ddi_translations[level].cnl.dw4_post_cursor_2); > + val |= CURSOR_COEFF(ddi_translations[level].cnl.dw4_cursor_coeff); > intel_de_write(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy), val); > } > > /* Program PORT_TX_DW7 */ > val = intel_de_read(dev_priv, ICL_PORT_TX_DW7_LN0(phy)); > val &= ~N_SCALAR_MASK; > - val |= N_SCALAR(ddi_translations[level].dw7_n_scalar); > + val |= N_SCALAR(ddi_translations[level].cnl.dw7_n_scalar); > intel_de_write(dev_priv, ICL_PORT_TX_DW7_GRP(phy), val); > } > > @@ -1303,7 +1303,7 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port); > - const struct icl_mg_phy_ddi_buf_trans *ddi_translations; > + const union intel_ddi_buf_trans_entry *ddi_translations; > int n_entries, ln; > u32 val; > > @@ -1333,13 +1333,13 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > val = intel_de_read(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port)); > val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK; > val |= CRI_TXDEEMPH_OVERRIDE_17_12( > - ddi_translations[level].cri_txdeemph_override_17_12); > + ddi_translations[level].mg.cri_txdeemph_override_17_12); > intel_de_write(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port), val); > > val = intel_de_read(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port)); > val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK; > val |= CRI_TXDEEMPH_OVERRIDE_17_12( > - ddi_translations[level].cri_txdeemph_override_17_12); > + ddi_translations[level].mg.cri_txdeemph_override_17_12); > intel_de_write(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port), val); > } > > @@ -1349,9 +1349,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK | > CRI_TXDEEMPH_OVERRIDE_5_0_MASK); > val |= CRI_TXDEEMPH_OVERRIDE_5_0( > - ddi_translations[level].cri_txdeemph_override_5_0) | > + ddi_translations[level].mg.cri_txdeemph_override_5_0) | > CRI_TXDEEMPH_OVERRIDE_11_6( > - ddi_translations[level].cri_txdeemph_override_11_6) | > + ddi_translations[level].mg.cri_txdeemph_override_11_6) | > CRI_TXDEEMPH_OVERRIDE_EN; > intel_de_write(dev_priv, MG_TX1_DRVCTRL(ln, tc_port), val); > > @@ -1359,9 +1359,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK | > CRI_TXDEEMPH_OVERRIDE_5_0_MASK); > val |= CRI_TXDEEMPH_OVERRIDE_5_0( > - ddi_translations[level].cri_txdeemph_override_5_0) | > + ddi_translations[level].mg.cri_txdeemph_override_5_0) | > CRI_TXDEEMPH_OVERRIDE_11_6( > - ddi_translations[level].cri_txdeemph_override_11_6) | > + ddi_translations[level].mg.cri_txdeemph_override_11_6) | > CRI_TXDEEMPH_OVERRIDE_EN; > intel_de_write(dev_priv, MG_TX2_DRVCTRL(ln, tc_port), val); > > @@ -1441,7 +1441,7 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port); > - const struct tgl_dkl_phy_ddi_buf_trans *ddi_translations; > + const union intel_ddi_buf_trans_entry *ddi_translations; > u32 val, dpcnt_mask, dpcnt_val; > int n_entries, ln; > > @@ -1461,9 +1461,9 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > dpcnt_mask = (DKL_TX_PRESHOOT_COEFF_MASK | > DKL_TX_DE_EMPAHSIS_COEFF_MASK | > DKL_TX_VSWING_CONTROL_MASK); > - dpcnt_val = DKL_TX_VSWING_CONTROL(ddi_translations[level].dkl_vswing_control); > - dpcnt_val |= DKL_TX_DE_EMPHASIS_COEFF(ddi_translations[level].dkl_de_emphasis_control); > - dpcnt_val |= DKL_TX_PRESHOOT_COEFF(ddi_translations[level].dkl_preshoot_control); > + dpcnt_val = DKL_TX_VSWING_CONTROL(ddi_translations[level].dkl.dkl_vswing_control); > + dpcnt_val |= DKL_TX_DE_EMPHASIS_COEFF(ddi_translations[level].dkl.dkl_de_emphasis_control); > + dpcnt_val |= DKL_TX_PRESHOOT_COEFF(ddi_translations[level].dkl.dkl_preshoot_control); > > for (ln = 0; ln < 2; ln++) { > intel_de_write(dev_priv, HIP_INDEX_REG(tc_port), > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index f7b7178363e8..3f38267b7dd6 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -13,761 +13,761 @@ > * them for both DP and FDI transports, allowing those ports to > * automatically adapt to HDMI connections as well > */ > -static const struct hsw_ddi_buf_trans hsw_ddi_translations_dp[] = { > - { 0x00FFFFFF, 0x0006000E, 0x0 }, > - { 0x00D75FFF, 0x0005000A, 0x0 }, > - { 0x00C30FFF, 0x00040006, 0x0 }, > - { 0x80AAAFFF, 0x000B0000, 0x0 }, > - { 0x00FFFFFF, 0x0005000A, 0x0 }, > - { 0x00D75FFF, 0x000C0004, 0x0 }, > - { 0x80C30FFF, 0x000B0000, 0x0 }, > - { 0x00FFFFFF, 0x00040006, 0x0 }, > - { 0x80D75FFF, 0x000B0000, 0x0 }, > +static const union intel_ddi_buf_trans_entry hsw_ddi_translations_dp[] = { > + { .hsw = { 0x00FFFFFF, 0x0006000E, 0x0 } }, > + { .hsw = { 0x00D75FFF, 0x0005000A, 0x0 } }, > + { .hsw = { 0x00C30FFF, 0x00040006, 0x0 } }, > + { .hsw = { 0x80AAAFFF, 0x000B0000, 0x0 } }, > + { .hsw = { 0x00FFFFFF, 0x0005000A, 0x0 } }, > + { .hsw = { 0x00D75FFF, 0x000C0004, 0x0 } }, > + { .hsw = { 0x80C30FFF, 0x000B0000, 0x0 } }, > + { .hsw = { 0x00FFFFFF, 0x00040006, 0x0 } }, > + { .hsw = { 0x80D75FFF, 0x000B0000, 0x0 } }, > }; > > -static const struct hsw_ddi_buf_trans hsw_ddi_translations_fdi[] = { > - { 0x00FFFFFF, 0x0007000E, 0x0 }, > - { 0x00D75FFF, 0x000F000A, 0x0 }, > - { 0x00C30FFF, 0x00060006, 0x0 }, > - { 0x00AAAFFF, 0x001E0000, 0x0 }, > - { 0x00FFFFFF, 0x000F000A, 0x0 }, > - { 0x00D75FFF, 0x00160004, 0x0 }, > - { 0x00C30FFF, 0x001E0000, 0x0 }, > - { 0x00FFFFFF, 0x00060006, 0x0 }, > - { 0x00D75FFF, 0x001E0000, 0x0 }, > +static const union intel_ddi_buf_trans_entry hsw_ddi_translations_fdi[] = { > + { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, > + { .hsw = { 0x00D75FFF, 0x000F000A, 0x0 } }, > + { .hsw = { 0x00C30FFF, 0x00060006, 0x0 } }, > + { .hsw = { 0x00AAAFFF, 0x001E0000, 0x0 } }, > + { .hsw = { 0x00FFFFFF, 0x000F000A, 0x0 } }, > + { .hsw = { 0x00D75FFF, 0x00160004, 0x0 } }, > + { .hsw = { 0x00C30FFF, 0x001E0000, 0x0 } }, > + { .hsw = { 0x00FFFFFF, 0x00060006, 0x0 } }, > + { .hsw = { 0x00D75FFF, 0x001E0000, 0x0 } }, > }; > > -static const struct hsw_ddi_buf_trans hsw_ddi_translations_hdmi[] = { > - /* Idx NT mV d T mV d db */ > - { 0x00FFFFFF, 0x0006000E, 0x0 },/* 0: 400 400 0 */ > - { 0x00E79FFF, 0x000E000C, 0x0 },/* 1: 400 500 2 */ > - { 0x00D75FFF, 0x0005000A, 0x0 },/* 2: 400 600 3.5 */ > - { 0x00FFFFFF, 0x0005000A, 0x0 },/* 3: 600 600 0 */ > - { 0x00E79FFF, 0x001D0007, 0x0 },/* 4: 600 750 2 */ > - { 0x00D75FFF, 0x000C0004, 0x0 },/* 5: 600 900 3.5 */ > - { 0x00FFFFFF, 0x00040006, 0x0 },/* 6: 800 800 0 */ > - { 0x80E79FFF, 0x00030002, 0x0 },/* 7: 800 1000 2 */ > - { 0x00FFFFFF, 0x00140005, 0x0 },/* 8: 850 850 0 */ > - { 0x00FFFFFF, 0x000C0004, 0x0 },/* 9: 900 900 0 */ > - { 0x00FFFFFF, 0x001C0003, 0x0 },/* 10: 950 950 0 */ > - { 0x80FFFFFF, 0x00030002, 0x0 },/* 11: 1000 1000 0 */ > +static const union intel_ddi_buf_trans_entry hsw_ddi_translations_hdmi[] = { > + /* Idx NT mV d T mV d db */ > + { .hsw = { 0x00FFFFFF, 0x0006000E, 0x0 } }, /* 0: 400 400 0 */ > + { .hsw = { 0x00E79FFF, 0x000E000C, 0x0 } }, /* 1: 400 500 2 */ > + { .hsw = { 0x00D75FFF, 0x0005000A, 0x0 } }, /* 2: 400 600 3.5 */ > + { .hsw = { 0x00FFFFFF, 0x0005000A, 0x0 } }, /* 3: 600 600 0 */ > + { .hsw = { 0x00E79FFF, 0x001D0007, 0x0 } }, /* 4: 600 750 2 */ > + { .hsw = { 0x00D75FFF, 0x000C0004, 0x0 } }, /* 5: 600 900 3.5 */ > + { .hsw = { 0x00FFFFFF, 0x00040006, 0x0 } }, /* 6: 800 800 0 */ > + { .hsw = { 0x80E79FFF, 0x00030002, 0x0 } }, /* 7: 800 1000 2 */ > + { .hsw = { 0x00FFFFFF, 0x00140005, 0x0 } }, /* 8: 850 850 0 */ > + { .hsw = { 0x00FFFFFF, 0x000C0004, 0x0 } }, /* 9: 900 900 0 */ > + { .hsw = { 0x00FFFFFF, 0x001C0003, 0x0 } }, /* 10: 950 950 0 */ > + { .hsw = { 0x80FFFFFF, 0x00030002, 0x0 } }, /* 11: 1000 1000 0 */ > }; > > -static const struct hsw_ddi_buf_trans bdw_ddi_translations_edp[] = { > - { 0x00FFFFFF, 0x00000012, 0x0 }, > - { 0x00EBAFFF, 0x00020011, 0x0 }, > - { 0x00C71FFF, 0x0006000F, 0x0 }, > - { 0x00AAAFFF, 0x000E000A, 0x0 }, > - { 0x00FFFFFF, 0x00020011, 0x0 }, > - { 0x00DB6FFF, 0x0005000F, 0x0 }, > - { 0x00BEEFFF, 0x000A000C, 0x0 }, > - { 0x00FFFFFF, 0x0005000F, 0x0 }, > - { 0x00DB6FFF, 0x000A000C, 0x0 }, > +static const union intel_ddi_buf_trans_entry bdw_ddi_translations_edp[] = { > + { .hsw = { 0x00FFFFFF, 0x00000012, 0x0 } }, > + { .hsw = { 0x00EBAFFF, 0x00020011, 0x0 } }, > + { .hsw = { 0x00C71FFF, 0x0006000F, 0x0 } }, > + { .hsw = { 0x00AAAFFF, 0x000E000A, 0x0 } }, > + { .hsw = { 0x00FFFFFF, 0x00020011, 0x0 } }, > + { .hsw = { 0x00DB6FFF, 0x0005000F, 0x0 } }, > + { .hsw = { 0x00BEEFFF, 0x000A000C, 0x0 } }, > + { .hsw = { 0x00FFFFFF, 0x0005000F, 0x0 } }, > + { .hsw = { 0x00DB6FFF, 0x000A000C, 0x0 } }, > }; > > -static const struct hsw_ddi_buf_trans bdw_ddi_translations_dp[] = { > - { 0x00FFFFFF, 0x0007000E, 0x0 }, > - { 0x00D75FFF, 0x000E000A, 0x0 }, > - { 0x00BEFFFF, 0x00140006, 0x0 }, > - { 0x80B2CFFF, 0x001B0002, 0x0 }, > - { 0x00FFFFFF, 0x000E000A, 0x0 }, > - { 0x00DB6FFF, 0x00160005, 0x0 }, > - { 0x80C71FFF, 0x001A0002, 0x0 }, > - { 0x00F7DFFF, 0x00180004, 0x0 }, > - { 0x80D75FFF, 0x001B0002, 0x0 }, > +static const union intel_ddi_buf_trans_entry bdw_ddi_translations_dp[] = { > + { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, > + { .hsw = { 0x00D75FFF, 0x000E000A, 0x0 } }, > + { .hsw = { 0x00BEFFFF, 0x00140006, 0x0 } }, > + { .hsw = { 0x80B2CFFF, 0x001B0002, 0x0 } }, > + { .hsw = { 0x00FFFFFF, 0x000E000A, 0x0 } }, > + { .hsw = { 0x00DB6FFF, 0x00160005, 0x0 } }, > + { .hsw = { 0x80C71FFF, 0x001A0002, 0x0 } }, > + { .hsw = { 0x00F7DFFF, 0x00180004, 0x0 } }, > + { .hsw = { 0x80D75FFF, 0x001B0002, 0x0 } }, > }; > > -static const struct hsw_ddi_buf_trans bdw_ddi_translations_fdi[] = { > - { 0x00FFFFFF, 0x0001000E, 0x0 }, > - { 0x00D75FFF, 0x0004000A, 0x0 }, > - { 0x00C30FFF, 0x00070006, 0x0 }, > - { 0x00AAAFFF, 0x000C0000, 0x0 }, > - { 0x00FFFFFF, 0x0004000A, 0x0 }, > - { 0x00D75FFF, 0x00090004, 0x0 }, > - { 0x00C30FFF, 0x000C0000, 0x0 }, > - { 0x00FFFFFF, 0x00070006, 0x0 }, > - { 0x00D75FFF, 0x000C0000, 0x0 }, > +static const union intel_ddi_buf_trans_entry bdw_ddi_translations_fdi[] = { > + { .hsw = { 0x00FFFFFF, 0x0001000E, 0x0 } }, > + { .hsw = { 0x00D75FFF, 0x0004000A, 0x0 } }, > + { .hsw = { 0x00C30FFF, 0x00070006, 0x0 } }, > + { .hsw = { 0x00AAAFFF, 0x000C0000, 0x0 } }, > + { .hsw = { 0x00FFFFFF, 0x0004000A, 0x0 } }, > + { .hsw = { 0x00D75FFF, 0x00090004, 0x0 } }, > + { .hsw = { 0x00C30FFF, 0x000C0000, 0x0 } }, > + { .hsw = { 0x00FFFFFF, 0x00070006, 0x0 } }, > + { .hsw = { 0x00D75FFF, 0x000C0000, 0x0 } }, > }; > > -static const struct hsw_ddi_buf_trans bdw_ddi_translations_hdmi[] = { > - /* Idx NT mV d T mV df db */ > - { 0x00FFFFFF, 0x0007000E, 0x0 },/* 0: 400 400 0 */ > - { 0x00D75FFF, 0x000E000A, 0x0 },/* 1: 400 600 3.5 */ > - { 0x00BEFFFF, 0x00140006, 0x0 },/* 2: 400 800 6 */ > - { 0x00FFFFFF, 0x0009000D, 0x0 },/* 3: 450 450 0 */ > - { 0x00FFFFFF, 0x000E000A, 0x0 },/* 4: 600 600 0 */ > - { 0x00D7FFFF, 0x00140006, 0x0 },/* 5: 600 800 2.5 */ > - { 0x80CB2FFF, 0x001B0002, 0x0 },/* 6: 600 1000 4.5 */ > - { 0x00FFFFFF, 0x00140006, 0x0 },/* 7: 800 800 0 */ > - { 0x80E79FFF, 0x001B0002, 0x0 },/* 8: 800 1000 2 */ > - { 0x80FFFFFF, 0x001B0002, 0x0 },/* 9: 1000 1000 0 */ > +static const union intel_ddi_buf_trans_entry bdw_ddi_translations_hdmi[] = { > + /* Idx NT mV d T mV df db */ > + { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, /* 0: 400 400 0 */ > + { .hsw = { 0x00D75FFF, 0x000E000A, 0x0 } }, /* 1: 400 600 3.5 */ > + { .hsw = { 0x00BEFFFF, 0x00140006, 0x0 } }, /* 2: 400 800 6 */ > + { .hsw = { 0x00FFFFFF, 0x0009000D, 0x0 } }, /* 3: 450 450 0 */ > + { .hsw = { 0x00FFFFFF, 0x000E000A, 0x0 } }, /* 4: 600 600 0 */ > + { .hsw = { 0x00D7FFFF, 0x00140006, 0x0 } }, /* 5: 600 800 2.5 */ > + { .hsw = { 0x80CB2FFF, 0x001B0002, 0x0 } }, /* 6: 600 1000 4.5 */ > + { .hsw = { 0x00FFFFFF, 0x00140006, 0x0 } }, /* 7: 800 800 0 */ > + { .hsw = { 0x80E79FFF, 0x001B0002, 0x0 } }, /* 8: 800 1000 2 */ > + { .hsw = { 0x80FFFFFF, 0x001B0002, 0x0 } }, /* 9: 1000 1000 0 */ > }; > > /* Skylake H and S */ > -static const struct hsw_ddi_buf_trans skl_ddi_translations_dp[] = { > - { 0x00002016, 0x000000A0, 0x0 }, > - { 0x00005012, 0x0000009B, 0x0 }, > - { 0x00007011, 0x00000088, 0x0 }, > - { 0x80009010, 0x000000C0, 0x1 }, > - { 0x00002016, 0x0000009B, 0x0 }, > - { 0x00005012, 0x00000088, 0x0 }, > - { 0x80007011, 0x000000C0, 0x1 }, > - { 0x00002016, 0x000000DF, 0x0 }, > - { 0x80005012, 0x000000C0, 0x1 }, > +static const union intel_ddi_buf_trans_entry skl_ddi_translations_dp[] = { > + { .hsw = { 0x00002016, 0x000000A0, 0x0 } }, > + { .hsw = { 0x00005012, 0x0000009B, 0x0 } }, > + { .hsw = { 0x00007011, 0x00000088, 0x0 } }, > + { .hsw = { 0x80009010, 0x000000C0, 0x1 } }, > + { .hsw = { 0x00002016, 0x0000009B, 0x0 } }, > + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, > + { .hsw = { 0x80007011, 0x000000C0, 0x1 } }, > + { .hsw = { 0x00002016, 0x000000DF, 0x0 } }, > + { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, > }; > > /* Skylake U */ > -static const struct hsw_ddi_buf_trans skl_u_ddi_translations_dp[] = { > - { 0x0000201B, 0x000000A2, 0x0 }, > - { 0x00005012, 0x00000088, 0x0 }, > - { 0x80007011, 0x000000CD, 0x1 }, > - { 0x80009010, 0x000000C0, 0x1 }, > - { 0x0000201B, 0x0000009D, 0x0 }, > - { 0x80005012, 0x000000C0, 0x1 }, > - { 0x80007011, 0x000000C0, 0x1 }, > - { 0x00002016, 0x00000088, 0x0 }, > - { 0x80005012, 0x000000C0, 0x1 }, > +static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_dp[] = { > + { .hsw = { 0x0000201B, 0x000000A2, 0x0 } }, > + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, > + { .hsw = { 0x80007011, 0x000000CD, 0x1 } }, > + { .hsw = { 0x80009010, 0x000000C0, 0x1 } }, > + { .hsw = { 0x0000201B, 0x0000009D, 0x0 } }, > + { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, > + { .hsw = { 0x80007011, 0x000000C0, 0x1 } }, > + { .hsw = { 0x00002016, 0x00000088, 0x0 } }, > + { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, > }; > > /* Skylake Y */ > -static const struct hsw_ddi_buf_trans skl_y_ddi_translations_dp[] = { > - { 0x00000018, 0x000000A2, 0x0 }, > - { 0x00005012, 0x00000088, 0x0 }, > - { 0x80007011, 0x000000CD, 0x3 }, > - { 0x80009010, 0x000000C0, 0x3 }, > - { 0x00000018, 0x0000009D, 0x0 }, > - { 0x80005012, 0x000000C0, 0x3 }, > - { 0x80007011, 0x000000C0, 0x3 }, > - { 0x00000018, 0x00000088, 0x0 }, > - { 0x80005012, 0x000000C0, 0x3 }, > +static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_dp[] = { > + { .hsw = { 0x00000018, 0x000000A2, 0x0 } }, > + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, > + { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, > + { .hsw = { 0x80009010, 0x000000C0, 0x3 } }, > + { .hsw = { 0x00000018, 0x0000009D, 0x0 } }, > + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, > + { .hsw = { 0x80007011, 0x000000C0, 0x3 } }, > + { .hsw = { 0x00000018, 0x00000088, 0x0 } }, > + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, > }; > > /* Kabylake H and S */ > -static const struct hsw_ddi_buf_trans kbl_ddi_translations_dp[] = { > - { 0x00002016, 0x000000A0, 0x0 }, > - { 0x00005012, 0x0000009B, 0x0 }, > - { 0x00007011, 0x00000088, 0x0 }, > - { 0x80009010, 0x000000C0, 0x1 }, > - { 0x00002016, 0x0000009B, 0x0 }, > - { 0x00005012, 0x00000088, 0x0 }, > - { 0x80007011, 0x000000C0, 0x1 }, > - { 0x00002016, 0x00000097, 0x0 }, > - { 0x80005012, 0x000000C0, 0x1 }, > +static const union intel_ddi_buf_trans_entry kbl_ddi_translations_dp[] = { > + { .hsw = { 0x00002016, 0x000000A0, 0x0 } }, > + { .hsw = { 0x00005012, 0x0000009B, 0x0 } }, > + { .hsw = { 0x00007011, 0x00000088, 0x0 } }, > + { .hsw = { 0x80009010, 0x000000C0, 0x1 } }, > + { .hsw = { 0x00002016, 0x0000009B, 0x0 } }, > + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, > + { .hsw = { 0x80007011, 0x000000C0, 0x1 } }, > + { .hsw = { 0x00002016, 0x00000097, 0x0 } }, > + { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, > }; > > /* Kabylake U */ > -static const struct hsw_ddi_buf_trans kbl_u_ddi_translations_dp[] = { > - { 0x0000201B, 0x000000A1, 0x0 }, > - { 0x00005012, 0x00000088, 0x0 }, > - { 0x80007011, 0x000000CD, 0x3 }, > - { 0x80009010, 0x000000C0, 0x3 }, > - { 0x0000201B, 0x0000009D, 0x0 }, > - { 0x80005012, 0x000000C0, 0x3 }, > - { 0x80007011, 0x000000C0, 0x3 }, > - { 0x00002016, 0x0000004F, 0x0 }, > - { 0x80005012, 0x000000C0, 0x3 }, > +static const union intel_ddi_buf_trans_entry kbl_u_ddi_translations_dp[] = { > + { .hsw = { 0x0000201B, 0x000000A1, 0x0 } }, > + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, > + { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, > + { .hsw = { 0x80009010, 0x000000C0, 0x3 } }, > + { .hsw = { 0x0000201B, 0x0000009D, 0x0 } }, > + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, > + { .hsw = { 0x80007011, 0x000000C0, 0x3 } }, > + { .hsw = { 0x00002016, 0x0000004F, 0x0 } }, > + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, > }; > > /* Kabylake Y */ > -static const struct hsw_ddi_buf_trans kbl_y_ddi_translations_dp[] = { > - { 0x00001017, 0x000000A1, 0x0 }, > - { 0x00005012, 0x00000088, 0x0 }, > - { 0x80007011, 0x000000CD, 0x3 }, > - { 0x8000800F, 0x000000C0, 0x3 }, > - { 0x00001017, 0x0000009D, 0x0 }, > - { 0x80005012, 0x000000C0, 0x3 }, > - { 0x80007011, 0x000000C0, 0x3 }, > - { 0x00001017, 0x0000004C, 0x0 }, > - { 0x80005012, 0x000000C0, 0x3 }, > +static const union intel_ddi_buf_trans_entry kbl_y_ddi_translations_dp[] = { > + { .hsw = { 0x00001017, 0x000000A1, 0x0 } }, > + { .hsw = { 0x00005012, 0x00000088, 0x0 } }, > + { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, > + { .hsw = { 0x8000800F, 0x000000C0, 0x3 } }, > + { .hsw = { 0x00001017, 0x0000009D, 0x0 } }, > + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, > + { .hsw = { 0x80007011, 0x000000C0, 0x3 } }, > + { .hsw = { 0x00001017, 0x0000004C, 0x0 } }, > + { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, > }; > > /* > * Skylake/Kabylake H and S > * eDP 1.4 low vswing translation parameters > */ > -static const struct hsw_ddi_buf_trans skl_ddi_translations_edp[] = { > - { 0x00000018, 0x000000A8, 0x0 }, > - { 0x00004013, 0x000000A9, 0x0 }, > - { 0x00007011, 0x000000A2, 0x0 }, > - { 0x00009010, 0x0000009C, 0x0 }, > - { 0x00000018, 0x000000A9, 0x0 }, > - { 0x00006013, 0x000000A2, 0x0 }, > - { 0x00007011, 0x000000A6, 0x0 }, > - { 0x00000018, 0x000000AB, 0x0 }, > - { 0x00007013, 0x0000009F, 0x0 }, > - { 0x00000018, 0x000000DF, 0x0 }, > +static const union intel_ddi_buf_trans_entry skl_ddi_translations_edp[] = { > + { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, > + { .hsw = { 0x00004013, 0x000000A9, 0x0 } }, > + { .hsw = { 0x00007011, 0x000000A2, 0x0 } }, > + { .hsw = { 0x00009010, 0x0000009C, 0x0 } }, > + { .hsw = { 0x00000018, 0x000000A9, 0x0 } }, > + { .hsw = { 0x00006013, 0x000000A2, 0x0 } }, > + { .hsw = { 0x00007011, 0x000000A6, 0x0 } }, > + { .hsw = { 0x00000018, 0x000000AB, 0x0 } }, > + { .hsw = { 0x00007013, 0x0000009F, 0x0 } }, > + { .hsw = { 0x00000018, 0x000000DF, 0x0 } }, > }; > > /* > * Skylake/Kabylake U > * eDP 1.4 low vswing translation parameters > */ > -static const struct hsw_ddi_buf_trans skl_u_ddi_translations_edp[] = { > - { 0x00000018, 0x000000A8, 0x0 }, > - { 0x00004013, 0x000000A9, 0x0 }, > - { 0x00007011, 0x000000A2, 0x0 }, > - { 0x00009010, 0x0000009C, 0x0 }, > - { 0x00000018, 0x000000A9, 0x0 }, > - { 0x00006013, 0x000000A2, 0x0 }, > - { 0x00007011, 0x000000A6, 0x0 }, > - { 0x00002016, 0x000000AB, 0x0 }, > - { 0x00005013, 0x0000009F, 0x0 }, > - { 0x00000018, 0x000000DF, 0x0 }, > +static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_edp[] = { > + { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, > + { .hsw = { 0x00004013, 0x000000A9, 0x0 } }, > + { .hsw = { 0x00007011, 0x000000A2, 0x0 } }, > + { .hsw = { 0x00009010, 0x0000009C, 0x0 } }, > + { .hsw = { 0x00000018, 0x000000A9, 0x0 } }, > + { .hsw = { 0x00006013, 0x000000A2, 0x0 } }, > + { .hsw = { 0x00007011, 0x000000A6, 0x0 } }, > + { .hsw = { 0x00002016, 0x000000AB, 0x0 } }, > + { .hsw = { 0x00005013, 0x0000009F, 0x0 } }, > + { .hsw = { 0x00000018, 0x000000DF, 0x0 } }, > }; > > /* > * Skylake/Kabylake Y > * eDP 1.4 low vswing translation parameters > */ > -static const struct hsw_ddi_buf_trans skl_y_ddi_translations_edp[] = { > - { 0x00000018, 0x000000A8, 0x0 }, > - { 0x00004013, 0x000000AB, 0x0 }, > - { 0x00007011, 0x000000A4, 0x0 }, > - { 0x00009010, 0x000000DF, 0x0 }, > - { 0x00000018, 0x000000AA, 0x0 }, > - { 0x00006013, 0x000000A4, 0x0 }, > - { 0x00007011, 0x0000009D, 0x0 }, > - { 0x00000018, 0x000000A0, 0x0 }, > - { 0x00006012, 0x000000DF, 0x0 }, > - { 0x00000018, 0x0000008A, 0x0 }, > +static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_edp[] = { > + { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, > + { .hsw = { 0x00004013, 0x000000AB, 0x0 } }, > + { .hsw = { 0x00007011, 0x000000A4, 0x0 } }, > + { .hsw = { 0x00009010, 0x000000DF, 0x0 } }, > + { .hsw = { 0x00000018, 0x000000AA, 0x0 } }, > + { .hsw = { 0x00006013, 0x000000A4, 0x0 } }, > + { .hsw = { 0x00007011, 0x0000009D, 0x0 } }, > + { .hsw = { 0x00000018, 0x000000A0, 0x0 } }, > + { .hsw = { 0x00006012, 0x000000DF, 0x0 } }, > + { .hsw = { 0x00000018, 0x0000008A, 0x0 } }, > }; > > /* Skylake/Kabylake U, H and S */ > -static const struct hsw_ddi_buf_trans skl_ddi_translations_hdmi[] = { > - { 0x00000018, 0x000000AC, 0x0 }, > - { 0x00005012, 0x0000009D, 0x0 }, > - { 0x00007011, 0x00000088, 0x0 }, > - { 0x00000018, 0x000000A1, 0x0 }, > - { 0x00000018, 0x00000098, 0x0 }, > - { 0x00004013, 0x00000088, 0x0 }, > - { 0x80006012, 0x000000CD, 0x1 }, > - { 0x00000018, 0x000000DF, 0x0 }, > - { 0x80003015, 0x000000CD, 0x1 }, /* Default */ > - { 0x80003015, 0x000000C0, 0x1 }, > - { 0x80000018, 0x000000C0, 0x1 }, > +static const union intel_ddi_buf_trans_entry skl_ddi_translations_hdmi[] = { > + { .hsw = { 0x00000018, 0x000000AC, 0x0 } }, > + { .hsw = { 0x00005012, 0x0000009D, 0x0 } }, > + { .hsw = { 0x00007011, 0x00000088, 0x0 } }, > + { .hsw = { 0x00000018, 0x000000A1, 0x0 } }, > + { .hsw = { 0x00000018, 0x00000098, 0x0 } }, > + { .hsw = { 0x00004013, 0x00000088, 0x0 } }, > + { .hsw = { 0x80006012, 0x000000CD, 0x1 } }, > + { .hsw = { 0x00000018, 0x000000DF, 0x0 } }, > + { .hsw = { 0x80003015, 0x000000CD, 0x1 } }, /* Default */ > + { .hsw = { 0x80003015, 0x000000C0, 0x1 } }, > + { .hsw = { 0x80000018, 0x000000C0, 0x1 } }, > }; > > /* Skylake/Kabylake Y */ > -static const struct hsw_ddi_buf_trans skl_y_ddi_translations_hdmi[] = { > - { 0x00000018, 0x000000A1, 0x0 }, > - { 0x00005012, 0x000000DF, 0x0 }, > - { 0x80007011, 0x000000CB, 0x3 }, > - { 0x00000018, 0x000000A4, 0x0 }, > - { 0x00000018, 0x0000009D, 0x0 }, > - { 0x00004013, 0x00000080, 0x0 }, > - { 0x80006013, 0x000000C0, 0x3 }, > - { 0x00000018, 0x0000008A, 0x0 }, > - { 0x80003015, 0x000000C0, 0x3 }, /* Default */ > - { 0x80003015, 0x000000C0, 0x3 }, > - { 0x80000018, 0x000000C0, 0x3 }, > +static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_hdmi[] = { > + { .hsw = { 0x00000018, 0x000000A1, 0x0 } }, > + { .hsw = { 0x00005012, 0x000000DF, 0x0 } }, > + { .hsw = { 0x80007011, 0x000000CB, 0x3 } }, > + { .hsw = { 0x00000018, 0x000000A4, 0x0 } }, > + { .hsw = { 0x00000018, 0x0000009D, 0x0 } }, > + { .hsw = { 0x00004013, 0x00000080, 0x0 } }, > + { .hsw = { 0x80006013, 0x000000C0, 0x3 } }, > + { .hsw = { 0x00000018, 0x0000008A, 0x0 } }, > + { .hsw = { 0x80003015, 0x000000C0, 0x3 } }, /* Default */ > + { .hsw = { 0x80003015, 0x000000C0, 0x3 } }, > + { .hsw = { 0x80000018, 0x000000C0, 0x3 } }, > }; > > -static const struct bxt_ddi_buf_trans bxt_ddi_translations_dp[] = { > - /* Idx NT mV diff db */ > - { 52, 0x9A, 0, 128, }, /* 0: 400 0 */ > - { 78, 0x9A, 0, 85, }, /* 1: 400 3.5 */ > - { 104, 0x9A, 0, 64, }, /* 2: 400 6 */ > - { 154, 0x9A, 0, 43, }, /* 3: 400 9.5 */ > - { 77, 0x9A, 0, 128, }, /* 4: 600 0 */ > - { 116, 0x9A, 0, 85, }, /* 5: 600 3.5 */ > - { 154, 0x9A, 0, 64, }, /* 6: 600 6 */ > - { 102, 0x9A, 0, 128, }, /* 7: 800 0 */ > - { 154, 0x9A, 0, 85, }, /* 8: 800 3.5 */ > - { 154, 0x9A, 1, 128, }, /* 9: 1200 0 */ > +static const union intel_ddi_buf_trans_entry bxt_ddi_translations_dp[] = { > + /* Idx NT mV diff db */ > + { .bxt = { 52, 0x9A, 0, 128, } }, /* 0: 400 0 */ > + { .bxt = { 78, 0x9A, 0, 85, } }, /* 1: 400 3.5 */ > + { .bxt = { 104, 0x9A, 0, 64, } }, /* 2: 400 6 */ > + { .bxt = { 154, 0x9A, 0, 43, } }, /* 3: 400 9.5 */ > + { .bxt = { 77, 0x9A, 0, 128, } }, /* 4: 600 0 */ > + { .bxt = { 116, 0x9A, 0, 85, } }, /* 5: 600 3.5 */ > + { .bxt = { 154, 0x9A, 0, 64, } }, /* 6: 600 6 */ > + { .bxt = { 102, 0x9A, 0, 128, } }, /* 7: 800 0 */ > + { .bxt = { 154, 0x9A, 0, 85, } }, /* 8: 800 3.5 */ > + { .bxt = { 154, 0x9A, 1, 128, } }, /* 9: 1200 0 */ > }; > > -static const struct bxt_ddi_buf_trans bxt_ddi_translations_edp[] = { > +static const union intel_ddi_buf_trans_entry bxt_ddi_translations_edp[] = { > /* Idx NT mV diff db */ > - { 26, 0, 0, 128, }, /* 0: 200 0 */ > - { 38, 0, 0, 112, }, /* 1: 200 1.5 */ > - { 48, 0, 0, 96, }, /* 2: 200 4 */ > - { 54, 0, 0, 69, }, /* 3: 200 6 */ > - { 32, 0, 0, 128, }, /* 4: 250 0 */ > - { 48, 0, 0, 104, }, /* 5: 250 1.5 */ > - { 54, 0, 0, 85, }, /* 6: 250 4 */ > - { 43, 0, 0, 128, }, /* 7: 300 0 */ > - { 54, 0, 0, 101, }, /* 8: 300 1.5 */ > - { 48, 0, 0, 128, }, /* 9: 300 0 */ > + { .bxt = { 26, 0, 0, 128, } }, /* 0: 200 0 */ > + { .bxt = { 38, 0, 0, 112, } }, /* 1: 200 1.5 */ > + { .bxt = { 48, 0, 0, 96, } }, /* 2: 200 4 */ > + { .bxt = { 54, 0, 0, 69, } }, /* 3: 200 6 */ > + { .bxt = { 32, 0, 0, 128, } }, /* 4: 250 0 */ > + { .bxt = { 48, 0, 0, 104, } }, /* 5: 250 1.5 */ > + { .bxt = { 54, 0, 0, 85, } }, /* 6: 250 4 */ > + { .bxt = { 43, 0, 0, 128, } }, /* 7: 300 0 */ > + { .bxt = { 54, 0, 0, 101, } }, /* 8: 300 1.5 */ > + { .bxt = { 48, 0, 0, 128, } }, /* 9: 300 0 */ > }; > > /* BSpec has 2 recommended values - entries 0 and 8. > * Using the entry with higher vswing. > */ > -static const struct bxt_ddi_buf_trans bxt_ddi_translations_hdmi[] = { > - /* Idx NT mV diff db */ > - { 52, 0x9A, 0, 128, }, /* 0: 400 0 */ > - { 52, 0x9A, 0, 85, }, /* 1: 400 3.5 */ > - { 52, 0x9A, 0, 64, }, /* 2: 400 6 */ > - { 42, 0x9A, 0, 43, }, /* 3: 400 9.5 */ > - { 77, 0x9A, 0, 128, }, /* 4: 600 0 */ > - { 77, 0x9A, 0, 85, }, /* 5: 600 3.5 */ > - { 77, 0x9A, 0, 64, }, /* 6: 600 6 */ > - { 102, 0x9A, 0, 128, }, /* 7: 800 0 */ > - { 102, 0x9A, 0, 85, }, /* 8: 800 3.5 */ > - { 154, 0x9A, 1, 128, }, /* 9: 1200 0 */ > +static const union intel_ddi_buf_trans_entry bxt_ddi_translations_hdmi[] = { > + /* Idx NT mV diff db */ > + { .bxt = { 52, 0x9A, 0, 128, } }, /* 0: 400 0 */ > + { .bxt = { 52, 0x9A, 0, 85, } }, /* 1: 400 3.5 */ > + { .bxt = { 52, 0x9A, 0, 64, } }, /* 2: 400 6 */ > + { .bxt = { 42, 0x9A, 0, 43, } }, /* 3: 400 9.5 */ > + { .bxt = { 77, 0x9A, 0, 128, } }, /* 4: 600 0 */ > + { .bxt = { 77, 0x9A, 0, 85, } }, /* 5: 600 3.5 */ > + { .bxt = { 77, 0x9A, 0, 64, } }, /* 6: 600 6 */ > + { .bxt = { 102, 0x9A, 0, 128, } }, /* 7: 800 0 */ > + { .bxt = { 102, 0x9A, 0, 85, } }, /* 8: 800 3.5 */ > + { .bxt = { 154, 0x9A, 1, 128, } }, /* 9: 1200 0 */ > }; > > /* Voltage Swing Programming for VccIO 0.85V for DP */ > -static const struct cnl_ddi_buf_trans cnl_ddi_translations_dp_0_85V[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x5D, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x6A, 0x38, 0x00, 0x07 }, /* 350 500 3.1 */ > - { 0xB, 0x7A, 0x32, 0x00, 0x0D }, /* 350 700 6.0 */ > - { 0x6, 0x7C, 0x2D, 0x00, 0x12 }, /* 350 900 8.2 */ > - { 0xA, 0x69, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xB, 0x7A, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */ > - { 0x6, 0x7C, 0x30, 0x00, 0x0F }, /* 500 900 5.1 */ > - { 0xB, 0x7D, 0x3C, 0x00, 0x03 }, /* 650 725 0.9 */ > - { 0x6, 0x7C, 0x34, 0x00, 0x0B }, /* 600 900 3.5 */ > - { 0x6, 0x7B, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ > +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_85V[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x5D, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x6A, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ > + { .cnl = { 0xB, 0x7A, 0x32, 0x00, 0x0D } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7C, 0x2D, 0x00, 0x12 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x69, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xB, 0x7A, 0x36, 0x00, 0x09 } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7C, 0x30, 0x00, 0x0F } }, /* 500 900 5.1 */ > + { .cnl = { 0xB, 0x7D, 0x3C, 0x00, 0x03 } }, /* 650 725 0.9 */ > + { .cnl = { 0x6, 0x7C, 0x34, 0x00, 0x0B } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7B, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > /* Voltage Swing Programming for VccIO 0.85V for HDMI */ > -static const struct cnl_ddi_buf_trans cnl_ddi_translations_hdmi_0_85V[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x60, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */ > - { 0xB, 0x73, 0x36, 0x00, 0x09 }, /* 450 650 3.2 */ > - { 0x6, 0x7F, 0x31, 0x00, 0x0E }, /* 450 850 5.5 */ > - { 0xB, 0x73, 0x3F, 0x00, 0x00 }, /* 650 650 0.0 */ > - { 0x6, 0x7F, 0x37, 0x00, 0x08 }, /* 650 850 2.3 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 850 850 0.0 */ > - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */ > +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_85V[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x60, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ > + { .cnl = { 0xB, 0x73, 0x36, 0x00, 0x09 } }, /* 450 650 3.2 */ > + { .cnl = { 0x6, 0x7F, 0x31, 0x00, 0x0E } }, /* 450 850 5.5 */ > + { .cnl = { 0xB, 0x73, 0x3F, 0x00, 0x00 } }, /* 650 650 0.0 */ > + { .cnl = { 0x6, 0x7F, 0x37, 0x00, 0x08 } }, /* 650 850 2.3 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 850 850 0.0 */ > + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ > }; > > /* Voltage Swing Programming for VccIO 0.85V for eDP */ > -static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_0_85V[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x66, 0x3A, 0x00, 0x05 }, /* 384 500 2.3 */ > - { 0x0, 0x7F, 0x38, 0x00, 0x07 }, /* 153 200 2.3 */ > - { 0x8, 0x7F, 0x38, 0x00, 0x07 }, /* 192 250 2.3 */ > - { 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 230 300 2.3 */ > - { 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 269 350 2.3 */ > - { 0xA, 0x66, 0x3C, 0x00, 0x03 }, /* 446 500 1.0 */ > - { 0xB, 0x70, 0x3C, 0x00, 0x03 }, /* 460 600 2.3 */ > - { 0xC, 0x75, 0x3C, 0x00, 0x03 }, /* 537 700 2.3 */ > - { 0x2, 0x7F, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ > +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_85V[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x66, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ > + { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ > + { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 192 250 2.3 */ > + { .cnl = { 0x1, 0x7F, 0x38, 0x00, 0x07 } }, /* 230 300 2.3 */ > + { .cnl = { 0x9, 0x7F, 0x38, 0x00, 0x07 } }, /* 269 350 2.3 */ > + { .cnl = { 0xA, 0x66, 0x3C, 0x00, 0x03 } }, /* 446 500 1.0 */ > + { .cnl = { 0xB, 0x70, 0x3C, 0x00, 0x03 } }, /* 460 600 2.3 */ > + { .cnl = { 0xC, 0x75, 0x3C, 0x00, 0x03 } }, /* 537 700 2.3 */ > + { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > }; > > /* Voltage Swing Programming for VccIO 0.95V for DP */ > -static const struct cnl_ddi_buf_trans cnl_ddi_translations_dp_0_95V[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x5D, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x6A, 0x38, 0x00, 0x07 }, /* 350 500 3.1 */ > - { 0xB, 0x7A, 0x32, 0x00, 0x0D }, /* 350 700 6.0 */ > - { 0x6, 0x7C, 0x2D, 0x00, 0x12 }, /* 350 900 8.2 */ > - { 0xA, 0x69, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xB, 0x7A, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */ > - { 0x6, 0x7C, 0x30, 0x00, 0x0F }, /* 500 900 5.1 */ > - { 0xB, 0x7D, 0x3C, 0x00, 0x03 }, /* 650 725 0.9 */ > - { 0x6, 0x7C, 0x34, 0x00, 0x0B }, /* 600 900 3.5 */ > - { 0x6, 0x7B, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ > +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_95V[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x5D, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x6A, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ > + { .cnl = { 0xB, 0x7A, 0x32, 0x00, 0x0D } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7C, 0x2D, 0x00, 0x12 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x69, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xB, 0x7A, 0x36, 0x00, 0x09 } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7C, 0x30, 0x00, 0x0F } }, /* 500 900 5.1 */ > + { .cnl = { 0xB, 0x7D, 0x3C, 0x00, 0x03 } }, /* 650 725 0.9 */ > + { .cnl = { 0x6, 0x7C, 0x34, 0x00, 0x0B } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7B, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > /* Voltage Swing Programming for VccIO 0.95V for HDMI */ > -static const struct cnl_ddi_buf_trans cnl_ddi_translations_hdmi_0_95V[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x5C, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ > - { 0xB, 0x69, 0x37, 0x00, 0x08 }, /* 400 600 3.5 */ > - { 0x5, 0x76, 0x31, 0x00, 0x0E }, /* 400 800 6.0 */ > - { 0xA, 0x5E, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */ > - { 0xB, 0x69, 0x3F, 0x00, 0x00 }, /* 600 600 0.0 */ > - { 0xB, 0x79, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */ > - { 0x6, 0x7D, 0x32, 0x00, 0x0D }, /* 600 1000 4.4 */ > - { 0x5, 0x76, 0x3F, 0x00, 0x00 }, /* 800 800 0.0 */ > - { 0x6, 0x7D, 0x39, 0x00, 0x06 }, /* 800 1000 1.9 */ > - { 0x6, 0x7F, 0x39, 0x00, 0x06 }, /* 850 1050 1.8 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1050 1050 0.0 */ > +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_95V[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x5C, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > + { .cnl = { 0xB, 0x69, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ > + { .cnl = { 0x5, 0x76, 0x31, 0x00, 0x0E } }, /* 400 800 6.0 */ > + { .cnl = { 0xA, 0x5E, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ > + { .cnl = { 0xB, 0x69, 0x3F, 0x00, 0x00 } }, /* 600 600 0.0 */ > + { .cnl = { 0xB, 0x79, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ > + { .cnl = { 0x6, 0x7D, 0x32, 0x00, 0x0D } }, /* 600 1000 4.4 */ > + { .cnl = { 0x5, 0x76, 0x3F, 0x00, 0x00 } }, /* 800 800 0.0 */ > + { .cnl = { 0x6, 0x7D, 0x39, 0x00, 0x06 } }, /* 800 1000 1.9 */ > + { .cnl = { 0x6, 0x7F, 0x39, 0x00, 0x06 } }, /* 850 1050 1.8 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ > }; > > /* Voltage Swing Programming for VccIO 0.95V for eDP */ > -static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_0_95V[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x61, 0x3A, 0x00, 0x05 }, /* 384 500 2.3 */ > - { 0x0, 0x7F, 0x38, 0x00, 0x07 }, /* 153 200 2.3 */ > - { 0x8, 0x7F, 0x38, 0x00, 0x07 }, /* 192 250 2.3 */ > - { 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 230 300 2.3 */ > - { 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 269 350 2.3 */ > - { 0xA, 0x61, 0x3C, 0x00, 0x03 }, /* 446 500 1.0 */ > - { 0xB, 0x68, 0x39, 0x00, 0x06 }, /* 460 600 2.3 */ > - { 0xC, 0x6E, 0x39, 0x00, 0x06 }, /* 537 700 2.3 */ > - { 0x4, 0x7F, 0x3A, 0x00, 0x05 }, /* 460 600 2.3 */ > - { 0x2, 0x7F, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ > +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_95V[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x61, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ > + { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ > + { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 192 250 2.3 */ > + { .cnl = { 0x1, 0x7F, 0x38, 0x00, 0x07 } }, /* 230 300 2.3 */ > + { .cnl = { 0x9, 0x7F, 0x38, 0x00, 0x07 } }, /* 269 350 2.3 */ > + { .cnl = { 0xA, 0x61, 0x3C, 0x00, 0x03 } }, /* 446 500 1.0 */ > + { .cnl = { 0xB, 0x68, 0x39, 0x00, 0x06 } }, /* 460 600 2.3 */ > + { .cnl = { 0xC, 0x6E, 0x39, 0x00, 0x06 } }, /* 537 700 2.3 */ > + { .cnl = { 0x4, 0x7F, 0x3A, 0x00, 0x05 } }, /* 460 600 2.3 */ > + { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > }; > > /* Voltage Swing Programming for VccIO 1.05V for DP */ > -static const struct cnl_ddi_buf_trans cnl_ddi_translations_dp_1_05V[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x58, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ > - { 0xB, 0x64, 0x37, 0x00, 0x08 }, /* 400 600 3.5 */ > - { 0x5, 0x70, 0x31, 0x00, 0x0E }, /* 400 800 6.0 */ > - { 0x6, 0x7F, 0x2C, 0x00, 0x13 }, /* 400 1050 8.4 */ > - { 0xB, 0x64, 0x3F, 0x00, 0x00 }, /* 600 600 0.0 */ > - { 0x5, 0x73, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */ > - { 0x6, 0x7F, 0x30, 0x00, 0x0F }, /* 550 1050 5.6 */ > - { 0x5, 0x76, 0x3E, 0x00, 0x01 }, /* 850 900 0.5 */ > - { 0x6, 0x7F, 0x36, 0x00, 0x09 }, /* 750 1050 2.9 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1050 1050 0.0 */ > +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_1_05V[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x58, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > + { .cnl = { 0xB, 0x64, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ > + { .cnl = { 0x5, 0x70, 0x31, 0x00, 0x0E } }, /* 400 800 6.0 */ > + { .cnl = { 0x6, 0x7F, 0x2C, 0x00, 0x13 } }, /* 400 1050 8.4 */ > + { .cnl = { 0xB, 0x64, 0x3F, 0x00, 0x00 } }, /* 600 600 0.0 */ > + { .cnl = { 0x5, 0x73, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ > + { .cnl = { 0x6, 0x7F, 0x30, 0x00, 0x0F } }, /* 550 1050 5.6 */ > + { .cnl = { 0x5, 0x76, 0x3E, 0x00, 0x01 } }, /* 850 900 0.5 */ > + { .cnl = { 0x6, 0x7F, 0x36, 0x00, 0x09 } }, /* 750 1050 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ > }; > > /* Voltage Swing Programming for VccIO 1.05V for HDMI */ > -static const struct cnl_ddi_buf_trans cnl_ddi_translations_hdmi_1_05V[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x58, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ > - { 0xB, 0x64, 0x37, 0x00, 0x08 }, /* 400 600 3.5 */ > - { 0x5, 0x70, 0x31, 0x00, 0x0E }, /* 400 800 6.0 */ > - { 0xA, 0x5B, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */ > - { 0xB, 0x64, 0x3F, 0x00, 0x00 }, /* 600 600 0.0 */ > - { 0x5, 0x73, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */ > - { 0x6, 0x7C, 0x32, 0x00, 0x0D }, /* 600 1000 4.4 */ > - { 0x5, 0x70, 0x3F, 0x00, 0x00 }, /* 800 800 0.0 */ > - { 0x6, 0x7C, 0x39, 0x00, 0x06 }, /* 800 1000 1.9 */ > - { 0x6, 0x7F, 0x39, 0x00, 0x06 }, /* 850 1050 1.8 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1050 1050 0.0 */ > +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_1_05V[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x58, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > + { .cnl = { 0xB, 0x64, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ > + { .cnl = { 0x5, 0x70, 0x31, 0x00, 0x0E } }, /* 400 800 6.0 */ > + { .cnl = { 0xA, 0x5B, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ > + { .cnl = { 0xB, 0x64, 0x3F, 0x00, 0x00 } }, /* 600 600 0.0 */ > + { .cnl = { 0x5, 0x73, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ > + { .cnl = { 0x6, 0x7C, 0x32, 0x00, 0x0D } }, /* 600 1000 4.4 */ > + { .cnl = { 0x5, 0x70, 0x3F, 0x00, 0x00 } }, /* 800 800 0.0 */ > + { .cnl = { 0x6, 0x7C, 0x39, 0x00, 0x06 } }, /* 800 1000 1.9 */ > + { .cnl = { 0x6, 0x7F, 0x39, 0x00, 0x06 } }, /* 850 1050 1.8 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ > }; > > /* Voltage Swing Programming for VccIO 1.05V for eDP */ > -static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_1_05V[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x5E, 0x3A, 0x00, 0x05 }, /* 384 500 2.3 */ > - { 0x0, 0x7F, 0x38, 0x00, 0x07 }, /* 153 200 2.3 */ > - { 0x8, 0x7F, 0x38, 0x00, 0x07 }, /* 192 250 2.3 */ > - { 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 230 300 2.3 */ > - { 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 269 350 2.3 */ > - { 0xA, 0x5E, 0x3C, 0x00, 0x03 }, /* 446 500 1.0 */ > - { 0xB, 0x64, 0x39, 0x00, 0x06 }, /* 460 600 2.3 */ > - { 0xE, 0x6A, 0x39, 0x00, 0x06 }, /* 537 700 2.3 */ > - { 0x2, 0x7F, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */ > +static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_1_05V[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x5E, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ > + { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ > + { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 192 250 2.3 */ > + { .cnl = { 0x1, 0x7F, 0x38, 0x00, 0x07 } }, /* 230 300 2.3 */ > + { .cnl = { 0x9, 0x7F, 0x38, 0x00, 0x07 } }, /* 269 350 2.3 */ > + { .cnl = { 0xA, 0x5E, 0x3C, 0x00, 0x03 } }, /* 446 500 1.0 */ > + { .cnl = { 0xB, 0x64, 0x39, 0x00, 0x06 } }, /* 460 600 2.3 */ > + { .cnl = { 0xE, 0x6A, 0x39, 0x00, 0x06 } }, /* 537 700 2.3 */ > + { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > }; > > /* icl_combo_phy_ddi_translations */ > -static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hbr2[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */ > - { 0xC, 0x71, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ > - { 0x6, 0x7F, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */ > - { 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */ > - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ > - { 0xC, 0x6C, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */ > - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ > -}; > - > -static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr2[] = { > - /* NT mV Trans mV db */ > - { 0x0, 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 */ > - { 0x9, 0x7F, 0x31, 0x00, 0x0E }, /* 200 350 4.9 */ > - { 0x8, 0x7F, 0x3F, 0x00, 0x00 }, /* 250 250 0.0 */ > - { 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 250 300 1.6 */ > - { 0x9, 0x7F, 0x35, 0x00, 0x0A }, /* 250 350 2.9 */ > - { 0x1, 0x7F, 0x3F, 0x00, 0x00 }, /* 300 300 0.0 */ > - { 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 300 350 1.3 */ > - { 0x9, 0x7F, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > -}; > - > -static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr3[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */ > - { 0xC, 0x71, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ > - { 0x6, 0x7F, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */ > - { 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */ > - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ > - { 0xC, 0x6C, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */ > - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ > -}; > - > -static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_hdmi[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x60, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */ > - { 0xB, 0x73, 0x36, 0x00, 0x09 }, /* 450 650 3.2 */ > - { 0x6, 0x7F, 0x31, 0x00, 0x0E }, /* 450 850 5.5 */ > - { 0xB, 0x73, 0x3F, 0x00, 0x00 }, /* 650 650 0.0 ALS */ > - { 0x6, 0x7F, 0x37, 0x00, 0x08 }, /* 650 850 2.3 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 850 850 0.0 */ > - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */ > -}; > - > -static const struct cnl_ddi_buf_trans ehl_combo_phy_ddi_translations_dp[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x33, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x47, 0x36, 0x00, 0x09 }, /* 350 500 3.1 */ > - { 0xC, 0x64, 0x34, 0x00, 0x0B }, /* 350 700 6.0 */ > - { 0x6, 0x7F, 0x30, 0x00, 0x0F }, /* 350 900 8.2 */ > - { 0xA, 0x46, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xC, 0x64, 0x38, 0x00, 0x07 }, /* 500 700 2.9 */ > - { 0x6, 0x7F, 0x32, 0x00, 0x0D }, /* 500 900 5.1 */ > - { 0xC, 0x61, 0x3F, 0x00, 0x00 }, /* 650 700 0.6 */ > - { 0x6, 0x7F, 0x38, 0x00, 0x07 }, /* 600 900 3.5 */ > - { 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 */ > -}; > - > -static const struct cnl_ddi_buf_trans dg1_combo_phy_ddi_translations_dp_rbr_hbr[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x32, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x48, 0x35, 0x00, 0x0A }, /* 350 500 3.1 */ > - { 0xC, 0x63, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ > - { 0x6, 0x7F, 0x2C, 0x00, 0x13 }, /* 350 900 8.2 */ > - { 0xA, 0x43, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xC, 0x60, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */ > - { 0x6, 0x7F, 0x30, 0x00, 0x0F }, /* 500 900 5.1 */ > - { 0xC, 0x60, 0x3F, 0x00, 0x00 }, /* 650 700 0.6 */ > - { 0x6, 0x7F, 0x37, 0x00, 0x08 }, /* 600 900 3.5 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ > -}; > - > -static const struct cnl_ddi_buf_trans dg1_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x32, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x48, 0x35, 0x00, 0x0A }, /* 350 500 3.1 */ > - { 0xC, 0x63, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ > - { 0x6, 0x7F, 0x2C, 0x00, 0x13 }, /* 350 900 8.2 */ > - { 0xA, 0x43, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xC, 0x60, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */ > - { 0x6, 0x7F, 0x30, 0x00, 0x0F }, /* 500 900 5.1 */ > - { 0xC, 0x58, 0x3F, 0x00, 0x00 }, /* 650 700 0.6 */ > - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ > -}; > - > -static const struct icl_mg_phy_ddi_buf_trans icl_mg_phy_ddi_translations_rbr_hbr[] = { > - /* Voltage swing pre-emphasis */ > - { 0x18, 0x00, 0x00 }, /* 0 0 */ > - { 0x1D, 0x00, 0x05 }, /* 0 1 */ > - { 0x24, 0x00, 0x0C }, /* 0 2 */ > - { 0x2B, 0x00, 0x14 }, /* 0 3 */ > - { 0x21, 0x00, 0x00 }, /* 1 0 */ > - { 0x2B, 0x00, 0x08 }, /* 1 1 */ > - { 0x30, 0x00, 0x0F }, /* 1 2 */ > - { 0x31, 0x00, 0x03 }, /* 2 0 */ > - { 0x34, 0x00, 0x0B }, /* 2 1 */ > - { 0x3F, 0x00, 0x00 }, /* 3 0 */ > -}; > - > -static const struct icl_mg_phy_ddi_buf_trans icl_mg_phy_ddi_translations_hbr2_hbr3[] = { > - /* Voltage swing pre-emphasis */ > - { 0x18, 0x00, 0x00 }, /* 0 0 */ > - { 0x1D, 0x00, 0x05 }, /* 0 1 */ > - { 0x24, 0x00, 0x0C }, /* 0 2 */ > - { 0x2B, 0x00, 0x14 }, /* 0 3 */ > - { 0x26, 0x00, 0x00 }, /* 1 0 */ > - { 0x2C, 0x00, 0x07 }, /* 1 1 */ > - { 0x33, 0x00, 0x0C }, /* 1 2 */ > - { 0x2E, 0x00, 0x00 }, /* 2 0 */ > - { 0x36, 0x00, 0x09 }, /* 2 1 */ > - { 0x3F, 0x00, 0x00 }, /* 3 0 */ > -}; > - > -static const struct icl_mg_phy_ddi_buf_trans icl_mg_phy_ddi_translations_hdmi[] = { > - /* HDMI Preset VS Pre-emph */ > - { 0x1A, 0x0, 0x0 }, /* 1 400mV 0dB */ > - { 0x20, 0x0, 0x0 }, /* 2 500mV 0dB */ > - { 0x29, 0x0, 0x0 }, /* 3 650mV 0dB */ > - { 0x32, 0x0, 0x0 }, /* 4 800mV 0dB */ > - { 0x3F, 0x0, 0x0 }, /* 5 1000mV 0dB */ > - { 0x3A, 0x0, 0x5 }, /* 6 Full -1.5 dB */ > - { 0x39, 0x0, 0x6 }, /* 7 Full -1.8 dB */ > - { 0x38, 0x0, 0x7 }, /* 8 Full -2 dB */ > - { 0x37, 0x0, 0x8 }, /* 9 Full -2.5 dB */ > - { 0x36, 0x0, 0x9 }, /* 10 Full -3 dB */ > -}; > - > -static const struct tgl_dkl_phy_ddi_buf_trans tgl_dkl_phy_dp_ddi_trans[] = { > - /* VS pre-emp Non-trans mV Pre-emph dB */ > - { 0x7, 0x0, 0x00 }, /* 0 0 400mV 0 dB */ > - { 0x5, 0x0, 0x05 }, /* 0 1 400mV 3.5 dB */ > - { 0x2, 0x0, 0x0B }, /* 0 2 400mV 6 dB */ > - { 0x0, 0x0, 0x18 }, /* 0 3 400mV 9.5 dB */ > - { 0x5, 0x0, 0x00 }, /* 1 0 600mV 0 dB */ > - { 0x2, 0x0, 0x08 }, /* 1 1 600mV 3.5 dB */ > - { 0x0, 0x0, 0x14 }, /* 1 2 600mV 6 dB */ > - { 0x2, 0x0, 0x00 }, /* 2 0 800mV 0 dB */ > - { 0x0, 0x0, 0x0B }, /* 2 1 800mV 3.5 dB */ > - { 0x0, 0x0, 0x00 }, /* 3 0 1200mV 0 dB HDMI default */ > -}; > - > -static const struct tgl_dkl_phy_ddi_buf_trans tgl_dkl_phy_dp_ddi_trans_hbr2[] = { > - /* VS pre-emp Non-trans mV Pre-emph dB */ > - { 0x7, 0x0, 0x00 }, /* 0 0 400mV 0 dB */ > - { 0x5, 0x0, 0x05 }, /* 0 1 400mV 3.5 dB */ > - { 0x2, 0x0, 0x0B }, /* 0 2 400mV 6 dB */ > - { 0x0, 0x0, 0x19 }, /* 0 3 400mV 9.5 dB */ > - { 0x5, 0x0, 0x00 }, /* 1 0 600mV 0 dB */ > - { 0x2, 0x0, 0x08 }, /* 1 1 600mV 3.5 dB */ > - { 0x0, 0x0, 0x14 }, /* 1 2 600mV 6 dB */ > - { 0x2, 0x0, 0x00 }, /* 2 0 800mV 0 dB */ > - { 0x0, 0x0, 0x0B }, /* 2 1 800mV 3.5 dB */ > - { 0x0, 0x0, 0x00 }, /* 3 0 1200mV 0 dB HDMI default */ > -}; > - > -static const struct tgl_dkl_phy_ddi_buf_trans tgl_dkl_phy_hdmi_ddi_trans[] = { > - /* HDMI Preset VS Pre-emph */ > - { 0x7, 0x0, 0x0 }, /* 1 400mV 0dB */ > - { 0x6, 0x0, 0x0 }, /* 2 500mV 0dB */ > - { 0x4, 0x0, 0x0 }, /* 3 650mV 0dB */ > - { 0x2, 0x0, 0x0 }, /* 4 800mV 0dB */ > - { 0x0, 0x0, 0x0 }, /* 5 1000mV 0dB */ > - { 0x0, 0x0, 0x5 }, /* 6 Full -1.5 dB */ > - { 0x0, 0x0, 0x6 }, /* 7 Full -1.8 dB */ > - { 0x0, 0x0, 0x7 }, /* 8 Full -2 dB */ > - { 0x0, 0x0, 0x8 }, /* 9 Full -2.5 dB */ > - { 0x0, 0x0, 0xA }, /* 10 Full -3 dB */ > -}; > - > -static const struct cnl_ddi_buf_trans tgl_combo_phy_ddi_translations_dp_hbr[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x32, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */ > - { 0xC, 0x71, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ > - { 0x6, 0x7D, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */ > - { 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */ > - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ > - { 0xC, 0x6C, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */ > - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ > -}; > - > -static const struct cnl_ddi_buf_trans tgl_combo_phy_ddi_translations_dp_hbr2[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */ > - { 0xC, 0x63, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ > - { 0x6, 0x7F, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */ > - { 0xA, 0x47, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xC, 0x63, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */ > - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ > - { 0xC, 0x61, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */ > - { 0x6, 0x7B, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ > -}; > - > -static const struct cnl_ddi_buf_trans tgl_uy_combo_phy_ddi_translations_dp_hbr2[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x4F, 0x36, 0x00, 0x09 }, /* 350 500 3.1 */ > - { 0xC, 0x60, 0x32, 0x00, 0x0D }, /* 350 700 6.0 */ > - { 0xC, 0x7F, 0x2D, 0x00, 0x12 }, /* 350 900 8.2 */ > - { 0xC, 0x47, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xC, 0x6F, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */ > - { 0x6, 0x7D, 0x32, 0x00, 0x0D }, /* 500 900 5.1 */ > - { 0x6, 0x60, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */ > - { 0x6, 0x7F, 0x34, 0x00, 0x0B }, /* 600 900 3.5 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ > +static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_dp_hbr2[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x71, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x4C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x73, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ > + { .cnl = { 0xC, 0x6C, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_hbr2[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0x0, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ > + { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 200 250 1.9 */ > + { .cnl = { 0x1, 0x7F, 0x33, 0x00, 0x0C } }, /* 200 300 3.5 */ > + { .cnl = { 0x9, 0x7F, 0x31, 0x00, 0x0E } }, /* 200 350 4.9 */ > + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 250 250 0.0 */ > + { .cnl = { 0x1, 0x7F, 0x38, 0x00, 0x07 } }, /* 250 300 1.6 */ > + { .cnl = { 0x9, 0x7F, 0x35, 0x00, 0x0A } }, /* 250 350 2.9 */ > + { .cnl = { 0x1, 0x7F, 0x3F, 0x00, 0x00 } }, /* 300 300 0.0 */ > + { .cnl = { 0x9, 0x7F, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ > + { .cnl = { 0x9, 0x7F, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_hbr3[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x71, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x4C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x73, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ > + { .cnl = { 0xC, 0x6C, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_hdmi[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x60, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ > + { .cnl = { 0xB, 0x73, 0x36, 0x00, 0x09 } }, /* 450 650 3.2 */ > + { .cnl = { 0x6, 0x7F, 0x31, 0x00, 0x0E } }, /* 450 850 5.5 */ > + { .cnl = { 0xB, 0x73, 0x3F, 0x00, 0x00 } }, /* 650 650 0.0 ALS */ > + { .cnl = { 0x6, 0x7F, 0x37, 0x00, 0x08 } }, /* 650 850 2.3 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 850 850 0.0 */ > + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry ehl_combo_phy_ddi_translations_dp[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x33, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x47, 0x36, 0x00, 0x09 } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x64, 0x34, 0x00, 0x0B } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7F, 0x30, 0x00, 0x0F } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x46, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x64, 0x38, 0x00, 0x07 } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x32, 0x00, 0x0D } }, /* 500 900 5.1 */ > + { .cnl = { 0xC, 0x61, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7F, 0x38, 0x00, 0x07 } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_hbr[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ > + { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 200 250 1.9 */ > + { .cnl = { 0x1, 0x7F, 0x33, 0x00, 0x0C } }, /* 200 300 3.5 */ > + { .cnl = { 0xA, 0x35, 0x36, 0x00, 0x09 } }, /* 200 350 4.9 */ > + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 250 250 0.0 */ > + { .cnl = { 0x1, 0x7F, 0x38, 0x00, 0x07 } }, /* 250 300 1.6 */ > + { .cnl = { 0xA, 0x35, 0x35, 0x00, 0x0A } }, /* 250 350 2.9 */ > + { .cnl = { 0x1, 0x7F, 0x3F, 0x00, 0x00 } }, /* 300 300 0.0 */ > + { .cnl = { 0xA, 0x35, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ > + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_hbr2[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ > + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 250 1.9 */ > + { .cnl = { 0x1, 0x7F, 0x3D, 0x00, 0x02 } }, /* 200 300 3.5 */ > + { .cnl = { 0xA, 0x35, 0x38, 0x00, 0x07 } }, /* 200 350 4.9 */ > + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 250 250 0.0 */ > + { .cnl = { 0x1, 0x7F, 0x3F, 0x00, 0x00 } }, /* 250 300 1.6 */ > + { .cnl = { 0xA, 0x35, 0x3A, 0x00, 0x05 } }, /* 250 350 2.9 */ > + { .cnl = { 0x1, 0x7F, 0x3F, 0x00, 0x00 } }, /* 300 300 0.0 */ > + { .cnl = { 0xA, 0x35, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ > + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_rbr_hbr[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x48, 0x35, 0x00, 0x0A } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x63, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7F, 0x2C, 0x00, 0x13 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x43, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x60, 0x36, 0x00, 0x09 } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x30, 0x00, 0x0F } }, /* 500 900 5.1 */ > + { .cnl = { 0xC, 0x60, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7F, 0x37, 0x00, 0x08 } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x48, 0x35, 0x00, 0x0A } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x63, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7F, 0x2C, 0x00, 0x13 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x43, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x60, 0x36, 0x00, 0x09 } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x30, 0x00, 0x0F } }, /* 500 900 5.1 */ > + { .cnl = { 0xC, 0x58, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_rbr_hbr[] = { > + /* Voltage swing pre-emphasis */ > + { .mg = { 0x18, 0x00, 0x00 } }, /* 0 0 */ > + { .mg = { 0x1D, 0x00, 0x05 } }, /* 0 1 */ > + { .mg = { 0x24, 0x00, 0x0C } }, /* 0 2 */ > + { .mg = { 0x2B, 0x00, 0x14 } }, /* 0 3 */ > + { .mg = { 0x21, 0x00, 0x00 } }, /* 1 0 */ > + { .mg = { 0x2B, 0x00, 0x08 } }, /* 1 1 */ > + { .mg = { 0x30, 0x00, 0x0F } }, /* 1 2 */ > + { .mg = { 0x31, 0x00, 0x03 } }, /* 2 0 */ > + { .mg = { 0x34, 0x00, 0x0B } }, /* 2 1 */ > + { .mg = { 0x3F, 0x00, 0x00 } }, /* 3 0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hbr2_hbr3[] = { > + /* Voltage swing pre-emphasis */ > + { .mg = { 0x18, 0x00, 0x00 } }, /* 0 0 */ > + { .mg = { 0x1D, 0x00, 0x05 } }, /* 0 1 */ > + { .mg = { 0x24, 0x00, 0x0C } }, /* 0 2 */ > + { .mg = { 0x2B, 0x00, 0x14 } }, /* 0 3 */ > + { .mg = { 0x26, 0x00, 0x00 } }, /* 1 0 */ > + { .mg = { 0x2C, 0x00, 0x07 } }, /* 1 1 */ > + { .mg = { 0x33, 0x00, 0x0C } }, /* 1 2 */ > + { .mg = { 0x2E, 0x00, 0x00 } }, /* 2 0 */ > + { .mg = { 0x36, 0x00, 0x09 } }, /* 2 1 */ > + { .mg = { 0x3F, 0x00, 0x00 } }, /* 3 0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hdmi[] = { > + /* HDMI Preset VS Pre-emph */ > + { .mg = { 0x1A, 0x0, 0x0 } }, /* 1 400mV 0dB */ > + { .mg = { 0x20, 0x0, 0x0 } }, /* 2 500mV 0dB */ > + { .mg = { 0x29, 0x0, 0x0 } }, /* 3 650mV 0dB */ > + { .mg = { 0x32, 0x0, 0x0 } }, /* 4 800mV 0dB */ > + { .mg = { 0x3F, 0x0, 0x0 } }, /* 5 1000mV 0dB */ > + { .mg = { 0x3A, 0x0, 0x5 } }, /* 6 Full -1.5 dB */ > + { .mg = { 0x39, 0x0, 0x6 } }, /* 7 Full -1.8 dB */ > + { .mg = { 0x38, 0x0, 0x7 } }, /* 8 Full -2 dB */ > + { .mg = { 0x37, 0x0, 0x8 } }, /* 9 Full -2.5 dB */ > + { .mg = { 0x36, 0x0, 0x9 } }, /* 10 Full -3 dB */ > +}; > + > +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans[] = { > + /* VS pre-emp Non-trans mV Pre-emph dB */ > + { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ > + { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ > + { .dkl = { 0x2, 0x0, 0x0B } }, /* 0 2 400mV 6 dB */ > + { .dkl = { 0x0, 0x0, 0x18 } }, /* 0 3 400mV 9.5 dB */ > + { .dkl = { 0x5, 0x0, 0x00 } }, /* 1 0 600mV 0 dB */ > + { .dkl = { 0x2, 0x0, 0x08 } }, /* 1 1 600mV 3.5 dB */ > + { .dkl = { 0x0, 0x0, 0x14 } }, /* 1 2 600mV 6 dB */ > + { .dkl = { 0x2, 0x0, 0x00 } }, /* 2 0 800mV 0 dB */ > + { .dkl = { 0x0, 0x0, 0x0B } }, /* 2 1 800mV 3.5 dB */ > + { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ > +}; > + > +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans_hbr2[] = { > + /* VS pre-emp Non-trans mV Pre-emph dB */ > + { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ > + { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ > + { .dkl = { 0x2, 0x0, 0x0B } }, /* 0 2 400mV 6 dB */ > + { .dkl = { 0x0, 0x0, 0x19 } }, /* 0 3 400mV 9.5 dB */ > + { .dkl = { 0x5, 0x0, 0x00 } }, /* 1 0 600mV 0 dB */ > + { .dkl = { 0x2, 0x0, 0x08 } }, /* 1 1 600mV 3.5 dB */ > + { .dkl = { 0x0, 0x0, 0x14 } }, /* 1 2 600mV 6 dB */ > + { .dkl = { 0x2, 0x0, 0x00 } }, /* 2 0 800mV 0 dB */ > + { .dkl = { 0x0, 0x0, 0x0B } }, /* 2 1 800mV 3.5 dB */ > + { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ > +}; > + > +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_hdmi_ddi_trans[] = { > + /* HDMI Preset VS Pre-emph */ > + { .dkl = { 0x7, 0x0, 0x0 } }, /* 1 400mV 0dB */ > + { .dkl = { 0x6, 0x0, 0x0 } }, /* 2 500mV 0dB */ > + { .dkl = { 0x4, 0x0, 0x0 } }, /* 3 650mV 0dB */ > + { .dkl = { 0x2, 0x0, 0x0 } }, /* 4 800mV 0dB */ > + { .dkl = { 0x0, 0x0, 0x0 } }, /* 5 1000mV 0dB */ > + { .dkl = { 0x0, 0x0, 0x5 } }, /* 6 Full -1.5 dB */ > + { .dkl = { 0x0, 0x0, 0x6 } }, /* 7 Full -1.8 dB */ > + { .dkl = { 0x0, 0x0, 0x7 } }, /* 8 Full -2 dB */ > + { .dkl = { 0x0, 0x0, 0x8 } }, /* 9 Full -2.5 dB */ > + { .dkl = { 0x0, 0x0, 0xA } }, /* 10 Full -3 dB */ > +}; > + > +static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_hbr[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x71, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7D, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x4C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x73, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ > + { .cnl = { 0xC, 0x6C, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_hbr2[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x63, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x47, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x63, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ > + { .cnl = { 0xC, 0x61, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7B, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > +}; > + > +static const union intel_ddi_buf_trans_entry tgl_uy_combo_phy_ddi_translations_dp_hbr2[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x4F, 0x36, 0x00, 0x09 } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x60, 0x32, 0x00, 0x0D } }, /* 350 700 6.0 */ > + { .cnl = { 0xC, 0x7F, 0x2D, 0x00, 0x12 } }, /* 350 900 8.2 */ > + { .cnl = { 0xC, 0x47, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x6F, 0x36, 0x00, 0x09 } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7D, 0x32, 0x00, 0x0D } }, /* 500 900 5.1 */ > + { .cnl = { 0x6, 0x60, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7F, 0x34, 0x00, 0x0B } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > /* > * Cloned the HOBL entry to comply with the voltage and pre-emphasis entries > * that DisplayPort specification requires > */ > -static const struct cnl_ddi_buf_trans tgl_combo_phy_ddi_translations_edp_hbr2_hobl[] = { > - /* VS pre-emp */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 0 0 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 0 1 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 0 2 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 0 3 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1 0 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1 1 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1 2 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 2 0 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 2 1 */ > +static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_edp_hbr2_hobl[] = { > + /* VS pre-emp */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 0 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 1 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 2 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 3 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1 0 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1 1 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1 2 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 2 0 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 2 1 */ > }; > > -static const struct cnl_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x2F, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */ > - { 0xC, 0x63, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */ > - { 0x6, 0x7D, 0x2A, 0x00, 0x15 }, /* 350 900 8.2 */ > - { 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */ > - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ > - { 0xC, 0x6E, 0x3E, 0x00, 0x01 }, /* 650 700 0.6 */ > - { 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ > +static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_hbr[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x2F, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x63, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7D, 0x2A, 0x00, 0x15 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x4C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x73, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ > + { .cnl = { 0xC, 0x6E, 0x3E, 0x00, 0x01 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const struct cnl_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { > - /* NT mV Trans mV db */ > - { 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */ > - { 0xA, 0x50, 0x38, 0x00, 0x07 }, /* 350 500 3.1 */ > - { 0xC, 0x61, 0x33, 0x00, 0x0C }, /* 350 700 6.0 */ > - { 0x6, 0x7F, 0x2E, 0x00, 0x11 }, /* 350 900 8.2 */ > - { 0xA, 0x47, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */ > - { 0xC, 0x5F, 0x38, 0x00, 0x07 }, /* 500 700 2.9 */ > - { 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */ > - { 0xC, 0x5F, 0x3F, 0x00, 0x00 }, /* 650 700 0.6 */ > - { 0x6, 0x7E, 0x36, 0x00, 0x09 }, /* 600 900 3.5 */ > - { 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */ > +static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x50, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x61, 0x33, 0x00, 0x0C } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7F, 0x2E, 0x00, 0x11 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x47, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x5F, 0x38, 0x00, 0x07 } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ > + { .cnl = { 0xC, 0x5F, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7E, 0x36, 0x00, 0x09 } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const struct tgl_dkl_phy_ddi_buf_trans adlp_dkl_phy_dp_ddi_trans_hbr[] = { > - /* VS pre-emp Non-trans mV Pre-emph dB */ > - { 0x7, 0x0, 0x01 }, /* 0 0 400mV 0 dB */ > - { 0x5, 0x0, 0x06 }, /* 0 1 400mV 3.5 dB */ > - { 0x2, 0x0, 0x0B }, /* 0 2 400mV 6 dB */ > - { 0x0, 0x0, 0x17 }, /* 0 3 400mV 9.5 dB */ > - { 0x5, 0x0, 0x00 }, /* 1 0 600mV 0 dB */ > - { 0x2, 0x0, 0x08 }, /* 1 1 600mV 3.5 dB */ > - { 0x0, 0x0, 0x14 }, /* 1 2 600mV 6 dB */ > - { 0x2, 0x0, 0x00 }, /* 2 0 800mV 0 dB */ > - { 0x0, 0x0, 0x0B }, /* 2 1 800mV 3.5 dB */ > - { 0x0, 0x0, 0x00 }, /* 3 0 1200mV 0 dB */ > +static const union intel_ddi_buf_trans_entry adlp_dkl_phy_dp_ddi_trans_hbr[] = { > + /* VS pre-emp Non-trans mV Pre-emph dB */ > + { .dkl = { 0x7, 0x0, 0x01 } }, /* 0 0 400mV 0 dB */ > + { .dkl = { 0x5, 0x0, 0x06 } }, /* 0 1 400mV 3.5 dB */ > + { .dkl = { 0x2, 0x0, 0x0B } }, /* 0 2 400mV 6 dB */ > + { .dkl = { 0x0, 0x0, 0x17 } }, /* 0 3 400mV 9.5 dB */ > + { .dkl = { 0x5, 0x0, 0x00 } }, /* 1 0 600mV 0 dB */ > + { .dkl = { 0x2, 0x0, 0x08 } }, /* 1 1 600mV 3.5 dB */ > + { .dkl = { 0x0, 0x0, 0x14 } }, /* 1 2 600mV 6 dB */ > + { .dkl = { 0x2, 0x0, 0x00 } }, /* 2 0 800mV 0 dB */ > + { .dkl = { 0x0, 0x0, 0x0B } }, /* 2 1 800mV 3.5 dB */ > + { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB */ > }; > > -static const struct tgl_dkl_phy_ddi_buf_trans adlp_dkl_phy_dp_ddi_trans_hbr2_hbr3[] = { > - /* VS pre-emp Non-trans mV Pre-emph dB */ > - { 0x7, 0x0, 0x00 }, /* 0 0 400mV 0 dB */ > - { 0x5, 0x0, 0x04 }, /* 0 1 400mV 3.5 dB */ > - { 0x2, 0x0, 0x0A }, /* 0 2 400mV 6 dB */ > - { 0x0, 0x0, 0x18 }, /* 0 3 400mV 9.5 dB */ > - { 0x5, 0x0, 0x00 }, /* 1 0 600mV 0 dB */ > - { 0x2, 0x0, 0x06 }, /* 1 1 600mV 3.5 dB */ > - { 0x0, 0x0, 0x14 }, /* 1 2 600mV 6 dB */ > - { 0x2, 0x0, 0x00 }, /* 2 0 800mV 0 dB */ > - { 0x0, 0x0, 0x09 }, /* 2 1 800mV 3.5 dB */ > - { 0x0, 0x0, 0x00 }, /* 3 0 1200mV 0 dB */ > +static const union intel_ddi_buf_trans_entry adlp_dkl_phy_dp_ddi_trans_hbr2_hbr3[] = { > + /* VS pre-emp Non-trans mV Pre-emph dB */ > + { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ > + { .dkl = { 0x5, 0x0, 0x04 } }, /* 0 1 400mV 3.5 dB */ > + { .dkl = { 0x2, 0x0, 0x0A } }, /* 0 2 400mV 6 dB */ > + { .dkl = { 0x0, 0x0, 0x18 } }, /* 0 3 400mV 9.5 dB */ > + { .dkl = { 0x5, 0x0, 0x00 } }, /* 1 0 600mV 0 dB */ > + { .dkl = { 0x2, 0x0, 0x06 } }, /* 1 1 600mV 3.5 dB */ > + { .dkl = { 0x0, 0x0, 0x14 } }, /* 1 2 600mV 6 dB */ > + { .dkl = { 0x2, 0x0, 0x00 } }, /* 2 0 800mV 0 dB */ > + { .dkl = { 0x0, 0x0, 0x09 } }, /* 2 1 800mV 3.5 dB */ > + { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB */ > }; > > -bool is_hobl_buf_trans(const struct cnl_ddi_buf_trans *table) > +bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table) > { > return table == tgl_combo_phy_ddi_translations_edp_hbr2_hobl; > } > > -static const struct hsw_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -781,7 +781,7 @@ bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > } > } > > -static const struct hsw_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -798,7 +798,7 @@ skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > } > } > > -static const struct hsw_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -819,7 +819,7 @@ kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > } > } > > -static const struct hsw_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -851,7 +851,7 @@ skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > return skl_get_buf_trans_dp(encoder, n_entries); > } > > -static const struct hsw_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries) > { > if (IS_SKL_ULX(dev_priv) || > @@ -875,7 +875,7 @@ static int skl_buf_trans_num_entries(enum port port, int n_entries) > return min(n_entries, 9); > } > > -static const struct hsw_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -883,12 +883,12 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > if (IS_KABYLAKE(dev_priv) || > IS_COFFEELAKE(dev_priv) || > IS_COMETLAKE(dev_priv)) { > - const struct hsw_ddi_buf_trans *ddi_translations = > + const union intel_ddi_buf_trans_entry *ddi_translations = > kbl_get_buf_trans_dp(encoder, n_entries); > *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); > return ddi_translations; > } else if (IS_SKYLAKE(dev_priv)) { > - const struct hsw_ddi_buf_trans *ddi_translations = > + const union intel_ddi_buf_trans_entry *ddi_translations = > skl_get_buf_trans_dp(encoder, n_entries); > *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); > return ddi_translations; > @@ -904,13 +904,13 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > return NULL; > } > > -static const struct hsw_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) { > - const struct hsw_ddi_buf_trans *ddi_translations = > + const union intel_ddi_buf_trans_entry *ddi_translations = > skl_get_buf_trans_edp(encoder, n_entries); > *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); > return ddi_translations; > @@ -925,7 +925,7 @@ hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > return NULL; > } > > -static const struct hsw_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > hsw_get_buf_trans_fdi(struct intel_encoder *encoder, > int *n_entries) > { > @@ -943,7 +943,7 @@ hsw_get_buf_trans_fdi(struct intel_encoder *encoder, > return NULL; > } > > -static const struct hsw_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, > int *n_entries) > { > @@ -963,7 +963,7 @@ hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, > return NULL; > } > > -const struct hsw_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > hsw_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -978,14 +978,14 @@ hsw_get_buf_trans(struct intel_encoder *encoder, > return hsw_get_buf_trans_dp(encoder, n_entries); > } > > -static const struct bxt_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > bxt_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > *n_entries = ARRAY_SIZE(bxt_ddi_translations_dp); > return bxt_ddi_translations_dp; > } > > -static const struct bxt_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -998,14 +998,14 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > return bxt_get_buf_trans_dp(encoder, n_entries); > } > > -static const struct bxt_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) > { > *n_entries = ARRAY_SIZE(bxt_ddi_translations_hdmi); > return bxt_ddi_translations_hdmi; > } > > -const struct bxt_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > bxt_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1017,7 +1017,7 @@ bxt_get_buf_trans(struct intel_encoder *encoder, > return bxt_get_buf_trans_dp(encoder, n_entries); > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1039,7 +1039,7 @@ cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) > return NULL; > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1061,7 +1061,7 @@ cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > return NULL; > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1087,7 +1087,7 @@ cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > } > } > > -const struct cnl_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > cnl_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1099,7 +1099,7 @@ cnl_get_buf_trans(struct intel_encoder *encoder, > return cnl_get_buf_trans_dp(encoder, n_entries); > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1108,7 +1108,7 @@ icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > return icl_combo_phy_ddi_translations_hdmi; > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1117,7 +1117,7 @@ icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > return icl_combo_phy_ddi_translations_dp_hbr2; > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1141,7 +1141,7 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const struct cnl_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > icl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1154,7 +1154,7 @@ icl_get_combo_buf_trans(struct intel_encoder *encoder, > return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const struct icl_mg_phy_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1163,7 +1163,7 @@ icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, > return icl_mg_phy_ddi_translations_hdmi; > } > > -static const struct icl_mg_phy_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1177,7 +1177,7 @@ icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, > } > } > > -const struct icl_mg_phy_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > icl_get_mg_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1188,7 +1188,7 @@ icl_get_mg_buf_trans(struct intel_encoder *encoder, > return icl_get_mg_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1197,7 +1197,7 @@ ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > return icl_combo_phy_ddi_translations_hdmi; > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1206,7 +1206,7 @@ ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > return ehl_combo_phy_ddi_translations_dp; > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1221,7 +1221,7 @@ ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const struct cnl_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > ehl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1234,7 +1234,7 @@ 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 * > +static const union intel_ddi_buf_trans_entry * > jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1243,7 +1243,7 @@ jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > return icl_combo_phy_ddi_translations_hdmi; > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1252,7 +1252,7 @@ jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > return icl_combo_phy_ddi_translations_dp_hbr2; > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1272,7 +1272,7 @@ jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const struct cnl_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > jsl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1285,7 +1285,7 @@ jsl_get_combo_buf_trans(struct intel_encoder *encoder, > return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1294,7 +1294,7 @@ tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > return icl_combo_phy_ddi_translations_hdmi; > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1323,7 +1323,7 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > } > } > > -static const struct cnl_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1345,7 +1345,7 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const struct cnl_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > tgl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1358,7 +1358,7 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder, > return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const struct tgl_dkl_phy_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1367,7 +1367,7 @@ tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, > return tgl_dkl_phy_hdmi_ddi_trans; > } > > -static const struct tgl_dkl_phy_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1381,7 +1381,7 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > } > } > > -const struct tgl_dkl_phy_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > tgl_get_dkl_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1392,7 +1392,7 @@ tgl_get_dkl_buf_trans(struct intel_encoder *encoder, > return tgl_get_dkl_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const struct tgl_dkl_phy_ddi_buf_trans * > +static const union intel_ddi_buf_trans_entry * > adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1406,7 +1406,7 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > return adlp_dkl_phy_dp_ddi_trans_hbr; > } > > -const struct tgl_dkl_phy_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > adlp_get_dkl_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > index 428f1f343341..487a4f815470 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > @@ -45,52 +45,60 @@ struct tgl_dkl_phy_ddi_buf_trans { > u32 dkl_de_emphasis_control; > }; > > -bool is_hobl_buf_trans(const struct cnl_ddi_buf_trans *table); > +union intel_ddi_buf_trans_entry { > + struct hsw_ddi_buf_trans hsw; > + struct bxt_ddi_buf_trans bxt; > + struct cnl_ddi_buf_trans cnl; > + struct icl_mg_phy_ddi_buf_trans mg; > + struct tgl_dkl_phy_ddi_buf_trans dkl; > +}; > + > +bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table); > > int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *default_entry); > > -const struct hsw_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > hsw_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > > -const struct bxt_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > bxt_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > > -const struct tgl_dkl_phy_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > adlp_get_dkl_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const struct cnl_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > tgl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const struct tgl_dkl_phy_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > tgl_get_dkl_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const struct cnl_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > jsl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const struct cnl_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > ehl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const struct cnl_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > icl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const struct icl_mg_phy_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > icl_get_mg_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > > -const struct cnl_ddi_buf_trans * > +const union intel_ddi_buf_trans_entry * > cnl_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 04/17] drm/i915: Rename dkl phy buf trans tables 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (2 preceding siblings ...) 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 03/17] drm/i915: Wrap the platform specific buf trans structs into a union Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-18 12:04 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 05/17] drm/i915: Wrap the buf trans tables into a struct Ville Syrjala ` (17 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> Rename the dkl phy buf trans tables to follow the same naming pattern used by everyone else. v2: Handle adl-p Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index 3f38267b7dd6..7f3c23d9c1da 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -605,7 +605,7 @@ static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hdmi[] { .mg = { 0x36, 0x0, 0x9 } }, /* 10 Full -3 dB */ }; -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans[] = { +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr[] = { /* VS pre-emp Non-trans mV Pre-emph dB */ { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ @@ -619,7 +619,7 @@ static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans[] = { { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ }; -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans_hbr2[] = { +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr2[] = { /* VS pre-emp Non-trans mV Pre-emph dB */ { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ @@ -633,7 +633,7 @@ static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans_hbr2[] = { { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ }; -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_hdmi_ddi_trans[] = { +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_hdmi[] = { /* HDMI Preset VS Pre-emph */ { .dkl = { 0x7, 0x0, 0x0 } }, /* 1 400mV 0dB */ { .dkl = { 0x6, 0x0, 0x0 } }, /* 2 500mV 0dB */ @@ -734,7 +734,7 @@ static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_h { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const union intel_ddi_buf_trans_entry adlp_dkl_phy_dp_ddi_trans_hbr[] = { +static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hbr[] = { /* VS pre-emp Non-trans mV Pre-emph dB */ { .dkl = { 0x7, 0x0, 0x01 } }, /* 0 0 400mV 0 dB */ { .dkl = { 0x5, 0x0, 0x06 } }, /* 0 1 400mV 3.5 dB */ @@ -748,7 +748,7 @@ static const union intel_ddi_buf_trans_entry adlp_dkl_phy_dp_ddi_trans_hbr[] = { { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB */ }; -static const union intel_ddi_buf_trans_entry adlp_dkl_phy_dp_ddi_trans_hbr2_hbr3[] = { +static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3[] = { /* VS pre-emp Non-trans mV Pre-emph dB */ { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ { .dkl = { 0x5, 0x0, 0x04 } }, /* 0 1 400mV 3.5 dB */ @@ -1363,8 +1363,8 @@ tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = ARRAY_SIZE(tgl_dkl_phy_hdmi_ddi_trans); - return tgl_dkl_phy_hdmi_ddi_trans; + *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_hdmi); + return tgl_dkl_phy_ddi_translations_hdmi; } static const union intel_ddi_buf_trans_entry * @@ -1373,11 +1373,11 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { if (crtc_state->port_clock > 270000) { - *n_entries = ARRAY_SIZE(tgl_dkl_phy_dp_ddi_trans_hbr2); - return tgl_dkl_phy_dp_ddi_trans_hbr2; + *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_dp_hbr2); + return tgl_dkl_phy_ddi_translations_dp_hbr2; } else { - *n_entries = ARRAY_SIZE(tgl_dkl_phy_dp_ddi_trans); - return tgl_dkl_phy_dp_ddi_trans; + *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_dp_hbr); + return tgl_dkl_phy_ddi_translations_dp_hbr; } } @@ -1398,12 +1398,12 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { if (crtc_state->port_clock > 270000) { - *n_entries = ARRAY_SIZE(adlp_dkl_phy_dp_ddi_trans_hbr2_hbr3); - return adlp_dkl_phy_dp_ddi_trans_hbr2_hbr3; + *n_entries = ARRAY_SIZE(adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3); + return adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3; + } else { + *n_entries = ARRAY_SIZE(adlp_dkl_phy_ddi_translations_dp_hbr); + return adlp_dkl_phy_ddi_translations_dp_hbr; } - - *n_entries = ARRAY_SIZE(adlp_dkl_phy_dp_ddi_trans_hbr); - return adlp_dkl_phy_dp_ddi_trans_hbr; } const union intel_ddi_buf_trans_entry * -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 04/17] drm/i915: Rename dkl phy buf trans tables 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 04/17] drm/i915: Rename dkl phy buf trans tables Ville Syrjala @ 2021-06-18 12:04 ` Jani Nikula 0 siblings, 0 replies; 39+ messages in thread From: Jani Nikula @ 2021-06-18 12:04 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Rename the dkl phy buf trans tables to follow the same > naming pattern used by everyone else. > > v2: Handle adl-p > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Holds for v2. > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > .../drm/i915/display/intel_ddi_buf_trans.c | 32 +++++++++---------- > 1 file changed, 16 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index 3f38267b7dd6..7f3c23d9c1da 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -605,7 +605,7 @@ static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hdmi[] > { .mg = { 0x36, 0x0, 0x9 } }, /* 10 Full -3 dB */ > }; > > -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans[] = { > +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr[] = { > /* VS pre-emp Non-trans mV Pre-emph dB */ > { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ > { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ > @@ -619,7 +619,7 @@ static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans[] = { > { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ > }; > > -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans_hbr2[] = { > +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr2[] = { > /* VS pre-emp Non-trans mV Pre-emph dB */ > { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ > { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ > @@ -633,7 +633,7 @@ static const union intel_ddi_buf_trans_entry tgl_dkl_phy_dp_ddi_trans_hbr2[] = { > { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ > }; > > -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_hdmi_ddi_trans[] = { > +static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_hdmi[] = { > /* HDMI Preset VS Pre-emph */ > { .dkl = { 0x7, 0x0, 0x0 } }, /* 1 400mV 0dB */ > { .dkl = { 0x6, 0x0, 0x0 } }, /* 2 500mV 0dB */ > @@ -734,7 +734,7 @@ static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_h > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry adlp_dkl_phy_dp_ddi_trans_hbr[] = { > +static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hbr[] = { > /* VS pre-emp Non-trans mV Pre-emph dB */ > { .dkl = { 0x7, 0x0, 0x01 } }, /* 0 0 400mV 0 dB */ > { .dkl = { 0x5, 0x0, 0x06 } }, /* 0 1 400mV 3.5 dB */ > @@ -748,7 +748,7 @@ static const union intel_ddi_buf_trans_entry adlp_dkl_phy_dp_ddi_trans_hbr[] = { > { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB */ > }; > > -static const union intel_ddi_buf_trans_entry adlp_dkl_phy_dp_ddi_trans_hbr2_hbr3[] = { > +static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3[] = { > /* VS pre-emp Non-trans mV Pre-emph dB */ > { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ > { .dkl = { 0x5, 0x0, 0x04 } }, /* 0 1 400mV 3.5 dB */ > @@ -1363,8 +1363,8 @@ tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = ARRAY_SIZE(tgl_dkl_phy_hdmi_ddi_trans); > - return tgl_dkl_phy_hdmi_ddi_trans; > + *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_hdmi); > + return tgl_dkl_phy_ddi_translations_hdmi; > } > > static const union intel_ddi_buf_trans_entry * > @@ -1373,11 +1373,11 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > int *n_entries) > { > if (crtc_state->port_clock > 270000) { > - *n_entries = ARRAY_SIZE(tgl_dkl_phy_dp_ddi_trans_hbr2); > - return tgl_dkl_phy_dp_ddi_trans_hbr2; > + *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_dp_hbr2); > + return tgl_dkl_phy_ddi_translations_dp_hbr2; > } else { > - *n_entries = ARRAY_SIZE(tgl_dkl_phy_dp_ddi_trans); > - return tgl_dkl_phy_dp_ddi_trans; > + *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_dp_hbr); > + return tgl_dkl_phy_ddi_translations_dp_hbr; > } > } > > @@ -1398,12 +1398,12 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > int *n_entries) > { > if (crtc_state->port_clock > 270000) { > - *n_entries = ARRAY_SIZE(adlp_dkl_phy_dp_ddi_trans_hbr2_hbr3); > - return adlp_dkl_phy_dp_ddi_trans_hbr2_hbr3; > + *n_entries = ARRAY_SIZE(adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3); > + return adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3; > + } else { > + *n_entries = ARRAY_SIZE(adlp_dkl_phy_ddi_translations_dp_hbr); > + return adlp_dkl_phy_ddi_translations_dp_hbr; > } > - > - *n_entries = ARRAY_SIZE(adlp_dkl_phy_dp_ddi_trans_hbr); > - return adlp_dkl_phy_dp_ddi_trans_hbr; > } > > const union intel_ddi_buf_trans_entry * -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 05/17] drm/i915: Wrap the buf trans tables into a struct 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (3 preceding siblings ...) 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 04/17] drm/i915: Rename dkl phy buf trans tables Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-18 12:05 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 06/17] drm/i915: Introduce intel_get_buf_trans() Ville Syrjala ` (16 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> Put a wrapper struct around the buf trans tables so that we can declare the number of entries and default HDMI entry alongside the table. @wrap@ identifier old =~ "^.*translations.*"; fresh identifier new = "_" ## old; type T; @@ <... static const T - old + new [] = { ... }; + + static const struct intel_ddi_buf_trans old = { + .entries = new, + .num_entries = ARRAY_SIZE(new), + }; ...> @@ identifier wrap.old; @@ ( - ARRAY_SIZE(old) + old.num_entries | - old + old.entries ) @@ @@ union intel_ddi_buf_trans_entry { ... }; + +struct intel_ddi_buf_trans { + const union intel_ddi_buf_trans_entry *entries; + u8 num_entries; +}; v2: Handle adl-p Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 621 +++++++++++++----- .../drm/i915/display/intel_ddi_buf_trans.h | 5 + 2 files changed, 448 insertions(+), 178 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index 7f3c23d9c1da..5e18056780a8 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -13,7 +13,7 @@ * them for both DP and FDI transports, allowing those ports to * automatically adapt to HDMI connections as well */ -static const union intel_ddi_buf_trans_entry hsw_ddi_translations_dp[] = { +static const union intel_ddi_buf_trans_entry _hsw_ddi_translations_dp[] = { { .hsw = { 0x00FFFFFF, 0x0006000E, 0x0 } }, { .hsw = { 0x00D75FFF, 0x0005000A, 0x0 } }, { .hsw = { 0x00C30FFF, 0x00040006, 0x0 } }, @@ -25,7 +25,12 @@ static const union intel_ddi_buf_trans_entry hsw_ddi_translations_dp[] = { { .hsw = { 0x80D75FFF, 0x000B0000, 0x0 } }, }; -static const union intel_ddi_buf_trans_entry hsw_ddi_translations_fdi[] = { +static const struct intel_ddi_buf_trans hsw_ddi_translations_dp = { + .entries = _hsw_ddi_translations_dp, + .num_entries = ARRAY_SIZE(_hsw_ddi_translations_dp), +}; + +static const union intel_ddi_buf_trans_entry _hsw_ddi_translations_fdi[] = { { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, { .hsw = { 0x00D75FFF, 0x000F000A, 0x0 } }, { .hsw = { 0x00C30FFF, 0x00060006, 0x0 } }, @@ -37,7 +42,12 @@ static const union intel_ddi_buf_trans_entry hsw_ddi_translations_fdi[] = { { .hsw = { 0x00D75FFF, 0x001E0000, 0x0 } }, }; -static const union intel_ddi_buf_trans_entry hsw_ddi_translations_hdmi[] = { +static const struct intel_ddi_buf_trans hsw_ddi_translations_fdi = { + .entries = _hsw_ddi_translations_fdi, + .num_entries = ARRAY_SIZE(_hsw_ddi_translations_fdi), +}; + +static const union intel_ddi_buf_trans_entry _hsw_ddi_translations_hdmi[] = { /* Idx NT mV d T mV d db */ { .hsw = { 0x00FFFFFF, 0x0006000E, 0x0 } }, /* 0: 400 400 0 */ { .hsw = { 0x00E79FFF, 0x000E000C, 0x0 } }, /* 1: 400 500 2 */ @@ -53,7 +63,12 @@ static const union intel_ddi_buf_trans_entry hsw_ddi_translations_hdmi[] = { { .hsw = { 0x80FFFFFF, 0x00030002, 0x0 } }, /* 11: 1000 1000 0 */ }; -static const union intel_ddi_buf_trans_entry bdw_ddi_translations_edp[] = { +static const struct intel_ddi_buf_trans hsw_ddi_translations_hdmi = { + .entries = _hsw_ddi_translations_hdmi, + .num_entries = ARRAY_SIZE(_hsw_ddi_translations_hdmi), +}; + +static const union intel_ddi_buf_trans_entry _bdw_ddi_translations_edp[] = { { .hsw = { 0x00FFFFFF, 0x00000012, 0x0 } }, { .hsw = { 0x00EBAFFF, 0x00020011, 0x0 } }, { .hsw = { 0x00C71FFF, 0x0006000F, 0x0 } }, @@ -65,7 +80,12 @@ static const union intel_ddi_buf_trans_entry bdw_ddi_translations_edp[] = { { .hsw = { 0x00DB6FFF, 0x000A000C, 0x0 } }, }; -static const union intel_ddi_buf_trans_entry bdw_ddi_translations_dp[] = { +static const struct intel_ddi_buf_trans bdw_ddi_translations_edp = { + .entries = _bdw_ddi_translations_edp, + .num_entries = ARRAY_SIZE(_bdw_ddi_translations_edp), +}; + +static const union intel_ddi_buf_trans_entry _bdw_ddi_translations_dp[] = { { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, { .hsw = { 0x00D75FFF, 0x000E000A, 0x0 } }, { .hsw = { 0x00BEFFFF, 0x00140006, 0x0 } }, @@ -77,7 +97,12 @@ static const union intel_ddi_buf_trans_entry bdw_ddi_translations_dp[] = { { .hsw = { 0x80D75FFF, 0x001B0002, 0x0 } }, }; -static const union intel_ddi_buf_trans_entry bdw_ddi_translations_fdi[] = { +static const struct intel_ddi_buf_trans bdw_ddi_translations_dp = { + .entries = _bdw_ddi_translations_dp, + .num_entries = ARRAY_SIZE(_bdw_ddi_translations_dp), +}; + +static const union intel_ddi_buf_trans_entry _bdw_ddi_translations_fdi[] = { { .hsw = { 0x00FFFFFF, 0x0001000E, 0x0 } }, { .hsw = { 0x00D75FFF, 0x0004000A, 0x0 } }, { .hsw = { 0x00C30FFF, 0x00070006, 0x0 } }, @@ -89,7 +114,12 @@ static const union intel_ddi_buf_trans_entry bdw_ddi_translations_fdi[] = { { .hsw = { 0x00D75FFF, 0x000C0000, 0x0 } }, }; -static const union intel_ddi_buf_trans_entry bdw_ddi_translations_hdmi[] = { +static const struct intel_ddi_buf_trans bdw_ddi_translations_fdi = { + .entries = _bdw_ddi_translations_fdi, + .num_entries = ARRAY_SIZE(_bdw_ddi_translations_fdi), +}; + +static const union intel_ddi_buf_trans_entry _bdw_ddi_translations_hdmi[] = { /* Idx NT mV d T mV df db */ { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, /* 0: 400 400 0 */ { .hsw = { 0x00D75FFF, 0x000E000A, 0x0 } }, /* 1: 400 600 3.5 */ @@ -103,8 +133,13 @@ static const union intel_ddi_buf_trans_entry bdw_ddi_translations_hdmi[] = { { .hsw = { 0x80FFFFFF, 0x001B0002, 0x0 } }, /* 9: 1000 1000 0 */ }; +static const struct intel_ddi_buf_trans bdw_ddi_translations_hdmi = { + .entries = _bdw_ddi_translations_hdmi, + .num_entries = ARRAY_SIZE(_bdw_ddi_translations_hdmi), +}; + /* Skylake H and S */ -static const union intel_ddi_buf_trans_entry skl_ddi_translations_dp[] = { +static const union intel_ddi_buf_trans_entry _skl_ddi_translations_dp[] = { { .hsw = { 0x00002016, 0x000000A0, 0x0 } }, { .hsw = { 0x00005012, 0x0000009B, 0x0 } }, { .hsw = { 0x00007011, 0x00000088, 0x0 } }, @@ -116,8 +151,13 @@ static const union intel_ddi_buf_trans_entry skl_ddi_translations_dp[] = { { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, }; +static const struct intel_ddi_buf_trans skl_ddi_translations_dp = { + .entries = _skl_ddi_translations_dp, + .num_entries = ARRAY_SIZE(_skl_ddi_translations_dp), +}; + /* Skylake U */ -static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_dp[] = { +static const union intel_ddi_buf_trans_entry _skl_u_ddi_translations_dp[] = { { .hsw = { 0x0000201B, 0x000000A2, 0x0 } }, { .hsw = { 0x00005012, 0x00000088, 0x0 } }, { .hsw = { 0x80007011, 0x000000CD, 0x1 } }, @@ -129,8 +169,13 @@ static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_dp[] = { { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, }; +static const struct intel_ddi_buf_trans skl_u_ddi_translations_dp = { + .entries = _skl_u_ddi_translations_dp, + .num_entries = ARRAY_SIZE(_skl_u_ddi_translations_dp), +}; + /* Skylake Y */ -static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_dp[] = { +static const union intel_ddi_buf_trans_entry _skl_y_ddi_translations_dp[] = { { .hsw = { 0x00000018, 0x000000A2, 0x0 } }, { .hsw = { 0x00005012, 0x00000088, 0x0 } }, { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, @@ -142,8 +187,13 @@ static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_dp[] = { { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, }; +static const struct intel_ddi_buf_trans skl_y_ddi_translations_dp = { + .entries = _skl_y_ddi_translations_dp, + .num_entries = ARRAY_SIZE(_skl_y_ddi_translations_dp), +}; + /* Kabylake H and S */ -static const union intel_ddi_buf_trans_entry kbl_ddi_translations_dp[] = { +static const union intel_ddi_buf_trans_entry _kbl_ddi_translations_dp[] = { { .hsw = { 0x00002016, 0x000000A0, 0x0 } }, { .hsw = { 0x00005012, 0x0000009B, 0x0 } }, { .hsw = { 0x00007011, 0x00000088, 0x0 } }, @@ -155,8 +205,13 @@ static const union intel_ddi_buf_trans_entry kbl_ddi_translations_dp[] = { { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, }; +static const struct intel_ddi_buf_trans kbl_ddi_translations_dp = { + .entries = _kbl_ddi_translations_dp, + .num_entries = ARRAY_SIZE(_kbl_ddi_translations_dp), +}; + /* Kabylake U */ -static const union intel_ddi_buf_trans_entry kbl_u_ddi_translations_dp[] = { +static const union intel_ddi_buf_trans_entry _kbl_u_ddi_translations_dp[] = { { .hsw = { 0x0000201B, 0x000000A1, 0x0 } }, { .hsw = { 0x00005012, 0x00000088, 0x0 } }, { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, @@ -168,8 +223,13 @@ static const union intel_ddi_buf_trans_entry kbl_u_ddi_translations_dp[] = { { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, }; +static const struct intel_ddi_buf_trans kbl_u_ddi_translations_dp = { + .entries = _kbl_u_ddi_translations_dp, + .num_entries = ARRAY_SIZE(_kbl_u_ddi_translations_dp), +}; + /* Kabylake Y */ -static const union intel_ddi_buf_trans_entry kbl_y_ddi_translations_dp[] = { +static const union intel_ddi_buf_trans_entry _kbl_y_ddi_translations_dp[] = { { .hsw = { 0x00001017, 0x000000A1, 0x0 } }, { .hsw = { 0x00005012, 0x00000088, 0x0 } }, { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, @@ -181,11 +241,16 @@ static const union intel_ddi_buf_trans_entry kbl_y_ddi_translations_dp[] = { { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, }; +static const struct intel_ddi_buf_trans kbl_y_ddi_translations_dp = { + .entries = _kbl_y_ddi_translations_dp, + .num_entries = ARRAY_SIZE(_kbl_y_ddi_translations_dp), +}; + /* * Skylake/Kabylake H and S * eDP 1.4 low vswing translation parameters */ -static const union intel_ddi_buf_trans_entry skl_ddi_translations_edp[] = { +static const union intel_ddi_buf_trans_entry _skl_ddi_translations_edp[] = { { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, { .hsw = { 0x00004013, 0x000000A9, 0x0 } }, { .hsw = { 0x00007011, 0x000000A2, 0x0 } }, @@ -198,11 +263,16 @@ static const union intel_ddi_buf_trans_entry skl_ddi_translations_edp[] = { { .hsw = { 0x00000018, 0x000000DF, 0x0 } }, }; +static const struct intel_ddi_buf_trans skl_ddi_translations_edp = { + .entries = _skl_ddi_translations_edp, + .num_entries = ARRAY_SIZE(_skl_ddi_translations_edp), +}; + /* * Skylake/Kabylake U * eDP 1.4 low vswing translation parameters */ -static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_edp[] = { +static const union intel_ddi_buf_trans_entry _skl_u_ddi_translations_edp[] = { { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, { .hsw = { 0x00004013, 0x000000A9, 0x0 } }, { .hsw = { 0x00007011, 0x000000A2, 0x0 } }, @@ -215,11 +285,16 @@ static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_edp[] = { { .hsw = { 0x00000018, 0x000000DF, 0x0 } }, }; +static const struct intel_ddi_buf_trans skl_u_ddi_translations_edp = { + .entries = _skl_u_ddi_translations_edp, + .num_entries = ARRAY_SIZE(_skl_u_ddi_translations_edp), +}; + /* * Skylake/Kabylake Y * eDP 1.4 low vswing translation parameters */ -static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_edp[] = { +static const union intel_ddi_buf_trans_entry _skl_y_ddi_translations_edp[] = { { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, { .hsw = { 0x00004013, 0x000000AB, 0x0 } }, { .hsw = { 0x00007011, 0x000000A4, 0x0 } }, @@ -232,8 +307,13 @@ static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_edp[] = { { .hsw = { 0x00000018, 0x0000008A, 0x0 } }, }; +static const struct intel_ddi_buf_trans skl_y_ddi_translations_edp = { + .entries = _skl_y_ddi_translations_edp, + .num_entries = ARRAY_SIZE(_skl_y_ddi_translations_edp), +}; + /* Skylake/Kabylake U, H and S */ -static const union intel_ddi_buf_trans_entry skl_ddi_translations_hdmi[] = { +static const union intel_ddi_buf_trans_entry _skl_ddi_translations_hdmi[] = { { .hsw = { 0x00000018, 0x000000AC, 0x0 } }, { .hsw = { 0x00005012, 0x0000009D, 0x0 } }, { .hsw = { 0x00007011, 0x00000088, 0x0 } }, @@ -247,8 +327,13 @@ static const union intel_ddi_buf_trans_entry skl_ddi_translations_hdmi[] = { { .hsw = { 0x80000018, 0x000000C0, 0x1 } }, }; +static const struct intel_ddi_buf_trans skl_ddi_translations_hdmi = { + .entries = _skl_ddi_translations_hdmi, + .num_entries = ARRAY_SIZE(_skl_ddi_translations_hdmi), +}; + /* Skylake/Kabylake Y */ -static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_hdmi[] = { +static const union intel_ddi_buf_trans_entry _skl_y_ddi_translations_hdmi[] = { { .hsw = { 0x00000018, 0x000000A1, 0x0 } }, { .hsw = { 0x00005012, 0x000000DF, 0x0 } }, { .hsw = { 0x80007011, 0x000000CB, 0x3 } }, @@ -262,7 +347,12 @@ static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_hdmi[] = { { .hsw = { 0x80000018, 0x000000C0, 0x3 } }, }; -static const union intel_ddi_buf_trans_entry bxt_ddi_translations_dp[] = { +static const struct intel_ddi_buf_trans skl_y_ddi_translations_hdmi = { + .entries = _skl_y_ddi_translations_hdmi, + .num_entries = ARRAY_SIZE(_skl_y_ddi_translations_hdmi), +}; + +static const union intel_ddi_buf_trans_entry _bxt_ddi_translations_dp[] = { /* Idx NT mV diff db */ { .bxt = { 52, 0x9A, 0, 128, } }, /* 0: 400 0 */ { .bxt = { 78, 0x9A, 0, 85, } }, /* 1: 400 3.5 */ @@ -276,7 +366,12 @@ static const union intel_ddi_buf_trans_entry bxt_ddi_translations_dp[] = { { .bxt = { 154, 0x9A, 1, 128, } }, /* 9: 1200 0 */ }; -static const union intel_ddi_buf_trans_entry bxt_ddi_translations_edp[] = { +static const struct intel_ddi_buf_trans bxt_ddi_translations_dp = { + .entries = _bxt_ddi_translations_dp, + .num_entries = ARRAY_SIZE(_bxt_ddi_translations_dp), +}; + +static const union intel_ddi_buf_trans_entry _bxt_ddi_translations_edp[] = { /* Idx NT mV diff db */ { .bxt = { 26, 0, 0, 128, } }, /* 0: 200 0 */ { .bxt = { 38, 0, 0, 112, } }, /* 1: 200 1.5 */ @@ -290,10 +385,15 @@ static const union intel_ddi_buf_trans_entry bxt_ddi_translations_edp[] = { { .bxt = { 48, 0, 0, 128, } }, /* 9: 300 0 */ }; +static const struct intel_ddi_buf_trans bxt_ddi_translations_edp = { + .entries = _bxt_ddi_translations_edp, + .num_entries = ARRAY_SIZE(_bxt_ddi_translations_edp), +}; + /* BSpec has 2 recommended values - entries 0 and 8. * Using the entry with higher vswing. */ -static const union intel_ddi_buf_trans_entry bxt_ddi_translations_hdmi[] = { +static const union intel_ddi_buf_trans_entry _bxt_ddi_translations_hdmi[] = { /* Idx NT mV diff db */ { .bxt = { 52, 0x9A, 0, 128, } }, /* 0: 400 0 */ { .bxt = { 52, 0x9A, 0, 85, } }, /* 1: 400 3.5 */ @@ -307,8 +407,13 @@ static const union intel_ddi_buf_trans_entry bxt_ddi_translations_hdmi[] = { { .bxt = { 154, 0x9A, 1, 128, } }, /* 9: 1200 0 */ }; +static const struct intel_ddi_buf_trans bxt_ddi_translations_hdmi = { + .entries = _bxt_ddi_translations_hdmi, + .num_entries = ARRAY_SIZE(_bxt_ddi_translations_hdmi), +}; + /* Voltage Swing Programming for VccIO 0.85V for DP */ -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_85V[] = { +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_dp_0_85V[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x5D, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x6A, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ @@ -322,8 +427,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_85V[] = { { .cnl = { 0x6, 0x7B, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; +static const struct intel_ddi_buf_trans cnl_ddi_translations_dp_0_85V = { + .entries = _cnl_ddi_translations_dp_0_85V, + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_dp_0_85V), +}; + /* Voltage Swing Programming for VccIO 0.85V for HDMI */ -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_85V[] = { +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_hdmi_0_85V[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x60, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ { .cnl = { 0xB, 0x73, 0x36, 0x00, 0x09 } }, /* 450 650 3.2 */ @@ -334,8 +444,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_85V[] = { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ }; +static const struct intel_ddi_buf_trans cnl_ddi_translations_hdmi_0_85V = { + .entries = _cnl_ddi_translations_hdmi_0_85V, + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_hdmi_0_85V), +}; + /* Voltage Swing Programming for VccIO 0.85V for eDP */ -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_85V[] = { +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_edp_0_85V[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x66, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ @@ -348,8 +463,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_85V[] = { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ }; +static const struct intel_ddi_buf_trans cnl_ddi_translations_edp_0_85V = { + .entries = _cnl_ddi_translations_edp_0_85V, + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_edp_0_85V), +}; + /* Voltage Swing Programming for VccIO 0.95V for DP */ -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_95V[] = { +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_dp_0_95V[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x5D, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x6A, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ @@ -363,8 +483,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_95V[] = { { .cnl = { 0x6, 0x7B, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; +static const struct intel_ddi_buf_trans cnl_ddi_translations_dp_0_95V = { + .entries = _cnl_ddi_translations_dp_0_95V, + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_dp_0_95V), +}; + /* Voltage Swing Programming for VccIO 0.95V for HDMI */ -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_95V[] = { +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_hdmi_0_95V[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x5C, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ { .cnl = { 0xB, 0x69, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ @@ -379,8 +504,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_95V[] = { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ }; +static const struct intel_ddi_buf_trans cnl_ddi_translations_hdmi_0_95V = { + .entries = _cnl_ddi_translations_hdmi_0_95V, + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_hdmi_0_95V), +}; + /* Voltage Swing Programming for VccIO 0.95V for eDP */ -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_95V[] = { +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_edp_0_95V[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x61, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ @@ -394,8 +524,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_95V[] = { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ }; +static const struct intel_ddi_buf_trans cnl_ddi_translations_edp_0_95V = { + .entries = _cnl_ddi_translations_edp_0_95V, + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_edp_0_95V), +}; + /* Voltage Swing Programming for VccIO 1.05V for DP */ -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_1_05V[] = { +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_dp_1_05V[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x58, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ { .cnl = { 0xB, 0x64, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ @@ -409,8 +544,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_1_05V[] = { { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ }; +static const struct intel_ddi_buf_trans cnl_ddi_translations_dp_1_05V = { + .entries = _cnl_ddi_translations_dp_1_05V, + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_dp_1_05V), +}; + /* Voltage Swing Programming for VccIO 1.05V for HDMI */ -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_1_05V[] = { +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_hdmi_1_05V[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x58, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ { .cnl = { 0xB, 0x64, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ @@ -425,8 +565,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_1_05V[] = { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ }; +static const struct intel_ddi_buf_trans cnl_ddi_translations_hdmi_1_05V = { + .entries = _cnl_ddi_translations_hdmi_1_05V, + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_hdmi_1_05V), +}; + /* Voltage Swing Programming for VccIO 1.05V for eDP */ -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_1_05V[] = { +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_edp_1_05V[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x5E, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ @@ -439,8 +584,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_1_05V[] = { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ }; +static const struct intel_ddi_buf_trans cnl_ddi_translations_edp_1_05V = { + .entries = _cnl_ddi_translations_edp_1_05V, + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_edp_1_05V), +}; + /* icl_combo_phy_ddi_translations */ -static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_dp_hbr2[] = { +static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_dp_hbr2[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ @@ -454,7 +604,12 @@ static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_dp_h { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_hbr2[] = { +static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hbr2 = { + .entries = _icl_combo_phy_ddi_translations_dp_hbr2, + .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_dp_hbr2), +}; + +static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_edp_hbr2[] = { /* NT mV Trans mV db */ { .cnl = { 0x0, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 200 250 1.9 */ @@ -468,7 +623,12 @@ static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_ { .cnl = { 0x9, 0x7F, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ }; -static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_hbr3[] = { +static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr2 = { + .entries = _icl_combo_phy_ddi_translations_edp_hbr2, + .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_edp_hbr2), +}; + +static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_edp_hbr3[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ @@ -482,7 +642,12 @@ static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_ { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_hdmi[] = { +static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr3 = { + .entries = _icl_combo_phy_ddi_translations_edp_hbr3, + .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_edp_hbr3), +}; + +static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_hdmi[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x60, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ { .cnl = { 0xB, 0x73, 0x36, 0x00, 0x09 } }, /* 450 650 3.2 */ @@ -493,7 +658,12 @@ static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_hdmi { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ }; -static const union intel_ddi_buf_trans_entry ehl_combo_phy_ddi_translations_dp[] = { +static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_hdmi = { + .entries = _icl_combo_phy_ddi_translations_hdmi, + .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_hdmi), +}; + +static const union intel_ddi_buf_trans_entry _ehl_combo_phy_ddi_translations_dp[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x33, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x47, 0x36, 0x00, 0x09 } }, /* 350 500 3.1 */ @@ -507,7 +677,12 @@ static const union intel_ddi_buf_trans_entry ehl_combo_phy_ddi_translations_dp[] { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_hbr[] = { +static const struct intel_ddi_buf_trans ehl_combo_phy_ddi_translations_dp = { + .entries = _ehl_combo_phy_ddi_translations_dp, + .num_entries = ARRAY_SIZE(_ehl_combo_phy_ddi_translations_dp), +}; + +static const union intel_ddi_buf_trans_entry _jsl_combo_phy_ddi_translations_edp_hbr[] = { /* NT mV Trans mV db */ { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 200 250 1.9 */ @@ -521,7 +696,12 @@ static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_ { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ }; -static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_hbr2[] = { +static const struct intel_ddi_buf_trans jsl_combo_phy_ddi_translations_edp_hbr = { + .entries = _jsl_combo_phy_ddi_translations_edp_hbr, + .num_entries = ARRAY_SIZE(_jsl_combo_phy_ddi_translations_edp_hbr), +}; + +static const union intel_ddi_buf_trans_entry _jsl_combo_phy_ddi_translations_edp_hbr2[] = { /* NT mV Trans mV db */ { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 250 1.9 */ @@ -535,7 +715,12 @@ static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_ { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ }; -static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_rbr_hbr[] = { +static const struct intel_ddi_buf_trans jsl_combo_phy_ddi_translations_edp_hbr2 = { + .entries = _jsl_combo_phy_ddi_translations_edp_hbr2, + .num_entries = ARRAY_SIZE(_jsl_combo_phy_ddi_translations_edp_hbr2), +}; + +static const union intel_ddi_buf_trans_entry _dg1_combo_phy_ddi_translations_dp_rbr_hbr[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x48, 0x35, 0x00, 0x0A } }, /* 350 500 3.1 */ @@ -549,7 +734,12 @@ static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_r { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { +static const struct intel_ddi_buf_trans dg1_combo_phy_ddi_translations_dp_rbr_hbr = { + .entries = _dg1_combo_phy_ddi_translations_dp_rbr_hbr, + .num_entries = ARRAY_SIZE(_dg1_combo_phy_ddi_translations_dp_rbr_hbr), +}; + +static const union intel_ddi_buf_trans_entry _dg1_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x48, 0x35, 0x00, 0x0A } }, /* 350 500 3.1 */ @@ -563,7 +753,12 @@ static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_h { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_rbr_hbr[] = { +static const struct intel_ddi_buf_trans dg1_combo_phy_ddi_translations_dp_hbr2_hbr3 = { + .entries = _dg1_combo_phy_ddi_translations_dp_hbr2_hbr3, + .num_entries = ARRAY_SIZE(_dg1_combo_phy_ddi_translations_dp_hbr2_hbr3), +}; + +static const union intel_ddi_buf_trans_entry _icl_mg_phy_ddi_translations_rbr_hbr[] = { /* Voltage swing pre-emphasis */ { .mg = { 0x18, 0x00, 0x00 } }, /* 0 0 */ { .mg = { 0x1D, 0x00, 0x05 } }, /* 0 1 */ @@ -577,7 +772,12 @@ static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_rbr_hbr { .mg = { 0x3F, 0x00, 0x00 } }, /* 3 0 */ }; -static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hbr2_hbr3[] = { +static const struct intel_ddi_buf_trans icl_mg_phy_ddi_translations_rbr_hbr = { + .entries = _icl_mg_phy_ddi_translations_rbr_hbr, + .num_entries = ARRAY_SIZE(_icl_mg_phy_ddi_translations_rbr_hbr), +}; + +static const union intel_ddi_buf_trans_entry _icl_mg_phy_ddi_translations_hbr2_hbr3[] = { /* Voltage swing pre-emphasis */ { .mg = { 0x18, 0x00, 0x00 } }, /* 0 0 */ { .mg = { 0x1D, 0x00, 0x05 } }, /* 0 1 */ @@ -591,7 +791,12 @@ static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hbr2_hb { .mg = { 0x3F, 0x00, 0x00 } }, /* 3 0 */ }; -static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hdmi[] = { +static const struct intel_ddi_buf_trans icl_mg_phy_ddi_translations_hbr2_hbr3 = { + .entries = _icl_mg_phy_ddi_translations_hbr2_hbr3, + .num_entries = ARRAY_SIZE(_icl_mg_phy_ddi_translations_hbr2_hbr3), +}; + +static const union intel_ddi_buf_trans_entry _icl_mg_phy_ddi_translations_hdmi[] = { /* HDMI Preset VS Pre-emph */ { .mg = { 0x1A, 0x0, 0x0 } }, /* 1 400mV 0dB */ { .mg = { 0x20, 0x0, 0x0 } }, /* 2 500mV 0dB */ @@ -605,7 +810,12 @@ static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hdmi[] { .mg = { 0x36, 0x0, 0x9 } }, /* 10 Full -3 dB */ }; -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr[] = { +static const struct intel_ddi_buf_trans icl_mg_phy_ddi_translations_hdmi = { + .entries = _icl_mg_phy_ddi_translations_hdmi, + .num_entries = ARRAY_SIZE(_icl_mg_phy_ddi_translations_hdmi), +}; + +static const union intel_ddi_buf_trans_entry _tgl_dkl_phy_ddi_translations_dp_hbr[] = { /* VS pre-emp Non-trans mV Pre-emph dB */ { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ @@ -619,7 +829,12 @@ static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ }; -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr2[] = { +static const struct intel_ddi_buf_trans tgl_dkl_phy_ddi_translations_dp_hbr = { + .entries = _tgl_dkl_phy_ddi_translations_dp_hbr, + .num_entries = ARRAY_SIZE(_tgl_dkl_phy_ddi_translations_dp_hbr), +}; + +static const union intel_ddi_buf_trans_entry _tgl_dkl_phy_ddi_translations_dp_hbr2[] = { /* VS pre-emp Non-trans mV Pre-emph dB */ { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ @@ -633,7 +848,12 @@ static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ }; -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_hdmi[] = { +static const struct intel_ddi_buf_trans tgl_dkl_phy_ddi_translations_dp_hbr2 = { + .entries = _tgl_dkl_phy_ddi_translations_dp_hbr2, + .num_entries = ARRAY_SIZE(_tgl_dkl_phy_ddi_translations_dp_hbr2), +}; + +static const union intel_ddi_buf_trans_entry _tgl_dkl_phy_ddi_translations_hdmi[] = { /* HDMI Preset VS Pre-emph */ { .dkl = { 0x7, 0x0, 0x0 } }, /* 1 400mV 0dB */ { .dkl = { 0x6, 0x0, 0x0 } }, /* 2 500mV 0dB */ @@ -647,7 +867,12 @@ static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_hdmi[] { .dkl = { 0x0, 0x0, 0xA } }, /* 10 Full -3 dB */ }; -static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_hbr[] = { +static const struct intel_ddi_buf_trans tgl_dkl_phy_ddi_translations_hdmi = { + .entries = _tgl_dkl_phy_ddi_translations_hdmi, + .num_entries = ARRAY_SIZE(_tgl_dkl_phy_ddi_translations_hdmi), +}; + +static const union intel_ddi_buf_trans_entry _tgl_combo_phy_ddi_translations_dp_hbr[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ @@ -661,7 +886,12 @@ static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_h { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_hbr2[] = { +static const struct intel_ddi_buf_trans tgl_combo_phy_ddi_translations_dp_hbr = { + .entries = _tgl_combo_phy_ddi_translations_dp_hbr, + .num_entries = ARRAY_SIZE(_tgl_combo_phy_ddi_translations_dp_hbr), +}; + +static const union intel_ddi_buf_trans_entry _tgl_combo_phy_ddi_translations_dp_hbr2[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ @@ -675,7 +905,12 @@ static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_h { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const union intel_ddi_buf_trans_entry tgl_uy_combo_phy_ddi_translations_dp_hbr2[] = { +static const struct intel_ddi_buf_trans tgl_combo_phy_ddi_translations_dp_hbr2 = { + .entries = _tgl_combo_phy_ddi_translations_dp_hbr2, + .num_entries = ARRAY_SIZE(_tgl_combo_phy_ddi_translations_dp_hbr2), +}; + +static const union intel_ddi_buf_trans_entry _tgl_uy_combo_phy_ddi_translations_dp_hbr2[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x4F, 0x36, 0x00, 0x09 } }, /* 350 500 3.1 */ @@ -689,11 +924,16 @@ static const union intel_ddi_buf_trans_entry tgl_uy_combo_phy_ddi_translations_d { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; +static const struct intel_ddi_buf_trans tgl_uy_combo_phy_ddi_translations_dp_hbr2 = { + .entries = _tgl_uy_combo_phy_ddi_translations_dp_hbr2, + .num_entries = ARRAY_SIZE(_tgl_uy_combo_phy_ddi_translations_dp_hbr2), +}; + /* * Cloned the HOBL entry to comply with the voltage and pre-emphasis entries * that DisplayPort specification requires */ -static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_edp_hbr2_hobl[] = { +static const union intel_ddi_buf_trans_entry _tgl_combo_phy_ddi_translations_edp_hbr2_hobl[] = { /* VS pre-emp */ { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 0 */ { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 1 */ @@ -706,7 +946,12 @@ static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_edp_ { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 2 1 */ }; -static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_hbr[] = { +static const struct intel_ddi_buf_trans tgl_combo_phy_ddi_translations_edp_hbr2_hobl = { + .entries = _tgl_combo_phy_ddi_translations_edp_hbr2_hobl, + .num_entries = ARRAY_SIZE(_tgl_combo_phy_ddi_translations_edp_hbr2_hobl), +}; + +static const union intel_ddi_buf_trans_entry _rkl_combo_phy_ddi_translations_dp_hbr[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x2F, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ @@ -720,7 +965,12 @@ static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_h { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { +static const struct intel_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr = { + .entries = _rkl_combo_phy_ddi_translations_dp_hbr, + .num_entries = ARRAY_SIZE(_rkl_combo_phy_ddi_translations_dp_hbr), +}; + +static const union intel_ddi_buf_trans_entry _rkl_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x50, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ @@ -734,7 +984,12 @@ static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_h { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hbr[] = { +static const struct intel_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr2_hbr3 = { + .entries = _rkl_combo_phy_ddi_translations_dp_hbr2_hbr3, + .num_entries = ARRAY_SIZE(_rkl_combo_phy_ddi_translations_dp_hbr2_hbr3), +}; + +static const union intel_ddi_buf_trans_entry _adlp_dkl_phy_ddi_translations_dp_hbr[] = { /* VS pre-emp Non-trans mV Pre-emph dB */ { .dkl = { 0x7, 0x0, 0x01 } }, /* 0 0 400mV 0 dB */ { .dkl = { 0x5, 0x0, 0x06 } }, /* 0 1 400mV 3.5 dB */ @@ -748,7 +1003,12 @@ static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hb { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB */ }; -static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3[] = { +static const struct intel_ddi_buf_trans adlp_dkl_phy_ddi_translations_dp_hbr = { + .entries = _adlp_dkl_phy_ddi_translations_dp_hbr, + .num_entries = ARRAY_SIZE(_adlp_dkl_phy_ddi_translations_dp_hbr), +}; + +static const union intel_ddi_buf_trans_entry _adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3[] = { /* VS pre-emp Non-trans mV Pre-emph dB */ { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ { .dkl = { 0x5, 0x0, 0x04 } }, /* 0 1 400mV 3.5 dB */ @@ -762,9 +1022,14 @@ static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hb { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB */ }; +static const struct intel_ddi_buf_trans adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3 = { + .entries = _adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3, + .num_entries = ARRAY_SIZE(_adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3), +}; + bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table) { - return table == tgl_combo_phy_ddi_translations_edp_hbr2_hobl; + return table == tgl_combo_phy_ddi_translations_edp_hbr2_hobl.entries; } static const union intel_ddi_buf_trans_entry * @@ -773,11 +1038,11 @@ bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (dev_priv->vbt.edp.low_vswing) { - *n_entries = ARRAY_SIZE(bdw_ddi_translations_edp); - return bdw_ddi_translations_edp; + *n_entries = bdw_ddi_translations_edp.num_entries; + return bdw_ddi_translations_edp.entries; } else { - *n_entries = ARRAY_SIZE(bdw_ddi_translations_dp); - return bdw_ddi_translations_dp; + *n_entries = bdw_ddi_translations_dp.num_entries; + return bdw_ddi_translations_dp.entries; } } @@ -787,14 +1052,14 @@ skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (IS_SKL_ULX(dev_priv)) { - *n_entries = ARRAY_SIZE(skl_y_ddi_translations_dp); - return skl_y_ddi_translations_dp; + *n_entries = skl_y_ddi_translations_dp.num_entries; + return skl_y_ddi_translations_dp.entries; } else if (IS_SKL_ULT(dev_priv)) { - *n_entries = ARRAY_SIZE(skl_u_ddi_translations_dp); - return skl_u_ddi_translations_dp; + *n_entries = skl_u_ddi_translations_dp.num_entries; + return skl_u_ddi_translations_dp.entries; } else { - *n_entries = ARRAY_SIZE(skl_ddi_translations_dp); - return skl_ddi_translations_dp; + *n_entries = skl_ddi_translations_dp.num_entries; + return skl_ddi_translations_dp.entries; } } @@ -806,16 +1071,16 @@ kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) if (IS_KBL_ULX(dev_priv) || IS_CFL_ULX(dev_priv) || IS_CML_ULX(dev_priv)) { - *n_entries = ARRAY_SIZE(kbl_y_ddi_translations_dp); - return kbl_y_ddi_translations_dp; + *n_entries = kbl_y_ddi_translations_dp.num_entries; + return kbl_y_ddi_translations_dp.entries; } else if (IS_KBL_ULT(dev_priv) || IS_CFL_ULT(dev_priv) || IS_CML_ULT(dev_priv)) { - *n_entries = ARRAY_SIZE(kbl_u_ddi_translations_dp); - return kbl_u_ddi_translations_dp; + *n_entries = kbl_u_ddi_translations_dp.num_entries; + return kbl_u_ddi_translations_dp.entries; } else { - *n_entries = ARRAY_SIZE(kbl_ddi_translations_dp); - return kbl_ddi_translations_dp; + *n_entries = kbl_ddi_translations_dp.num_entries; + return kbl_ddi_translations_dp.entries; } } @@ -829,17 +1094,17 @@ skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) IS_KBL_ULX(dev_priv) || IS_CFL_ULX(dev_priv) || IS_CML_ULX(dev_priv)) { - *n_entries = ARRAY_SIZE(skl_y_ddi_translations_edp); - return skl_y_ddi_translations_edp; + *n_entries = skl_y_ddi_translations_edp.num_entries; + return skl_y_ddi_translations_edp.entries; } else if (IS_SKL_ULT(dev_priv) || IS_KBL_ULT(dev_priv) || IS_CFL_ULT(dev_priv) || IS_CML_ULT(dev_priv)) { - *n_entries = ARRAY_SIZE(skl_u_ddi_translations_edp); - return skl_u_ddi_translations_edp; + *n_entries = skl_u_ddi_translations_edp.num_entries; + return skl_u_ddi_translations_edp.entries; } else { - *n_entries = ARRAY_SIZE(skl_ddi_translations_edp); - return skl_ddi_translations_edp; + *n_entries = skl_ddi_translations_edp.num_entries; + return skl_ddi_translations_edp.entries; } } @@ -858,11 +1123,11 @@ skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries) IS_KBL_ULX(dev_priv) || IS_CFL_ULX(dev_priv) || IS_CML_ULX(dev_priv)) { - *n_entries = ARRAY_SIZE(skl_y_ddi_translations_hdmi); - return skl_y_ddi_translations_hdmi; + *n_entries = skl_y_ddi_translations_hdmi.num_entries; + return skl_y_ddi_translations_hdmi.entries; } else { - *n_entries = ARRAY_SIZE(skl_ddi_translations_hdmi); - return skl_ddi_translations_hdmi; + *n_entries = skl_ddi_translations_hdmi.num_entries; + return skl_ddi_translations_hdmi.entries; } } @@ -893,11 +1158,11 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); return ddi_translations; } else if (IS_BROADWELL(dev_priv)) { - *n_entries = ARRAY_SIZE(bdw_ddi_translations_dp); - return bdw_ddi_translations_dp; + *n_entries = bdw_ddi_translations_dp.num_entries; + return bdw_ddi_translations_dp.entries; } else if (IS_HASWELL(dev_priv)) { - *n_entries = ARRAY_SIZE(hsw_ddi_translations_dp); - return hsw_ddi_translations_dp; + *n_entries = hsw_ddi_translations_dp.num_entries; + return hsw_ddi_translations_dp.entries; } *n_entries = 0; @@ -917,8 +1182,8 @@ hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) } else if (IS_BROADWELL(dev_priv)) { return bdw_get_buf_trans_edp(encoder, n_entries); } else if (IS_HASWELL(dev_priv)) { - *n_entries = ARRAY_SIZE(hsw_ddi_translations_dp); - return hsw_ddi_translations_dp; + *n_entries = hsw_ddi_translations_dp.num_entries; + return hsw_ddi_translations_dp.entries; } *n_entries = 0; @@ -932,11 +1197,11 @@ hsw_get_buf_trans_fdi(struct intel_encoder *encoder, struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (IS_BROADWELL(dev_priv)) { - *n_entries = ARRAY_SIZE(bdw_ddi_translations_fdi); - return bdw_ddi_translations_fdi; + *n_entries = bdw_ddi_translations_fdi.num_entries; + return bdw_ddi_translations_fdi.entries; } else if (IS_HASWELL(dev_priv)) { - *n_entries = ARRAY_SIZE(hsw_ddi_translations_fdi); - return hsw_ddi_translations_fdi; + *n_entries = hsw_ddi_translations_fdi.num_entries; + return hsw_ddi_translations_fdi.entries; } *n_entries = 0; @@ -952,11 +1217,11 @@ hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) { return skl_get_buf_trans_hdmi(dev_priv, n_entries); } else if (IS_BROADWELL(dev_priv)) { - *n_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi); - return bdw_ddi_translations_hdmi; + *n_entries = bdw_ddi_translations_hdmi.num_entries; + return bdw_ddi_translations_hdmi.entries; } else if (IS_HASWELL(dev_priv)) { - *n_entries = ARRAY_SIZE(hsw_ddi_translations_hdmi); - return hsw_ddi_translations_hdmi; + *n_entries = hsw_ddi_translations_hdmi.num_entries; + return hsw_ddi_translations_hdmi.entries; } *n_entries = 0; @@ -981,8 +1246,8 @@ hsw_get_buf_trans(struct intel_encoder *encoder, static const union intel_ddi_buf_trans_entry * bxt_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { - *n_entries = ARRAY_SIZE(bxt_ddi_translations_dp); - return bxt_ddi_translations_dp; + *n_entries = bxt_ddi_translations_dp.num_entries; + return bxt_ddi_translations_dp.entries; } static const union intel_ddi_buf_trans_entry * @@ -991,8 +1256,8 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (dev_priv->vbt.edp.low_vswing) { - *n_entries = ARRAY_SIZE(bxt_ddi_translations_edp); - return bxt_ddi_translations_edp; + *n_entries = bxt_ddi_translations_edp.num_entries; + return bxt_ddi_translations_edp.entries; } return bxt_get_buf_trans_dp(encoder, n_entries); @@ -1001,8 +1266,8 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) static const union intel_ddi_buf_trans_entry * bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) { - *n_entries = ARRAY_SIZE(bxt_ddi_translations_hdmi); - return bxt_ddi_translations_hdmi; + *n_entries = bxt_ddi_translations_hdmi.num_entries; + return bxt_ddi_translations_hdmi.entries; } const union intel_ddi_buf_trans_entry * @@ -1024,14 +1289,14 @@ cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) u32 voltage = intel_de_read(dev_priv, CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK; if (voltage == VOLTAGE_INFO_0_85V) { - *n_entries = ARRAY_SIZE(cnl_ddi_translations_hdmi_0_85V); - return cnl_ddi_translations_hdmi_0_85V; + *n_entries = cnl_ddi_translations_hdmi_0_85V.num_entries; + return cnl_ddi_translations_hdmi_0_85V.entries; } else if (voltage == VOLTAGE_INFO_0_95V) { - *n_entries = ARRAY_SIZE(cnl_ddi_translations_hdmi_0_95V); - return cnl_ddi_translations_hdmi_0_95V; + *n_entries = cnl_ddi_translations_hdmi_0_95V.num_entries; + return cnl_ddi_translations_hdmi_0_95V.entries; } else if (voltage == VOLTAGE_INFO_1_05V) { - *n_entries = ARRAY_SIZE(cnl_ddi_translations_hdmi_1_05V); - return cnl_ddi_translations_hdmi_1_05V; + *n_entries = cnl_ddi_translations_hdmi_1_05V.num_entries; + return cnl_ddi_translations_hdmi_1_05V.entries; } else { *n_entries = 1; /* shut up gcc */ MISSING_CASE(voltage); @@ -1046,14 +1311,14 @@ cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) u32 voltage = intel_de_read(dev_priv, CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK; if (voltage == VOLTAGE_INFO_0_85V) { - *n_entries = ARRAY_SIZE(cnl_ddi_translations_dp_0_85V); - return cnl_ddi_translations_dp_0_85V; + *n_entries = cnl_ddi_translations_dp_0_85V.num_entries; + return cnl_ddi_translations_dp_0_85V.entries; } else if (voltage == VOLTAGE_INFO_0_95V) { - *n_entries = ARRAY_SIZE(cnl_ddi_translations_dp_0_95V); - return cnl_ddi_translations_dp_0_95V; + *n_entries = cnl_ddi_translations_dp_0_95V.num_entries; + return cnl_ddi_translations_dp_0_95V.entries; } else if (voltage == VOLTAGE_INFO_1_05V) { - *n_entries = ARRAY_SIZE(cnl_ddi_translations_dp_1_05V); - return cnl_ddi_translations_dp_1_05V; + *n_entries = cnl_ddi_translations_dp_1_05V.num_entries; + return cnl_ddi_translations_dp_1_05V.entries; } else { *n_entries = 1; /* shut up gcc */ MISSING_CASE(voltage); @@ -1069,14 +1334,14 @@ cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) if (dev_priv->vbt.edp.low_vswing) { if (voltage == VOLTAGE_INFO_0_85V) { - *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_85V); - return cnl_ddi_translations_edp_0_85V; + *n_entries = cnl_ddi_translations_edp_0_85V.num_entries; + return cnl_ddi_translations_edp_0_85V.entries; } else if (voltage == VOLTAGE_INFO_0_95V) { - *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_95V); - return cnl_ddi_translations_edp_0_95V; + *n_entries = cnl_ddi_translations_edp_0_95V.num_entries; + return cnl_ddi_translations_edp_0_95V.entries; } else if (voltage == VOLTAGE_INFO_1_05V) { - *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_1_05V); - return cnl_ddi_translations_edp_1_05V; + *n_entries = cnl_ddi_translations_edp_1_05V.num_entries; + return cnl_ddi_translations_edp_1_05V.entries; } else { *n_entries = 1; /* shut up gcc */ MISSING_CASE(voltage); @@ -1104,8 +1369,8 @@ icl_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; + *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; + return icl_combo_phy_ddi_translations_hdmi.entries; } static const union intel_ddi_buf_trans_entry * @@ -1113,8 +1378,8 @@ icl_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; + *n_entries = icl_combo_phy_ddi_translations_dp_hbr2.num_entries; + return icl_combo_phy_ddi_translations_dp_hbr2.entries; } static const union intel_ddi_buf_trans_entry * @@ -1125,17 +1390,17 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); 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; + *n_entries = icl_combo_phy_ddi_translations_edp_hbr3.num_entries; + return icl_combo_phy_ddi_translations_edp_hbr3.entries; } else if (dev_priv->vbt.edp.low_vswing) { - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2); - return icl_combo_phy_ddi_translations_edp_hbr2; + *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; + return icl_combo_phy_ddi_translations_edp_hbr2.entries; } else if (IS_DG1(dev_priv) && crtc_state->port_clock > 270000) { - *n_entries = ARRAY_SIZE(dg1_combo_phy_ddi_translations_dp_hbr2_hbr3); - return dg1_combo_phy_ddi_translations_dp_hbr2_hbr3; + *n_entries = dg1_combo_phy_ddi_translations_dp_hbr2_hbr3.num_entries; + return dg1_combo_phy_ddi_translations_dp_hbr2_hbr3.entries; } else if (IS_DG1(dev_priv)) { - *n_entries = ARRAY_SIZE(dg1_combo_phy_ddi_translations_dp_rbr_hbr); - return dg1_combo_phy_ddi_translations_dp_rbr_hbr; + *n_entries = dg1_combo_phy_ddi_translations_dp_rbr_hbr.num_entries; + return dg1_combo_phy_ddi_translations_dp_rbr_hbr.entries; } return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); @@ -1159,8 +1424,8 @@ icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hdmi); - return icl_mg_phy_ddi_translations_hdmi; + *n_entries = icl_mg_phy_ddi_translations_hdmi.num_entries; + return icl_mg_phy_ddi_translations_hdmi.entries; } static const union intel_ddi_buf_trans_entry * @@ -1169,11 +1434,11 @@ icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { if (crtc_state->port_clock > 270000) { - *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hbr2_hbr3); - return icl_mg_phy_ddi_translations_hbr2_hbr3; + *n_entries = icl_mg_phy_ddi_translations_hbr2_hbr3.num_entries; + return icl_mg_phy_ddi_translations_hbr2_hbr3.entries; } else { - *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_rbr_hbr); - return icl_mg_phy_ddi_translations_rbr_hbr; + *n_entries = icl_mg_phy_ddi_translations_rbr_hbr.num_entries; + return icl_mg_phy_ddi_translations_rbr_hbr.entries; } } @@ -1193,8 +1458,8 @@ ehl_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; + *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; + return icl_combo_phy_ddi_translations_hdmi.entries; } static const union intel_ddi_buf_trans_entry * @@ -1202,8 +1467,8 @@ ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = ARRAY_SIZE(ehl_combo_phy_ddi_translations_dp); - return ehl_combo_phy_ddi_translations_dp; + *n_entries = ehl_combo_phy_ddi_translations_dp.num_entries; + return ehl_combo_phy_ddi_translations_dp.entries; } static const union intel_ddi_buf_trans_entry * @@ -1214,8 +1479,8 @@ 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) { - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2); - return icl_combo_phy_ddi_translations_edp_hbr2; + *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; + return icl_combo_phy_ddi_translations_edp_hbr2.entries; } return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); @@ -1239,8 +1504,8 @@ 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; + *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; + return icl_combo_phy_ddi_translations_hdmi.entries; } static const union intel_ddi_buf_trans_entry * @@ -1248,8 +1513,8 @@ 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; + *n_entries = icl_combo_phy_ddi_translations_dp_hbr2.num_entries; + return icl_combo_phy_ddi_translations_dp_hbr2.entries; } static const union intel_ddi_buf_trans_entry * @@ -1261,11 +1526,11 @@ jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, 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; + *n_entries = jsl_combo_phy_ddi_translations_edp_hbr2.num_entries; + return jsl_combo_phy_ddi_translations_edp_hbr2.entries; } else { - *n_entries = ARRAY_SIZE(jsl_combo_phy_ddi_translations_edp_hbr); - return jsl_combo_phy_ddi_translations_edp_hbr; + *n_entries = jsl_combo_phy_ddi_translations_edp_hbr.num_entries; + return jsl_combo_phy_ddi_translations_edp_hbr.entries; } } @@ -1290,8 +1555,8 @@ tgl_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; + *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; + return icl_combo_phy_ddi_translations_hdmi.entries; } static const union intel_ddi_buf_trans_entry * @@ -1303,22 +1568,22 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, if (crtc_state->port_clock > 270000) { if (IS_ROCKETLAKE(dev_priv)) { - *n_entries = ARRAY_SIZE(rkl_combo_phy_ddi_translations_dp_hbr2_hbr3); - return rkl_combo_phy_ddi_translations_dp_hbr2_hbr3; + *n_entries = rkl_combo_phy_ddi_translations_dp_hbr2_hbr3.num_entries; + return rkl_combo_phy_ddi_translations_dp_hbr2_hbr3.entries; } else if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { - *n_entries = ARRAY_SIZE(tgl_uy_combo_phy_ddi_translations_dp_hbr2); - return tgl_uy_combo_phy_ddi_translations_dp_hbr2; + *n_entries = tgl_uy_combo_phy_ddi_translations_dp_hbr2.num_entries; + return tgl_uy_combo_phy_ddi_translations_dp_hbr2.entries; } else { - *n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr2); - return tgl_combo_phy_ddi_translations_dp_hbr2; + *n_entries = tgl_combo_phy_ddi_translations_dp_hbr2.num_entries; + return tgl_combo_phy_ddi_translations_dp_hbr2.entries; } } else { if (IS_ROCKETLAKE(dev_priv)) { - *n_entries = ARRAY_SIZE(rkl_combo_phy_ddi_translations_dp_hbr); - return rkl_combo_phy_ddi_translations_dp_hbr; + *n_entries = rkl_combo_phy_ddi_translations_dp_hbr.num_entries; + return rkl_combo_phy_ddi_translations_dp_hbr.entries; } else { - *n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr); - return tgl_combo_phy_ddi_translations_dp_hbr; + *n_entries = tgl_combo_phy_ddi_translations_dp_hbr.num_entries; + return tgl_combo_phy_ddi_translations_dp_hbr.entries; } } } @@ -1332,14 +1597,14 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, struct intel_dp *intel_dp = enc_to_intel_dp(encoder); 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; + *n_entries = icl_combo_phy_ddi_translations_edp_hbr3.num_entries; + return icl_combo_phy_ddi_translations_edp_hbr3.entries; } else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) { - *n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_edp_hbr2_hobl); - return tgl_combo_phy_ddi_translations_edp_hbr2_hobl; + *n_entries = tgl_combo_phy_ddi_translations_edp_hbr2_hobl.num_entries; + return tgl_combo_phy_ddi_translations_edp_hbr2_hobl.entries; } else if (dev_priv->vbt.edp.low_vswing) { - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2); - return icl_combo_phy_ddi_translations_edp_hbr2; + *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; + return icl_combo_phy_ddi_translations_edp_hbr2.entries; } return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); @@ -1363,8 +1628,8 @@ tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_hdmi); - return tgl_dkl_phy_ddi_translations_hdmi; + *n_entries = tgl_dkl_phy_ddi_translations_hdmi.num_entries; + return tgl_dkl_phy_ddi_translations_hdmi.entries; } static const union intel_ddi_buf_trans_entry * @@ -1373,11 +1638,11 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { if (crtc_state->port_clock > 270000) { - *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_dp_hbr2); - return tgl_dkl_phy_ddi_translations_dp_hbr2; + *n_entries = tgl_dkl_phy_ddi_translations_dp_hbr2.num_entries; + return tgl_dkl_phy_ddi_translations_dp_hbr2.entries; } else { - *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_dp_hbr); - return tgl_dkl_phy_ddi_translations_dp_hbr; + *n_entries = tgl_dkl_phy_ddi_translations_dp_hbr.num_entries; + return tgl_dkl_phy_ddi_translations_dp_hbr.entries; } } @@ -1398,11 +1663,11 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { if (crtc_state->port_clock > 270000) { - *n_entries = ARRAY_SIZE(adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3); - return adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3; + *n_entries = adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3.num_entries; + return adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3.entries; } else { - *n_entries = ARRAY_SIZE(adlp_dkl_phy_ddi_translations_dp_hbr); - return adlp_dkl_phy_ddi_translations_dp_hbr; + *n_entries = adlp_dkl_phy_ddi_translations_dp_hbr.num_entries; + return adlp_dkl_phy_ddi_translations_dp_hbr.entries; } } diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h index 487a4f815470..aa612725d510 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h @@ -53,6 +53,11 @@ union intel_ddi_buf_trans_entry { struct tgl_dkl_phy_ddi_buf_trans dkl; }; +struct intel_ddi_buf_trans { + const union intel_ddi_buf_trans_entry *entries; + u8 num_entries; +}; + bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table); int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 05/17] drm/i915: Wrap the buf trans tables into a struct 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 05/17] drm/i915: Wrap the buf trans tables into a struct Ville Syrjala @ 2021-06-18 12:05 ` Jani Nikula 0 siblings, 0 replies; 39+ messages in thread From: Jani Nikula @ 2021-06-18 12:05 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Put a wrapper struct around the buf trans tables so that > we can declare the number of entries and default HDMI entry > alongside the table. > > @wrap@ > identifier old =~ "^.*translations.*"; > fresh identifier new = "_" ## old; > type T; > @@ > <... > static const T > - old > + new > [] = { > ... > }; > + > + static const struct intel_ddi_buf_trans old = { > + .entries = new, > + .num_entries = ARRAY_SIZE(new), > + }; > ...> > > @@ > identifier wrap.old; > @@ > ( > - ARRAY_SIZE(old) > + old.num_entries > | > - old > + old.entries > ) > > @@ > @@ > union intel_ddi_buf_trans_entry { > ... > }; > + > +struct intel_ddi_buf_trans { > + const union intel_ddi_buf_trans_entry *entries; > + u8 num_entries; > +}; > > v2: Handle adl-p > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Holds for v2. > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > .../drm/i915/display/intel_ddi_buf_trans.c | 621 +++++++++++++----- > .../drm/i915/display/intel_ddi_buf_trans.h | 5 + > 2 files changed, 448 insertions(+), 178 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index 7f3c23d9c1da..5e18056780a8 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -13,7 +13,7 @@ > * them for both DP and FDI transports, allowing those ports to > * automatically adapt to HDMI connections as well > */ > -static const union intel_ddi_buf_trans_entry hsw_ddi_translations_dp[] = { > +static const union intel_ddi_buf_trans_entry _hsw_ddi_translations_dp[] = { > { .hsw = { 0x00FFFFFF, 0x0006000E, 0x0 } }, > { .hsw = { 0x00D75FFF, 0x0005000A, 0x0 } }, > { .hsw = { 0x00C30FFF, 0x00040006, 0x0 } }, > @@ -25,7 +25,12 @@ static const union intel_ddi_buf_trans_entry hsw_ddi_translations_dp[] = { > { .hsw = { 0x80D75FFF, 0x000B0000, 0x0 } }, > }; > > -static const union intel_ddi_buf_trans_entry hsw_ddi_translations_fdi[] = { > +static const struct intel_ddi_buf_trans hsw_ddi_translations_dp = { > + .entries = _hsw_ddi_translations_dp, > + .num_entries = ARRAY_SIZE(_hsw_ddi_translations_dp), > +}; > + > +static const union intel_ddi_buf_trans_entry _hsw_ddi_translations_fdi[] = { > { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, > { .hsw = { 0x00D75FFF, 0x000F000A, 0x0 } }, > { .hsw = { 0x00C30FFF, 0x00060006, 0x0 } }, > @@ -37,7 +42,12 @@ static const union intel_ddi_buf_trans_entry hsw_ddi_translations_fdi[] = { > { .hsw = { 0x00D75FFF, 0x001E0000, 0x0 } }, > }; > > -static const union intel_ddi_buf_trans_entry hsw_ddi_translations_hdmi[] = { > +static const struct intel_ddi_buf_trans hsw_ddi_translations_fdi = { > + .entries = _hsw_ddi_translations_fdi, > + .num_entries = ARRAY_SIZE(_hsw_ddi_translations_fdi), > +}; > + > +static const union intel_ddi_buf_trans_entry _hsw_ddi_translations_hdmi[] = { > /* Idx NT mV d T mV d db */ > { .hsw = { 0x00FFFFFF, 0x0006000E, 0x0 } }, /* 0: 400 400 0 */ > { .hsw = { 0x00E79FFF, 0x000E000C, 0x0 } }, /* 1: 400 500 2 */ > @@ -53,7 +63,12 @@ static const union intel_ddi_buf_trans_entry hsw_ddi_translations_hdmi[] = { > { .hsw = { 0x80FFFFFF, 0x00030002, 0x0 } }, /* 11: 1000 1000 0 */ > }; > > -static const union intel_ddi_buf_trans_entry bdw_ddi_translations_edp[] = { > +static const struct intel_ddi_buf_trans hsw_ddi_translations_hdmi = { > + .entries = _hsw_ddi_translations_hdmi, > + .num_entries = ARRAY_SIZE(_hsw_ddi_translations_hdmi), > +}; > + > +static const union intel_ddi_buf_trans_entry _bdw_ddi_translations_edp[] = { > { .hsw = { 0x00FFFFFF, 0x00000012, 0x0 } }, > { .hsw = { 0x00EBAFFF, 0x00020011, 0x0 } }, > { .hsw = { 0x00C71FFF, 0x0006000F, 0x0 } }, > @@ -65,7 +80,12 @@ static const union intel_ddi_buf_trans_entry bdw_ddi_translations_edp[] = { > { .hsw = { 0x00DB6FFF, 0x000A000C, 0x0 } }, > }; > > -static const union intel_ddi_buf_trans_entry bdw_ddi_translations_dp[] = { > +static const struct intel_ddi_buf_trans bdw_ddi_translations_edp = { > + .entries = _bdw_ddi_translations_edp, > + .num_entries = ARRAY_SIZE(_bdw_ddi_translations_edp), > +}; > + > +static const union intel_ddi_buf_trans_entry _bdw_ddi_translations_dp[] = { > { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, > { .hsw = { 0x00D75FFF, 0x000E000A, 0x0 } }, > { .hsw = { 0x00BEFFFF, 0x00140006, 0x0 } }, > @@ -77,7 +97,12 @@ static const union intel_ddi_buf_trans_entry bdw_ddi_translations_dp[] = { > { .hsw = { 0x80D75FFF, 0x001B0002, 0x0 } }, > }; > > -static const union intel_ddi_buf_trans_entry bdw_ddi_translations_fdi[] = { > +static const struct intel_ddi_buf_trans bdw_ddi_translations_dp = { > + .entries = _bdw_ddi_translations_dp, > + .num_entries = ARRAY_SIZE(_bdw_ddi_translations_dp), > +}; > + > +static const union intel_ddi_buf_trans_entry _bdw_ddi_translations_fdi[] = { > { .hsw = { 0x00FFFFFF, 0x0001000E, 0x0 } }, > { .hsw = { 0x00D75FFF, 0x0004000A, 0x0 } }, > { .hsw = { 0x00C30FFF, 0x00070006, 0x0 } }, > @@ -89,7 +114,12 @@ static const union intel_ddi_buf_trans_entry bdw_ddi_translations_fdi[] = { > { .hsw = { 0x00D75FFF, 0x000C0000, 0x0 } }, > }; > > -static const union intel_ddi_buf_trans_entry bdw_ddi_translations_hdmi[] = { > +static const struct intel_ddi_buf_trans bdw_ddi_translations_fdi = { > + .entries = _bdw_ddi_translations_fdi, > + .num_entries = ARRAY_SIZE(_bdw_ddi_translations_fdi), > +}; > + > +static const union intel_ddi_buf_trans_entry _bdw_ddi_translations_hdmi[] = { > /* Idx NT mV d T mV df db */ > { .hsw = { 0x00FFFFFF, 0x0007000E, 0x0 } }, /* 0: 400 400 0 */ > { .hsw = { 0x00D75FFF, 0x000E000A, 0x0 } }, /* 1: 400 600 3.5 */ > @@ -103,8 +133,13 @@ static const union intel_ddi_buf_trans_entry bdw_ddi_translations_hdmi[] = { > { .hsw = { 0x80FFFFFF, 0x001B0002, 0x0 } }, /* 9: 1000 1000 0 */ > }; > > +static const struct intel_ddi_buf_trans bdw_ddi_translations_hdmi = { > + .entries = _bdw_ddi_translations_hdmi, > + .num_entries = ARRAY_SIZE(_bdw_ddi_translations_hdmi), > +}; > + > /* Skylake H and S */ > -static const union intel_ddi_buf_trans_entry skl_ddi_translations_dp[] = { > +static const union intel_ddi_buf_trans_entry _skl_ddi_translations_dp[] = { > { .hsw = { 0x00002016, 0x000000A0, 0x0 } }, > { .hsw = { 0x00005012, 0x0000009B, 0x0 } }, > { .hsw = { 0x00007011, 0x00000088, 0x0 } }, > @@ -116,8 +151,13 @@ static const union intel_ddi_buf_trans_entry skl_ddi_translations_dp[] = { > { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, > }; > > +static const struct intel_ddi_buf_trans skl_ddi_translations_dp = { > + .entries = _skl_ddi_translations_dp, > + .num_entries = ARRAY_SIZE(_skl_ddi_translations_dp), > +}; > + > /* Skylake U */ > -static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_dp[] = { > +static const union intel_ddi_buf_trans_entry _skl_u_ddi_translations_dp[] = { > { .hsw = { 0x0000201B, 0x000000A2, 0x0 } }, > { .hsw = { 0x00005012, 0x00000088, 0x0 } }, > { .hsw = { 0x80007011, 0x000000CD, 0x1 } }, > @@ -129,8 +169,13 @@ static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_dp[] = { > { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, > }; > > +static const struct intel_ddi_buf_trans skl_u_ddi_translations_dp = { > + .entries = _skl_u_ddi_translations_dp, > + .num_entries = ARRAY_SIZE(_skl_u_ddi_translations_dp), > +}; > + > /* Skylake Y */ > -static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_dp[] = { > +static const union intel_ddi_buf_trans_entry _skl_y_ddi_translations_dp[] = { > { .hsw = { 0x00000018, 0x000000A2, 0x0 } }, > { .hsw = { 0x00005012, 0x00000088, 0x0 } }, > { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, > @@ -142,8 +187,13 @@ static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_dp[] = { > { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, > }; > > +static const struct intel_ddi_buf_trans skl_y_ddi_translations_dp = { > + .entries = _skl_y_ddi_translations_dp, > + .num_entries = ARRAY_SIZE(_skl_y_ddi_translations_dp), > +}; > + > /* Kabylake H and S */ > -static const union intel_ddi_buf_trans_entry kbl_ddi_translations_dp[] = { > +static const union intel_ddi_buf_trans_entry _kbl_ddi_translations_dp[] = { > { .hsw = { 0x00002016, 0x000000A0, 0x0 } }, > { .hsw = { 0x00005012, 0x0000009B, 0x0 } }, > { .hsw = { 0x00007011, 0x00000088, 0x0 } }, > @@ -155,8 +205,13 @@ static const union intel_ddi_buf_trans_entry kbl_ddi_translations_dp[] = { > { .hsw = { 0x80005012, 0x000000C0, 0x1 } }, > }; > > +static const struct intel_ddi_buf_trans kbl_ddi_translations_dp = { > + .entries = _kbl_ddi_translations_dp, > + .num_entries = ARRAY_SIZE(_kbl_ddi_translations_dp), > +}; > + > /* Kabylake U */ > -static const union intel_ddi_buf_trans_entry kbl_u_ddi_translations_dp[] = { > +static const union intel_ddi_buf_trans_entry _kbl_u_ddi_translations_dp[] = { > { .hsw = { 0x0000201B, 0x000000A1, 0x0 } }, > { .hsw = { 0x00005012, 0x00000088, 0x0 } }, > { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, > @@ -168,8 +223,13 @@ static const union intel_ddi_buf_trans_entry kbl_u_ddi_translations_dp[] = { > { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, > }; > > +static const struct intel_ddi_buf_trans kbl_u_ddi_translations_dp = { > + .entries = _kbl_u_ddi_translations_dp, > + .num_entries = ARRAY_SIZE(_kbl_u_ddi_translations_dp), > +}; > + > /* Kabylake Y */ > -static const union intel_ddi_buf_trans_entry kbl_y_ddi_translations_dp[] = { > +static const union intel_ddi_buf_trans_entry _kbl_y_ddi_translations_dp[] = { > { .hsw = { 0x00001017, 0x000000A1, 0x0 } }, > { .hsw = { 0x00005012, 0x00000088, 0x0 } }, > { .hsw = { 0x80007011, 0x000000CD, 0x3 } }, > @@ -181,11 +241,16 @@ static const union intel_ddi_buf_trans_entry kbl_y_ddi_translations_dp[] = { > { .hsw = { 0x80005012, 0x000000C0, 0x3 } }, > }; > > +static const struct intel_ddi_buf_trans kbl_y_ddi_translations_dp = { > + .entries = _kbl_y_ddi_translations_dp, > + .num_entries = ARRAY_SIZE(_kbl_y_ddi_translations_dp), > +}; > + > /* > * Skylake/Kabylake H and S > * eDP 1.4 low vswing translation parameters > */ > -static const union intel_ddi_buf_trans_entry skl_ddi_translations_edp[] = { > +static const union intel_ddi_buf_trans_entry _skl_ddi_translations_edp[] = { > { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, > { .hsw = { 0x00004013, 0x000000A9, 0x0 } }, > { .hsw = { 0x00007011, 0x000000A2, 0x0 } }, > @@ -198,11 +263,16 @@ static const union intel_ddi_buf_trans_entry skl_ddi_translations_edp[] = { > { .hsw = { 0x00000018, 0x000000DF, 0x0 } }, > }; > > +static const struct intel_ddi_buf_trans skl_ddi_translations_edp = { > + .entries = _skl_ddi_translations_edp, > + .num_entries = ARRAY_SIZE(_skl_ddi_translations_edp), > +}; > + > /* > * Skylake/Kabylake U > * eDP 1.4 low vswing translation parameters > */ > -static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_edp[] = { > +static const union intel_ddi_buf_trans_entry _skl_u_ddi_translations_edp[] = { > { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, > { .hsw = { 0x00004013, 0x000000A9, 0x0 } }, > { .hsw = { 0x00007011, 0x000000A2, 0x0 } }, > @@ -215,11 +285,16 @@ static const union intel_ddi_buf_trans_entry skl_u_ddi_translations_edp[] = { > { .hsw = { 0x00000018, 0x000000DF, 0x0 } }, > }; > > +static const struct intel_ddi_buf_trans skl_u_ddi_translations_edp = { > + .entries = _skl_u_ddi_translations_edp, > + .num_entries = ARRAY_SIZE(_skl_u_ddi_translations_edp), > +}; > + > /* > * Skylake/Kabylake Y > * eDP 1.4 low vswing translation parameters > */ > -static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_edp[] = { > +static const union intel_ddi_buf_trans_entry _skl_y_ddi_translations_edp[] = { > { .hsw = { 0x00000018, 0x000000A8, 0x0 } }, > { .hsw = { 0x00004013, 0x000000AB, 0x0 } }, > { .hsw = { 0x00007011, 0x000000A4, 0x0 } }, > @@ -232,8 +307,13 @@ static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_edp[] = { > { .hsw = { 0x00000018, 0x0000008A, 0x0 } }, > }; > > +static const struct intel_ddi_buf_trans skl_y_ddi_translations_edp = { > + .entries = _skl_y_ddi_translations_edp, > + .num_entries = ARRAY_SIZE(_skl_y_ddi_translations_edp), > +}; > + > /* Skylake/Kabylake U, H and S */ > -static const union intel_ddi_buf_trans_entry skl_ddi_translations_hdmi[] = { > +static const union intel_ddi_buf_trans_entry _skl_ddi_translations_hdmi[] = { > { .hsw = { 0x00000018, 0x000000AC, 0x0 } }, > { .hsw = { 0x00005012, 0x0000009D, 0x0 } }, > { .hsw = { 0x00007011, 0x00000088, 0x0 } }, > @@ -247,8 +327,13 @@ static const union intel_ddi_buf_trans_entry skl_ddi_translations_hdmi[] = { > { .hsw = { 0x80000018, 0x000000C0, 0x1 } }, > }; > > +static const struct intel_ddi_buf_trans skl_ddi_translations_hdmi = { > + .entries = _skl_ddi_translations_hdmi, > + .num_entries = ARRAY_SIZE(_skl_ddi_translations_hdmi), > +}; > + > /* Skylake/Kabylake Y */ > -static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_hdmi[] = { > +static const union intel_ddi_buf_trans_entry _skl_y_ddi_translations_hdmi[] = { > { .hsw = { 0x00000018, 0x000000A1, 0x0 } }, > { .hsw = { 0x00005012, 0x000000DF, 0x0 } }, > { .hsw = { 0x80007011, 0x000000CB, 0x3 } }, > @@ -262,7 +347,12 @@ static const union intel_ddi_buf_trans_entry skl_y_ddi_translations_hdmi[] = { > { .hsw = { 0x80000018, 0x000000C0, 0x3 } }, > }; > > -static const union intel_ddi_buf_trans_entry bxt_ddi_translations_dp[] = { > +static const struct intel_ddi_buf_trans skl_y_ddi_translations_hdmi = { > + .entries = _skl_y_ddi_translations_hdmi, > + .num_entries = ARRAY_SIZE(_skl_y_ddi_translations_hdmi), > +}; > + > +static const union intel_ddi_buf_trans_entry _bxt_ddi_translations_dp[] = { > /* Idx NT mV diff db */ > { .bxt = { 52, 0x9A, 0, 128, } }, /* 0: 400 0 */ > { .bxt = { 78, 0x9A, 0, 85, } }, /* 1: 400 3.5 */ > @@ -276,7 +366,12 @@ static const union intel_ddi_buf_trans_entry bxt_ddi_translations_dp[] = { > { .bxt = { 154, 0x9A, 1, 128, } }, /* 9: 1200 0 */ > }; > > -static const union intel_ddi_buf_trans_entry bxt_ddi_translations_edp[] = { > +static const struct intel_ddi_buf_trans bxt_ddi_translations_dp = { > + .entries = _bxt_ddi_translations_dp, > + .num_entries = ARRAY_SIZE(_bxt_ddi_translations_dp), > +}; > + > +static const union intel_ddi_buf_trans_entry _bxt_ddi_translations_edp[] = { > /* Idx NT mV diff db */ > { .bxt = { 26, 0, 0, 128, } }, /* 0: 200 0 */ > { .bxt = { 38, 0, 0, 112, } }, /* 1: 200 1.5 */ > @@ -290,10 +385,15 @@ static const union intel_ddi_buf_trans_entry bxt_ddi_translations_edp[] = { > { .bxt = { 48, 0, 0, 128, } }, /* 9: 300 0 */ > }; > > +static const struct intel_ddi_buf_trans bxt_ddi_translations_edp = { > + .entries = _bxt_ddi_translations_edp, > + .num_entries = ARRAY_SIZE(_bxt_ddi_translations_edp), > +}; > + > /* BSpec has 2 recommended values - entries 0 and 8. > * Using the entry with higher vswing. > */ > -static const union intel_ddi_buf_trans_entry bxt_ddi_translations_hdmi[] = { > +static const union intel_ddi_buf_trans_entry _bxt_ddi_translations_hdmi[] = { > /* Idx NT mV diff db */ > { .bxt = { 52, 0x9A, 0, 128, } }, /* 0: 400 0 */ > { .bxt = { 52, 0x9A, 0, 85, } }, /* 1: 400 3.5 */ > @@ -307,8 +407,13 @@ static const union intel_ddi_buf_trans_entry bxt_ddi_translations_hdmi[] = { > { .bxt = { 154, 0x9A, 1, 128, } }, /* 9: 1200 0 */ > }; > > +static const struct intel_ddi_buf_trans bxt_ddi_translations_hdmi = { > + .entries = _bxt_ddi_translations_hdmi, > + .num_entries = ARRAY_SIZE(_bxt_ddi_translations_hdmi), > +}; > + > /* Voltage Swing Programming for VccIO 0.85V for DP */ > -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_85V[] = { > +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_dp_0_85V[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x5D, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x6A, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ > @@ -322,8 +427,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_85V[] = { > { .cnl = { 0x6, 0x7B, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > +static const struct intel_ddi_buf_trans cnl_ddi_translations_dp_0_85V = { > + .entries = _cnl_ddi_translations_dp_0_85V, > + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_dp_0_85V), > +}; > + > /* Voltage Swing Programming for VccIO 0.85V for HDMI */ > -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_85V[] = { > +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_hdmi_0_85V[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x60, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ > { .cnl = { 0xB, 0x73, 0x36, 0x00, 0x09 } }, /* 450 650 3.2 */ > @@ -334,8 +444,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_85V[] = > { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ > }; > > +static const struct intel_ddi_buf_trans cnl_ddi_translations_hdmi_0_85V = { > + .entries = _cnl_ddi_translations_hdmi_0_85V, > + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_hdmi_0_85V), > +}; > + > /* Voltage Swing Programming for VccIO 0.85V for eDP */ > -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_85V[] = { > +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_edp_0_85V[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x66, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ > { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ > @@ -348,8 +463,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_85V[] = > { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > }; > > +static const struct intel_ddi_buf_trans cnl_ddi_translations_edp_0_85V = { > + .entries = _cnl_ddi_translations_edp_0_85V, > + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_edp_0_85V), > +}; > + > /* Voltage Swing Programming for VccIO 0.95V for DP */ > -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_95V[] = { > +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_dp_0_95V[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x5D, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x6A, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ > @@ -363,8 +483,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_0_95V[] = { > { .cnl = { 0x6, 0x7B, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > +static const struct intel_ddi_buf_trans cnl_ddi_translations_dp_0_95V = { > + .entries = _cnl_ddi_translations_dp_0_95V, > + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_dp_0_95V), > +}; > + > /* Voltage Swing Programming for VccIO 0.95V for HDMI */ > -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_95V[] = { > +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_hdmi_0_95V[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x5C, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > { .cnl = { 0xB, 0x69, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ > @@ -379,8 +504,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_0_95V[] = > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ > }; > > +static const struct intel_ddi_buf_trans cnl_ddi_translations_hdmi_0_95V = { > + .entries = _cnl_ddi_translations_hdmi_0_95V, > + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_hdmi_0_95V), > +}; > + > /* Voltage Swing Programming for VccIO 0.95V for eDP */ > -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_95V[] = { > +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_edp_0_95V[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x61, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ > { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ > @@ -394,8 +524,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_0_95V[] = > { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > }; > > +static const struct intel_ddi_buf_trans cnl_ddi_translations_edp_0_95V = { > + .entries = _cnl_ddi_translations_edp_0_95V, > + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_edp_0_95V), > +}; > + > /* Voltage Swing Programming for VccIO 1.05V for DP */ > -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_1_05V[] = { > +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_dp_1_05V[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x58, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > { .cnl = { 0xB, 0x64, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ > @@ -409,8 +544,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_dp_1_05V[] = { > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ > }; > > +static const struct intel_ddi_buf_trans cnl_ddi_translations_dp_1_05V = { > + .entries = _cnl_ddi_translations_dp_1_05V, > + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_dp_1_05V), > +}; > + > /* Voltage Swing Programming for VccIO 1.05V for HDMI */ > -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_1_05V[] = { > +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_hdmi_1_05V[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x58, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > { .cnl = { 0xB, 0x64, 0x37, 0x00, 0x08 } }, /* 400 600 3.5 */ > @@ -425,8 +565,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_hdmi_1_05V[] = > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 1050 1050 0.0 */ > }; > > +static const struct intel_ddi_buf_trans cnl_ddi_translations_hdmi_1_05V = { > + .entries = _cnl_ddi_translations_hdmi_1_05V, > + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_hdmi_1_05V), > +}; > + > /* Voltage Swing Programming for VccIO 1.05V for eDP */ > -static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_1_05V[] = { > +static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_edp_1_05V[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x5E, 0x3A, 0x00, 0x05 } }, /* 384 500 2.3 */ > { .cnl = { 0x0, 0x7F, 0x38, 0x00, 0x07 } }, /* 153 200 2.3 */ > @@ -439,8 +584,13 @@ static const union intel_ddi_buf_trans_entry cnl_ddi_translations_edp_1_05V[] = > { .cnl = { 0x2, 0x7F, 0x3F, 0x00, 0x00 } }, /* 400 400 0.0 */ > }; > > +static const struct intel_ddi_buf_trans cnl_ddi_translations_edp_1_05V = { > + .entries = _cnl_ddi_translations_edp_1_05V, > + .num_entries = ARRAY_SIZE(_cnl_ddi_translations_edp_1_05V), > +}; > + > /* icl_combo_phy_ddi_translations */ > -static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_dp_hbr2[] = { > +static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_dp_hbr2[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > @@ -454,7 +604,12 @@ static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_dp_h > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_hbr2[] = { > +static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hbr2 = { > + .entries = _icl_combo_phy_ddi_translations_dp_hbr2, > + .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_dp_hbr2), > +}; > + > +static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_edp_hbr2[] = { > /* NT mV Trans mV db */ > { .cnl = { 0x0, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ > { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 200 250 1.9 */ > @@ -468,7 +623,12 @@ static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_ > { .cnl = { 0x9, 0x7F, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_hbr3[] = { > +static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr2 = { > + .entries = _icl_combo_phy_ddi_translations_edp_hbr2, > + .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_edp_hbr2), > +}; > + > +static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_edp_hbr3[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > @@ -482,7 +642,12 @@ static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_edp_ > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_hdmi[] = { > +static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr3 = { > + .entries = _icl_combo_phy_ddi_translations_edp_hbr3, > + .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_edp_hbr3), > +}; > + > +static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_hdmi[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x60, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ > { .cnl = { 0xB, 0x73, 0x36, 0x00, 0x09 } }, /* 450 650 3.2 */ > @@ -493,7 +658,12 @@ static const union intel_ddi_buf_trans_entry icl_combo_phy_ddi_translations_hdmi > { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 850 3.0 */ > }; > > -static const union intel_ddi_buf_trans_entry ehl_combo_phy_ddi_translations_dp[] = { > +static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_hdmi = { > + .entries = _icl_combo_phy_ddi_translations_hdmi, > + .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_hdmi), > +}; > + > +static const union intel_ddi_buf_trans_entry _ehl_combo_phy_ddi_translations_dp[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x33, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x47, 0x36, 0x00, 0x09 } }, /* 350 500 3.1 */ > @@ -507,7 +677,12 @@ static const union intel_ddi_buf_trans_entry ehl_combo_phy_ddi_translations_dp[] > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_hbr[] = { > +static const struct intel_ddi_buf_trans ehl_combo_phy_ddi_translations_dp = { > + .entries = _ehl_combo_phy_ddi_translations_dp, > + .num_entries = ARRAY_SIZE(_ehl_combo_phy_ddi_translations_dp), > +}; > + > +static const union intel_ddi_buf_trans_entry _jsl_combo_phy_ddi_translations_edp_hbr[] = { > /* NT mV Trans mV db */ > { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ > { .cnl = { 0x8, 0x7F, 0x38, 0x00, 0x07 } }, /* 200 250 1.9 */ > @@ -521,7 +696,12 @@ static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_ > { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_hbr2[] = { > +static const struct intel_ddi_buf_trans jsl_combo_phy_ddi_translations_edp_hbr = { > + .entries = _jsl_combo_phy_ddi_translations_edp_hbr, > + .num_entries = ARRAY_SIZE(_jsl_combo_phy_ddi_translations_edp_hbr), > +}; > + > +static const union intel_ddi_buf_trans_entry _jsl_combo_phy_ddi_translations_edp_hbr2[] = { > /* NT mV Trans mV db */ > { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ > { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 250 1.9 */ > @@ -535,7 +715,12 @@ static const union intel_ddi_buf_trans_entry jsl_combo_phy_ddi_translations_edp_ > { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_rbr_hbr[] = { > +static const struct intel_ddi_buf_trans jsl_combo_phy_ddi_translations_edp_hbr2 = { > + .entries = _jsl_combo_phy_ddi_translations_edp_hbr2, > + .num_entries = ARRAY_SIZE(_jsl_combo_phy_ddi_translations_edp_hbr2), > +}; > + > +static const union intel_ddi_buf_trans_entry _dg1_combo_phy_ddi_translations_dp_rbr_hbr[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x48, 0x35, 0x00, 0x0A } }, /* 350 500 3.1 */ > @@ -549,7 +734,12 @@ static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_r > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { > +static const struct intel_ddi_buf_trans dg1_combo_phy_ddi_translations_dp_rbr_hbr = { > + .entries = _dg1_combo_phy_ddi_translations_dp_rbr_hbr, > + .num_entries = ARRAY_SIZE(_dg1_combo_phy_ddi_translations_dp_rbr_hbr), > +}; > + > +static const union intel_ddi_buf_trans_entry _dg1_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x48, 0x35, 0x00, 0x0A } }, /* 350 500 3.1 */ > @@ -563,7 +753,12 @@ static const union intel_ddi_buf_trans_entry dg1_combo_phy_ddi_translations_dp_h > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_rbr_hbr[] = { > +static const struct intel_ddi_buf_trans dg1_combo_phy_ddi_translations_dp_hbr2_hbr3 = { > + .entries = _dg1_combo_phy_ddi_translations_dp_hbr2_hbr3, > + .num_entries = ARRAY_SIZE(_dg1_combo_phy_ddi_translations_dp_hbr2_hbr3), > +}; > + > +static const union intel_ddi_buf_trans_entry _icl_mg_phy_ddi_translations_rbr_hbr[] = { > /* Voltage swing pre-emphasis */ > { .mg = { 0x18, 0x00, 0x00 } }, /* 0 0 */ > { .mg = { 0x1D, 0x00, 0x05 } }, /* 0 1 */ > @@ -577,7 +772,12 @@ static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_rbr_hbr > { .mg = { 0x3F, 0x00, 0x00 } }, /* 3 0 */ > }; > > -static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hbr2_hbr3[] = { > +static const struct intel_ddi_buf_trans icl_mg_phy_ddi_translations_rbr_hbr = { > + .entries = _icl_mg_phy_ddi_translations_rbr_hbr, > + .num_entries = ARRAY_SIZE(_icl_mg_phy_ddi_translations_rbr_hbr), > +}; > + > +static const union intel_ddi_buf_trans_entry _icl_mg_phy_ddi_translations_hbr2_hbr3[] = { > /* Voltage swing pre-emphasis */ > { .mg = { 0x18, 0x00, 0x00 } }, /* 0 0 */ > { .mg = { 0x1D, 0x00, 0x05 } }, /* 0 1 */ > @@ -591,7 +791,12 @@ static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hbr2_hb > { .mg = { 0x3F, 0x00, 0x00 } }, /* 3 0 */ > }; > > -static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hdmi[] = { > +static const struct intel_ddi_buf_trans icl_mg_phy_ddi_translations_hbr2_hbr3 = { > + .entries = _icl_mg_phy_ddi_translations_hbr2_hbr3, > + .num_entries = ARRAY_SIZE(_icl_mg_phy_ddi_translations_hbr2_hbr3), > +}; > + > +static const union intel_ddi_buf_trans_entry _icl_mg_phy_ddi_translations_hdmi[] = { > /* HDMI Preset VS Pre-emph */ > { .mg = { 0x1A, 0x0, 0x0 } }, /* 1 400mV 0dB */ > { .mg = { 0x20, 0x0, 0x0 } }, /* 2 500mV 0dB */ > @@ -605,7 +810,12 @@ static const union intel_ddi_buf_trans_entry icl_mg_phy_ddi_translations_hdmi[] > { .mg = { 0x36, 0x0, 0x9 } }, /* 10 Full -3 dB */ > }; > > -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr[] = { > +static const struct intel_ddi_buf_trans icl_mg_phy_ddi_translations_hdmi = { > + .entries = _icl_mg_phy_ddi_translations_hdmi, > + .num_entries = ARRAY_SIZE(_icl_mg_phy_ddi_translations_hdmi), > +}; > + > +static const union intel_ddi_buf_trans_entry _tgl_dkl_phy_ddi_translations_dp_hbr[] = { > /* VS pre-emp Non-trans mV Pre-emph dB */ > { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ > { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ > @@ -619,7 +829,12 @@ static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr > { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ > }; > > -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr2[] = { > +static const struct intel_ddi_buf_trans tgl_dkl_phy_ddi_translations_dp_hbr = { > + .entries = _tgl_dkl_phy_ddi_translations_dp_hbr, > + .num_entries = ARRAY_SIZE(_tgl_dkl_phy_ddi_translations_dp_hbr), > +}; > + > +static const union intel_ddi_buf_trans_entry _tgl_dkl_phy_ddi_translations_dp_hbr2[] = { > /* VS pre-emp Non-trans mV Pre-emph dB */ > { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ > { .dkl = { 0x5, 0x0, 0x05 } }, /* 0 1 400mV 3.5 dB */ > @@ -633,7 +848,12 @@ static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_dp_hbr > { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB HDMI default */ > }; > > -static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_hdmi[] = { > +static const struct intel_ddi_buf_trans tgl_dkl_phy_ddi_translations_dp_hbr2 = { > + .entries = _tgl_dkl_phy_ddi_translations_dp_hbr2, > + .num_entries = ARRAY_SIZE(_tgl_dkl_phy_ddi_translations_dp_hbr2), > +}; > + > +static const union intel_ddi_buf_trans_entry _tgl_dkl_phy_ddi_translations_hdmi[] = { > /* HDMI Preset VS Pre-emph */ > { .dkl = { 0x7, 0x0, 0x0 } }, /* 1 400mV 0dB */ > { .dkl = { 0x6, 0x0, 0x0 } }, /* 2 500mV 0dB */ > @@ -647,7 +867,12 @@ static const union intel_ddi_buf_trans_entry tgl_dkl_phy_ddi_translations_hdmi[] > { .dkl = { 0x0, 0x0, 0xA } }, /* 10 Full -3 dB */ > }; > > -static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_hbr[] = { > +static const struct intel_ddi_buf_trans tgl_dkl_phy_ddi_translations_hdmi = { > + .entries = _tgl_dkl_phy_ddi_translations_hdmi, > + .num_entries = ARRAY_SIZE(_tgl_dkl_phy_ddi_translations_hdmi), > +}; > + > +static const union intel_ddi_buf_trans_entry _tgl_combo_phy_ddi_translations_dp_hbr[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > @@ -661,7 +886,12 @@ static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_h > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_hbr2[] = { > +static const struct intel_ddi_buf_trans tgl_combo_phy_ddi_translations_dp_hbr = { > + .entries = _tgl_combo_phy_ddi_translations_dp_hbr, > + .num_entries = ARRAY_SIZE(_tgl_combo_phy_ddi_translations_dp_hbr), > +}; > + > +static const union intel_ddi_buf_trans_entry _tgl_combo_phy_ddi_translations_dp_hbr2[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > @@ -675,7 +905,12 @@ static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_dp_h > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry tgl_uy_combo_phy_ddi_translations_dp_hbr2[] = { > +static const struct intel_ddi_buf_trans tgl_combo_phy_ddi_translations_dp_hbr2 = { > + .entries = _tgl_combo_phy_ddi_translations_dp_hbr2, > + .num_entries = ARRAY_SIZE(_tgl_combo_phy_ddi_translations_dp_hbr2), > +}; > + > +static const union intel_ddi_buf_trans_entry _tgl_uy_combo_phy_ddi_translations_dp_hbr2[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x4F, 0x36, 0x00, 0x09 } }, /* 350 500 3.1 */ > @@ -689,11 +924,16 @@ static const union intel_ddi_buf_trans_entry tgl_uy_combo_phy_ddi_translations_d > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > +static const struct intel_ddi_buf_trans tgl_uy_combo_phy_ddi_translations_dp_hbr2 = { > + .entries = _tgl_uy_combo_phy_ddi_translations_dp_hbr2, > + .num_entries = ARRAY_SIZE(_tgl_uy_combo_phy_ddi_translations_dp_hbr2), > +}; > + > /* > * Cloned the HOBL entry to comply with the voltage and pre-emphasis entries > * that DisplayPort specification requires > */ > -static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_edp_hbr2_hobl[] = { > +static const union intel_ddi_buf_trans_entry _tgl_combo_phy_ddi_translations_edp_hbr2_hobl[] = { > /* VS pre-emp */ > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 0 */ > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 0 1 */ > @@ -706,7 +946,12 @@ static const union intel_ddi_buf_trans_entry tgl_combo_phy_ddi_translations_edp_ > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 2 1 */ > }; > > -static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_hbr[] = { > +static const struct intel_ddi_buf_trans tgl_combo_phy_ddi_translations_edp_hbr2_hobl = { > + .entries = _tgl_combo_phy_ddi_translations_edp_hbr2_hobl, > + .num_entries = ARRAY_SIZE(_tgl_combo_phy_ddi_translations_edp_hbr2_hobl), > +}; > + > +static const union intel_ddi_buf_trans_entry _rkl_combo_phy_ddi_translations_dp_hbr[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x2F, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > @@ -720,7 +965,12 @@ static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_h > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { > +static const struct intel_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr = { > + .entries = _rkl_combo_phy_ddi_translations_dp_hbr, > + .num_entries = ARRAY_SIZE(_rkl_combo_phy_ddi_translations_dp_hbr), > +}; > + > +static const union intel_ddi_buf_trans_entry _rkl_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x50, 0x38, 0x00, 0x07 } }, /* 350 500 3.1 */ > @@ -734,7 +984,12 @@ static const union intel_ddi_buf_trans_entry rkl_combo_phy_ddi_translations_dp_h > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hbr[] = { > +static const struct intel_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr2_hbr3 = { > + .entries = _rkl_combo_phy_ddi_translations_dp_hbr2_hbr3, > + .num_entries = ARRAY_SIZE(_rkl_combo_phy_ddi_translations_dp_hbr2_hbr3), > +}; > + > +static const union intel_ddi_buf_trans_entry _adlp_dkl_phy_ddi_translations_dp_hbr[] = { > /* VS pre-emp Non-trans mV Pre-emph dB */ > { .dkl = { 0x7, 0x0, 0x01 } }, /* 0 0 400mV 0 dB */ > { .dkl = { 0x5, 0x0, 0x06 } }, /* 0 1 400mV 3.5 dB */ > @@ -748,7 +1003,12 @@ static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hb > { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB */ > }; > > -static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3[] = { > +static const struct intel_ddi_buf_trans adlp_dkl_phy_ddi_translations_dp_hbr = { > + .entries = _adlp_dkl_phy_ddi_translations_dp_hbr, > + .num_entries = ARRAY_SIZE(_adlp_dkl_phy_ddi_translations_dp_hbr), > +}; > + > +static const union intel_ddi_buf_trans_entry _adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3[] = { > /* VS pre-emp Non-trans mV Pre-emph dB */ > { .dkl = { 0x7, 0x0, 0x00 } }, /* 0 0 400mV 0 dB */ > { .dkl = { 0x5, 0x0, 0x04 } }, /* 0 1 400mV 3.5 dB */ > @@ -762,9 +1022,14 @@ static const union intel_ddi_buf_trans_entry adlp_dkl_phy_ddi_translations_dp_hb > { .dkl = { 0x0, 0x0, 0x00 } }, /* 3 0 1200mV 0 dB */ > }; > > +static const struct intel_ddi_buf_trans adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3 = { > + .entries = _adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3, > + .num_entries = ARRAY_SIZE(_adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3), > +}; > + > bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table) > { > - return table == tgl_combo_phy_ddi_translations_edp_hbr2_hobl; > + return table == tgl_combo_phy_ddi_translations_edp_hbr2_hobl.entries; > } > > static const union intel_ddi_buf_trans_entry * > @@ -773,11 +1038,11 @@ bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (dev_priv->vbt.edp.low_vswing) { > - *n_entries = ARRAY_SIZE(bdw_ddi_translations_edp); > - return bdw_ddi_translations_edp; > + *n_entries = bdw_ddi_translations_edp.num_entries; > + return bdw_ddi_translations_edp.entries; > } else { > - *n_entries = ARRAY_SIZE(bdw_ddi_translations_dp); > - return bdw_ddi_translations_dp; > + *n_entries = bdw_ddi_translations_dp.num_entries; > + return bdw_ddi_translations_dp.entries; > } > } > > @@ -787,14 +1052,14 @@ skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (IS_SKL_ULX(dev_priv)) { > - *n_entries = ARRAY_SIZE(skl_y_ddi_translations_dp); > - return skl_y_ddi_translations_dp; > + *n_entries = skl_y_ddi_translations_dp.num_entries; > + return skl_y_ddi_translations_dp.entries; > } else if (IS_SKL_ULT(dev_priv)) { > - *n_entries = ARRAY_SIZE(skl_u_ddi_translations_dp); > - return skl_u_ddi_translations_dp; > + *n_entries = skl_u_ddi_translations_dp.num_entries; > + return skl_u_ddi_translations_dp.entries; > } else { > - *n_entries = ARRAY_SIZE(skl_ddi_translations_dp); > - return skl_ddi_translations_dp; > + *n_entries = skl_ddi_translations_dp.num_entries; > + return skl_ddi_translations_dp.entries; > } > } > > @@ -806,16 +1071,16 @@ kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > if (IS_KBL_ULX(dev_priv) || > IS_CFL_ULX(dev_priv) || > IS_CML_ULX(dev_priv)) { > - *n_entries = ARRAY_SIZE(kbl_y_ddi_translations_dp); > - return kbl_y_ddi_translations_dp; > + *n_entries = kbl_y_ddi_translations_dp.num_entries; > + return kbl_y_ddi_translations_dp.entries; > } else if (IS_KBL_ULT(dev_priv) || > IS_CFL_ULT(dev_priv) || > IS_CML_ULT(dev_priv)) { > - *n_entries = ARRAY_SIZE(kbl_u_ddi_translations_dp); > - return kbl_u_ddi_translations_dp; > + *n_entries = kbl_u_ddi_translations_dp.num_entries; > + return kbl_u_ddi_translations_dp.entries; > } else { > - *n_entries = ARRAY_SIZE(kbl_ddi_translations_dp); > - return kbl_ddi_translations_dp; > + *n_entries = kbl_ddi_translations_dp.num_entries; > + return kbl_ddi_translations_dp.entries; > } > } > > @@ -829,17 +1094,17 @@ skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > IS_KBL_ULX(dev_priv) || > IS_CFL_ULX(dev_priv) || > IS_CML_ULX(dev_priv)) { > - *n_entries = ARRAY_SIZE(skl_y_ddi_translations_edp); > - return skl_y_ddi_translations_edp; > + *n_entries = skl_y_ddi_translations_edp.num_entries; > + return skl_y_ddi_translations_edp.entries; > } else if (IS_SKL_ULT(dev_priv) || > IS_KBL_ULT(dev_priv) || > IS_CFL_ULT(dev_priv) || > IS_CML_ULT(dev_priv)) { > - *n_entries = ARRAY_SIZE(skl_u_ddi_translations_edp); > - return skl_u_ddi_translations_edp; > + *n_entries = skl_u_ddi_translations_edp.num_entries; > + return skl_u_ddi_translations_edp.entries; > } else { > - *n_entries = ARRAY_SIZE(skl_ddi_translations_edp); > - return skl_ddi_translations_edp; > + *n_entries = skl_ddi_translations_edp.num_entries; > + return skl_ddi_translations_edp.entries; > } > } > > @@ -858,11 +1123,11 @@ skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries) > IS_KBL_ULX(dev_priv) || > IS_CFL_ULX(dev_priv) || > IS_CML_ULX(dev_priv)) { > - *n_entries = ARRAY_SIZE(skl_y_ddi_translations_hdmi); > - return skl_y_ddi_translations_hdmi; > + *n_entries = skl_y_ddi_translations_hdmi.num_entries; > + return skl_y_ddi_translations_hdmi.entries; > } else { > - *n_entries = ARRAY_SIZE(skl_ddi_translations_hdmi); > - return skl_ddi_translations_hdmi; > + *n_entries = skl_ddi_translations_hdmi.num_entries; > + return skl_ddi_translations_hdmi.entries; > } > } > > @@ -893,11 +1158,11 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); > return ddi_translations; > } else if (IS_BROADWELL(dev_priv)) { > - *n_entries = ARRAY_SIZE(bdw_ddi_translations_dp); > - return bdw_ddi_translations_dp; > + *n_entries = bdw_ddi_translations_dp.num_entries; > + return bdw_ddi_translations_dp.entries; > } else if (IS_HASWELL(dev_priv)) { > - *n_entries = ARRAY_SIZE(hsw_ddi_translations_dp); > - return hsw_ddi_translations_dp; > + *n_entries = hsw_ddi_translations_dp.num_entries; > + return hsw_ddi_translations_dp.entries; > } > > *n_entries = 0; > @@ -917,8 +1182,8 @@ hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > } else if (IS_BROADWELL(dev_priv)) { > return bdw_get_buf_trans_edp(encoder, n_entries); > } else if (IS_HASWELL(dev_priv)) { > - *n_entries = ARRAY_SIZE(hsw_ddi_translations_dp); > - return hsw_ddi_translations_dp; > + *n_entries = hsw_ddi_translations_dp.num_entries; > + return hsw_ddi_translations_dp.entries; > } > > *n_entries = 0; > @@ -932,11 +1197,11 @@ hsw_get_buf_trans_fdi(struct intel_encoder *encoder, > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (IS_BROADWELL(dev_priv)) { > - *n_entries = ARRAY_SIZE(bdw_ddi_translations_fdi); > - return bdw_ddi_translations_fdi; > + *n_entries = bdw_ddi_translations_fdi.num_entries; > + return bdw_ddi_translations_fdi.entries; > } else if (IS_HASWELL(dev_priv)) { > - *n_entries = ARRAY_SIZE(hsw_ddi_translations_fdi); > - return hsw_ddi_translations_fdi; > + *n_entries = hsw_ddi_translations_fdi.num_entries; > + return hsw_ddi_translations_fdi.entries; > } > > *n_entries = 0; > @@ -952,11 +1217,11 @@ hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, > if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) { > return skl_get_buf_trans_hdmi(dev_priv, n_entries); > } else if (IS_BROADWELL(dev_priv)) { > - *n_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi); > - return bdw_ddi_translations_hdmi; > + *n_entries = bdw_ddi_translations_hdmi.num_entries; > + return bdw_ddi_translations_hdmi.entries; > } else if (IS_HASWELL(dev_priv)) { > - *n_entries = ARRAY_SIZE(hsw_ddi_translations_hdmi); > - return hsw_ddi_translations_hdmi; > + *n_entries = hsw_ddi_translations_hdmi.num_entries; > + return hsw_ddi_translations_hdmi.entries; > } > > *n_entries = 0; > @@ -981,8 +1246,8 @@ hsw_get_buf_trans(struct intel_encoder *encoder, > static const union intel_ddi_buf_trans_entry * > bxt_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > - *n_entries = ARRAY_SIZE(bxt_ddi_translations_dp); > - return bxt_ddi_translations_dp; > + *n_entries = bxt_ddi_translations_dp.num_entries; > + return bxt_ddi_translations_dp.entries; > } > > static const union intel_ddi_buf_trans_entry * > @@ -991,8 +1256,8 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (dev_priv->vbt.edp.low_vswing) { > - *n_entries = ARRAY_SIZE(bxt_ddi_translations_edp); > - return bxt_ddi_translations_edp; > + *n_entries = bxt_ddi_translations_edp.num_entries; > + return bxt_ddi_translations_edp.entries; > } > > return bxt_get_buf_trans_dp(encoder, n_entries); > @@ -1001,8 +1266,8 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > static const union intel_ddi_buf_trans_entry * > bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) > { > - *n_entries = ARRAY_SIZE(bxt_ddi_translations_hdmi); > - return bxt_ddi_translations_hdmi; > + *n_entries = bxt_ddi_translations_hdmi.num_entries; > + return bxt_ddi_translations_hdmi.entries; > } > > const union intel_ddi_buf_trans_entry * > @@ -1024,14 +1289,14 @@ cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) > u32 voltage = intel_de_read(dev_priv, CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK; > > if (voltage == VOLTAGE_INFO_0_85V) { > - *n_entries = ARRAY_SIZE(cnl_ddi_translations_hdmi_0_85V); > - return cnl_ddi_translations_hdmi_0_85V; > + *n_entries = cnl_ddi_translations_hdmi_0_85V.num_entries; > + return cnl_ddi_translations_hdmi_0_85V.entries; > } else if (voltage == VOLTAGE_INFO_0_95V) { > - *n_entries = ARRAY_SIZE(cnl_ddi_translations_hdmi_0_95V); > - return cnl_ddi_translations_hdmi_0_95V; > + *n_entries = cnl_ddi_translations_hdmi_0_95V.num_entries; > + return cnl_ddi_translations_hdmi_0_95V.entries; > } else if (voltage == VOLTAGE_INFO_1_05V) { > - *n_entries = ARRAY_SIZE(cnl_ddi_translations_hdmi_1_05V); > - return cnl_ddi_translations_hdmi_1_05V; > + *n_entries = cnl_ddi_translations_hdmi_1_05V.num_entries; > + return cnl_ddi_translations_hdmi_1_05V.entries; > } else { > *n_entries = 1; /* shut up gcc */ > MISSING_CASE(voltage); > @@ -1046,14 +1311,14 @@ cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > u32 voltage = intel_de_read(dev_priv, CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK; > > if (voltage == VOLTAGE_INFO_0_85V) { > - *n_entries = ARRAY_SIZE(cnl_ddi_translations_dp_0_85V); > - return cnl_ddi_translations_dp_0_85V; > + *n_entries = cnl_ddi_translations_dp_0_85V.num_entries; > + return cnl_ddi_translations_dp_0_85V.entries; > } else if (voltage == VOLTAGE_INFO_0_95V) { > - *n_entries = ARRAY_SIZE(cnl_ddi_translations_dp_0_95V); > - return cnl_ddi_translations_dp_0_95V; > + *n_entries = cnl_ddi_translations_dp_0_95V.num_entries; > + return cnl_ddi_translations_dp_0_95V.entries; > } else if (voltage == VOLTAGE_INFO_1_05V) { > - *n_entries = ARRAY_SIZE(cnl_ddi_translations_dp_1_05V); > - return cnl_ddi_translations_dp_1_05V; > + *n_entries = cnl_ddi_translations_dp_1_05V.num_entries; > + return cnl_ddi_translations_dp_1_05V.entries; > } else { > *n_entries = 1; /* shut up gcc */ > MISSING_CASE(voltage); > @@ -1069,14 +1334,14 @@ cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > > if (dev_priv->vbt.edp.low_vswing) { > if (voltage == VOLTAGE_INFO_0_85V) { > - *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_85V); > - return cnl_ddi_translations_edp_0_85V; > + *n_entries = cnl_ddi_translations_edp_0_85V.num_entries; > + return cnl_ddi_translations_edp_0_85V.entries; > } else if (voltage == VOLTAGE_INFO_0_95V) { > - *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_95V); > - return cnl_ddi_translations_edp_0_95V; > + *n_entries = cnl_ddi_translations_edp_0_95V.num_entries; > + return cnl_ddi_translations_edp_0_95V.entries; > } else if (voltage == VOLTAGE_INFO_1_05V) { > - *n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_1_05V); > - return cnl_ddi_translations_edp_1_05V; > + *n_entries = cnl_ddi_translations_edp_1_05V.num_entries; > + return cnl_ddi_translations_edp_1_05V.entries; > } else { > *n_entries = 1; /* shut up gcc */ > MISSING_CASE(voltage); > @@ -1104,8 +1369,8 @@ icl_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; > + *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; > + return icl_combo_phy_ddi_translations_hdmi.entries; > } > > static const union intel_ddi_buf_trans_entry * > @@ -1113,8 +1378,8 @@ icl_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; > + *n_entries = icl_combo_phy_ddi_translations_dp_hbr2.num_entries; > + return icl_combo_phy_ddi_translations_dp_hbr2.entries; > } > > static const union intel_ddi_buf_trans_entry * > @@ -1125,17 +1390,17 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > 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; > + *n_entries = icl_combo_phy_ddi_translations_edp_hbr3.num_entries; > + return icl_combo_phy_ddi_translations_edp_hbr3.entries; > } else if (dev_priv->vbt.edp.low_vswing) { > - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2); > - return icl_combo_phy_ddi_translations_edp_hbr2; > + *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; > + return icl_combo_phy_ddi_translations_edp_hbr2.entries; > } else if (IS_DG1(dev_priv) && crtc_state->port_clock > 270000) { > - *n_entries = ARRAY_SIZE(dg1_combo_phy_ddi_translations_dp_hbr2_hbr3); > - return dg1_combo_phy_ddi_translations_dp_hbr2_hbr3; > + *n_entries = dg1_combo_phy_ddi_translations_dp_hbr2_hbr3.num_entries; > + return dg1_combo_phy_ddi_translations_dp_hbr2_hbr3.entries; > } else if (IS_DG1(dev_priv)) { > - *n_entries = ARRAY_SIZE(dg1_combo_phy_ddi_translations_dp_rbr_hbr); > - return dg1_combo_phy_ddi_translations_dp_rbr_hbr; > + *n_entries = dg1_combo_phy_ddi_translations_dp_rbr_hbr.num_entries; > + return dg1_combo_phy_ddi_translations_dp_rbr_hbr.entries; > } > > return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > @@ -1159,8 +1424,8 @@ icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hdmi); > - return icl_mg_phy_ddi_translations_hdmi; > + *n_entries = icl_mg_phy_ddi_translations_hdmi.num_entries; > + return icl_mg_phy_ddi_translations_hdmi.entries; > } > > static const union intel_ddi_buf_trans_entry * > @@ -1169,11 +1434,11 @@ icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, > int *n_entries) > { > if (crtc_state->port_clock > 270000) { > - *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hbr2_hbr3); > - return icl_mg_phy_ddi_translations_hbr2_hbr3; > + *n_entries = icl_mg_phy_ddi_translations_hbr2_hbr3.num_entries; > + return icl_mg_phy_ddi_translations_hbr2_hbr3.entries; > } else { > - *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_rbr_hbr); > - return icl_mg_phy_ddi_translations_rbr_hbr; > + *n_entries = icl_mg_phy_ddi_translations_rbr_hbr.num_entries; > + return icl_mg_phy_ddi_translations_rbr_hbr.entries; > } > } > > @@ -1193,8 +1458,8 @@ ehl_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; > + *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; > + return icl_combo_phy_ddi_translations_hdmi.entries; > } > > static const union intel_ddi_buf_trans_entry * > @@ -1202,8 +1467,8 @@ ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = ARRAY_SIZE(ehl_combo_phy_ddi_translations_dp); > - return ehl_combo_phy_ddi_translations_dp; > + *n_entries = ehl_combo_phy_ddi_translations_dp.num_entries; > + return ehl_combo_phy_ddi_translations_dp.entries; > } > > static const union intel_ddi_buf_trans_entry * > @@ -1214,8 +1479,8 @@ 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) { > - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2); > - return icl_combo_phy_ddi_translations_edp_hbr2; > + *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; > + return icl_combo_phy_ddi_translations_edp_hbr2.entries; > } > > return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > @@ -1239,8 +1504,8 @@ 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; > + *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; > + return icl_combo_phy_ddi_translations_hdmi.entries; > } > > static const union intel_ddi_buf_trans_entry * > @@ -1248,8 +1513,8 @@ 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; > + *n_entries = icl_combo_phy_ddi_translations_dp_hbr2.num_entries; > + return icl_combo_phy_ddi_translations_dp_hbr2.entries; > } > > static const union intel_ddi_buf_trans_entry * > @@ -1261,11 +1526,11 @@ jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > > 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; > + *n_entries = jsl_combo_phy_ddi_translations_edp_hbr2.num_entries; > + return jsl_combo_phy_ddi_translations_edp_hbr2.entries; > } else { > - *n_entries = ARRAY_SIZE(jsl_combo_phy_ddi_translations_edp_hbr); > - return jsl_combo_phy_ddi_translations_edp_hbr; > + *n_entries = jsl_combo_phy_ddi_translations_edp_hbr.num_entries; > + return jsl_combo_phy_ddi_translations_edp_hbr.entries; > } > } > > @@ -1290,8 +1555,8 @@ tgl_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; > + *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; > + return icl_combo_phy_ddi_translations_hdmi.entries; > } > > static const union intel_ddi_buf_trans_entry * > @@ -1303,22 +1568,22 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > > if (crtc_state->port_clock > 270000) { > if (IS_ROCKETLAKE(dev_priv)) { > - *n_entries = ARRAY_SIZE(rkl_combo_phy_ddi_translations_dp_hbr2_hbr3); > - return rkl_combo_phy_ddi_translations_dp_hbr2_hbr3; > + *n_entries = rkl_combo_phy_ddi_translations_dp_hbr2_hbr3.num_entries; > + return rkl_combo_phy_ddi_translations_dp_hbr2_hbr3.entries; > } else if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { > - *n_entries = ARRAY_SIZE(tgl_uy_combo_phy_ddi_translations_dp_hbr2); > - return tgl_uy_combo_phy_ddi_translations_dp_hbr2; > + *n_entries = tgl_uy_combo_phy_ddi_translations_dp_hbr2.num_entries; > + return tgl_uy_combo_phy_ddi_translations_dp_hbr2.entries; > } else { > - *n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr2); > - return tgl_combo_phy_ddi_translations_dp_hbr2; > + *n_entries = tgl_combo_phy_ddi_translations_dp_hbr2.num_entries; > + return tgl_combo_phy_ddi_translations_dp_hbr2.entries; > } > } else { > if (IS_ROCKETLAKE(dev_priv)) { > - *n_entries = ARRAY_SIZE(rkl_combo_phy_ddi_translations_dp_hbr); > - return rkl_combo_phy_ddi_translations_dp_hbr; > + *n_entries = rkl_combo_phy_ddi_translations_dp_hbr.num_entries; > + return rkl_combo_phy_ddi_translations_dp_hbr.entries; > } else { > - *n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr); > - return tgl_combo_phy_ddi_translations_dp_hbr; > + *n_entries = tgl_combo_phy_ddi_translations_dp_hbr.num_entries; > + return tgl_combo_phy_ddi_translations_dp_hbr.entries; > } > } > } > @@ -1332,14 +1597,14 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > > 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; > + *n_entries = icl_combo_phy_ddi_translations_edp_hbr3.num_entries; > + return icl_combo_phy_ddi_translations_edp_hbr3.entries; > } else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) { > - *n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_edp_hbr2_hobl); > - return tgl_combo_phy_ddi_translations_edp_hbr2_hobl; > + *n_entries = tgl_combo_phy_ddi_translations_edp_hbr2_hobl.num_entries; > + return tgl_combo_phy_ddi_translations_edp_hbr2_hobl.entries; > } else if (dev_priv->vbt.edp.low_vswing) { > - *n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2); > - return icl_combo_phy_ddi_translations_edp_hbr2; > + *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; > + return icl_combo_phy_ddi_translations_edp_hbr2.entries; > } > > return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > @@ -1363,8 +1628,8 @@ tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_hdmi); > - return tgl_dkl_phy_ddi_translations_hdmi; > + *n_entries = tgl_dkl_phy_ddi_translations_hdmi.num_entries; > + return tgl_dkl_phy_ddi_translations_hdmi.entries; > } > > static const union intel_ddi_buf_trans_entry * > @@ -1373,11 +1638,11 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > int *n_entries) > { > if (crtc_state->port_clock > 270000) { > - *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_dp_hbr2); > - return tgl_dkl_phy_ddi_translations_dp_hbr2; > + *n_entries = tgl_dkl_phy_ddi_translations_dp_hbr2.num_entries; > + return tgl_dkl_phy_ddi_translations_dp_hbr2.entries; > } else { > - *n_entries = ARRAY_SIZE(tgl_dkl_phy_ddi_translations_dp_hbr); > - return tgl_dkl_phy_ddi_translations_dp_hbr; > + *n_entries = tgl_dkl_phy_ddi_translations_dp_hbr.num_entries; > + return tgl_dkl_phy_ddi_translations_dp_hbr.entries; > } > } > > @@ -1398,11 +1663,11 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > int *n_entries) > { > if (crtc_state->port_clock > 270000) { > - *n_entries = ARRAY_SIZE(adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3); > - return adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3; > + *n_entries = adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3.num_entries; > + return adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3.entries; > } else { > - *n_entries = ARRAY_SIZE(adlp_dkl_phy_ddi_translations_dp_hbr); > - return adlp_dkl_phy_ddi_translations_dp_hbr; > + *n_entries = adlp_dkl_phy_ddi_translations_dp_hbr.num_entries; > + return adlp_dkl_phy_ddi_translations_dp_hbr.entries; > } > } > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > index 487a4f815470..aa612725d510 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > @@ -53,6 +53,11 @@ union intel_ddi_buf_trans_entry { > struct tgl_dkl_phy_ddi_buf_trans dkl; > }; > > +struct intel_ddi_buf_trans { > + const union intel_ddi_buf_trans_entry *entries; > + u8 num_entries; > +}; > + > bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table); > > int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 06/17] drm/i915: Introduce intel_get_buf_trans() 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (4 preceding siblings ...) 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 05/17] drm/i915: Wrap the buf trans tables into a struct Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-18 12:08 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 07/17] drm/i915; Return the whole buf_trans struct from get_buf_trans() Ville Syrjala ` (15 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> Add a small helper to get the buf trans entris+num_entries from the struct. Should avoid copy-paste errors in the platform specific get_buf_trans() functions. @@ identifier T, N; @@ - *N = T.num_entries; - return T.entries; + return intel_get_buf_trans(&T, N); @@ @@ is_hobl_buf_trans(...) { ... } + + static const union intel_ddi_buf_trans_entry * + intel_get_buf_trans(const struct intel_ddi_buf_trans *ddi_translations, int *num_entries) + { + *num_entries = ddi_translations->num_entries; + return ddi_translations->entries; + } v2: Handle adl-p Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 253 +++++++++--------- 1 file changed, 129 insertions(+), 124 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index 5e18056780a8..3149b01aaca7 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -1032,17 +1032,24 @@ bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table) return table == tgl_combo_phy_ddi_translations_edp_hbr2_hobl.entries; } +static const union intel_ddi_buf_trans_entry * +intel_get_buf_trans(const struct intel_ddi_buf_trans *ddi_translations, int *num_entries) +{ + *num_entries = ddi_translations->num_entries; + return ddi_translations->entries; +} + static const union intel_ddi_buf_trans_entry * bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (dev_priv->vbt.edp.low_vswing) { - *n_entries = bdw_ddi_translations_edp.num_entries; - return bdw_ddi_translations_edp.entries; + return intel_get_buf_trans(&bdw_ddi_translations_edp, + n_entries); } else { - *n_entries = bdw_ddi_translations_dp.num_entries; - return bdw_ddi_translations_dp.entries; + return intel_get_buf_trans(&bdw_ddi_translations_dp, + n_entries); } } @@ -1052,14 +1059,14 @@ skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (IS_SKL_ULX(dev_priv)) { - *n_entries = skl_y_ddi_translations_dp.num_entries; - return skl_y_ddi_translations_dp.entries; + return intel_get_buf_trans(&skl_y_ddi_translations_dp, + n_entries); } else if (IS_SKL_ULT(dev_priv)) { - *n_entries = skl_u_ddi_translations_dp.num_entries; - return skl_u_ddi_translations_dp.entries; + return intel_get_buf_trans(&skl_u_ddi_translations_dp, + n_entries); } else { - *n_entries = skl_ddi_translations_dp.num_entries; - return skl_ddi_translations_dp.entries; + return intel_get_buf_trans(&skl_ddi_translations_dp, + n_entries); } } @@ -1071,16 +1078,16 @@ kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) if (IS_KBL_ULX(dev_priv) || IS_CFL_ULX(dev_priv) || IS_CML_ULX(dev_priv)) { - *n_entries = kbl_y_ddi_translations_dp.num_entries; - return kbl_y_ddi_translations_dp.entries; + return intel_get_buf_trans(&kbl_y_ddi_translations_dp, + n_entries); } else if (IS_KBL_ULT(dev_priv) || IS_CFL_ULT(dev_priv) || IS_CML_ULT(dev_priv)) { - *n_entries = kbl_u_ddi_translations_dp.num_entries; - return kbl_u_ddi_translations_dp.entries; + return intel_get_buf_trans(&kbl_u_ddi_translations_dp, + n_entries); } else { - *n_entries = kbl_ddi_translations_dp.num_entries; - return kbl_ddi_translations_dp.entries; + return intel_get_buf_trans(&kbl_ddi_translations_dp, + n_entries); } } @@ -1094,17 +1101,17 @@ skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) IS_KBL_ULX(dev_priv) || IS_CFL_ULX(dev_priv) || IS_CML_ULX(dev_priv)) { - *n_entries = skl_y_ddi_translations_edp.num_entries; - return skl_y_ddi_translations_edp.entries; + return intel_get_buf_trans(&skl_y_ddi_translations_edp, + n_entries); } else if (IS_SKL_ULT(dev_priv) || IS_KBL_ULT(dev_priv) || IS_CFL_ULT(dev_priv) || IS_CML_ULT(dev_priv)) { - *n_entries = skl_u_ddi_translations_edp.num_entries; - return skl_u_ddi_translations_edp.entries; + return intel_get_buf_trans(&skl_u_ddi_translations_edp, + n_entries); } else { - *n_entries = skl_ddi_translations_edp.num_entries; - return skl_ddi_translations_edp.entries; + return intel_get_buf_trans(&skl_ddi_translations_edp, + n_entries); } } @@ -1123,11 +1130,11 @@ skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries) IS_KBL_ULX(dev_priv) || IS_CFL_ULX(dev_priv) || IS_CML_ULX(dev_priv)) { - *n_entries = skl_y_ddi_translations_hdmi.num_entries; - return skl_y_ddi_translations_hdmi.entries; + return intel_get_buf_trans(&skl_y_ddi_translations_hdmi, + n_entries); } else { - *n_entries = skl_ddi_translations_hdmi.num_entries; - return skl_ddi_translations_hdmi.entries; + return intel_get_buf_trans(&skl_ddi_translations_hdmi, + n_entries); } } @@ -1158,11 +1165,11 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); return ddi_translations; } else if (IS_BROADWELL(dev_priv)) { - *n_entries = bdw_ddi_translations_dp.num_entries; - return bdw_ddi_translations_dp.entries; + return intel_get_buf_trans(&bdw_ddi_translations_dp, + n_entries); } else if (IS_HASWELL(dev_priv)) { - *n_entries = hsw_ddi_translations_dp.num_entries; - return hsw_ddi_translations_dp.entries; + return intel_get_buf_trans(&hsw_ddi_translations_dp, + n_entries); } *n_entries = 0; @@ -1182,8 +1189,8 @@ hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) } else if (IS_BROADWELL(dev_priv)) { return bdw_get_buf_trans_edp(encoder, n_entries); } else if (IS_HASWELL(dev_priv)) { - *n_entries = hsw_ddi_translations_dp.num_entries; - return hsw_ddi_translations_dp.entries; + return intel_get_buf_trans(&hsw_ddi_translations_dp, + n_entries); } *n_entries = 0; @@ -1197,11 +1204,11 @@ hsw_get_buf_trans_fdi(struct intel_encoder *encoder, struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (IS_BROADWELL(dev_priv)) { - *n_entries = bdw_ddi_translations_fdi.num_entries; - return bdw_ddi_translations_fdi.entries; + return intel_get_buf_trans(&bdw_ddi_translations_fdi, + n_entries); } else if (IS_HASWELL(dev_priv)) { - *n_entries = hsw_ddi_translations_fdi.num_entries; - return hsw_ddi_translations_fdi.entries; + return intel_get_buf_trans(&hsw_ddi_translations_fdi, + n_entries); } *n_entries = 0; @@ -1217,11 +1224,11 @@ hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) { return skl_get_buf_trans_hdmi(dev_priv, n_entries); } else if (IS_BROADWELL(dev_priv)) { - *n_entries = bdw_ddi_translations_hdmi.num_entries; - return bdw_ddi_translations_hdmi.entries; + return intel_get_buf_trans(&bdw_ddi_translations_hdmi, + n_entries); } else if (IS_HASWELL(dev_priv)) { - *n_entries = hsw_ddi_translations_hdmi.num_entries; - return hsw_ddi_translations_hdmi.entries; + return intel_get_buf_trans(&hsw_ddi_translations_hdmi, + n_entries); } *n_entries = 0; @@ -1246,8 +1253,7 @@ hsw_get_buf_trans(struct intel_encoder *encoder, static const union intel_ddi_buf_trans_entry * bxt_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { - *n_entries = bxt_ddi_translations_dp.num_entries; - return bxt_ddi_translations_dp.entries; + return intel_get_buf_trans(&bxt_ddi_translations_dp, n_entries); } static const union intel_ddi_buf_trans_entry * @@ -1256,8 +1262,8 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (dev_priv->vbt.edp.low_vswing) { - *n_entries = bxt_ddi_translations_edp.num_entries; - return bxt_ddi_translations_edp.entries; + return intel_get_buf_trans(&bxt_ddi_translations_edp, + n_entries); } return bxt_get_buf_trans_dp(encoder, n_entries); @@ -1266,8 +1272,7 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) static const union intel_ddi_buf_trans_entry * bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) { - *n_entries = bxt_ddi_translations_hdmi.num_entries; - return bxt_ddi_translations_hdmi.entries; + return intel_get_buf_trans(&bxt_ddi_translations_hdmi, n_entries); } const union intel_ddi_buf_trans_entry * @@ -1289,14 +1294,14 @@ cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) u32 voltage = intel_de_read(dev_priv, CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK; if (voltage == VOLTAGE_INFO_0_85V) { - *n_entries = cnl_ddi_translations_hdmi_0_85V.num_entries; - return cnl_ddi_translations_hdmi_0_85V.entries; + return intel_get_buf_trans(&cnl_ddi_translations_hdmi_0_85V, + n_entries); } else if (voltage == VOLTAGE_INFO_0_95V) { - *n_entries = cnl_ddi_translations_hdmi_0_95V.num_entries; - return cnl_ddi_translations_hdmi_0_95V.entries; + return intel_get_buf_trans(&cnl_ddi_translations_hdmi_0_95V, + n_entries); } else if (voltage == VOLTAGE_INFO_1_05V) { - *n_entries = cnl_ddi_translations_hdmi_1_05V.num_entries; - return cnl_ddi_translations_hdmi_1_05V.entries; + return intel_get_buf_trans(&cnl_ddi_translations_hdmi_1_05V, + n_entries); } else { *n_entries = 1; /* shut up gcc */ MISSING_CASE(voltage); @@ -1311,14 +1316,14 @@ cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) u32 voltage = intel_de_read(dev_priv, CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK; if (voltage == VOLTAGE_INFO_0_85V) { - *n_entries = cnl_ddi_translations_dp_0_85V.num_entries; - return cnl_ddi_translations_dp_0_85V.entries; + return intel_get_buf_trans(&cnl_ddi_translations_dp_0_85V, + n_entries); } else if (voltage == VOLTAGE_INFO_0_95V) { - *n_entries = cnl_ddi_translations_dp_0_95V.num_entries; - return cnl_ddi_translations_dp_0_95V.entries; + return intel_get_buf_trans(&cnl_ddi_translations_dp_0_95V, + n_entries); } else if (voltage == VOLTAGE_INFO_1_05V) { - *n_entries = cnl_ddi_translations_dp_1_05V.num_entries; - return cnl_ddi_translations_dp_1_05V.entries; + return intel_get_buf_trans(&cnl_ddi_translations_dp_1_05V, + n_entries); } else { *n_entries = 1; /* shut up gcc */ MISSING_CASE(voltage); @@ -1334,14 +1339,14 @@ cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) if (dev_priv->vbt.edp.low_vswing) { if (voltage == VOLTAGE_INFO_0_85V) { - *n_entries = cnl_ddi_translations_edp_0_85V.num_entries; - return cnl_ddi_translations_edp_0_85V.entries; + return intel_get_buf_trans(&cnl_ddi_translations_edp_0_85V, + n_entries); } else if (voltage == VOLTAGE_INFO_0_95V) { - *n_entries = cnl_ddi_translations_edp_0_95V.num_entries; - return cnl_ddi_translations_edp_0_95V.entries; + return intel_get_buf_trans(&cnl_ddi_translations_edp_0_95V, + n_entries); } else if (voltage == VOLTAGE_INFO_1_05V) { - *n_entries = cnl_ddi_translations_edp_1_05V.num_entries; - return cnl_ddi_translations_edp_1_05V.entries; + return intel_get_buf_trans(&cnl_ddi_translations_edp_1_05V, + n_entries); } else { *n_entries = 1; /* shut up gcc */ MISSING_CASE(voltage); @@ -1369,8 +1374,8 @@ icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; - return icl_combo_phy_ddi_translations_hdmi.entries; + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, + n_entries); } static const union intel_ddi_buf_trans_entry * @@ -1378,8 +1383,8 @@ icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = icl_combo_phy_ddi_translations_dp_hbr2.num_entries; - return icl_combo_phy_ddi_translations_dp_hbr2.entries; + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2, + n_entries); } static const union intel_ddi_buf_trans_entry * @@ -1390,17 +1395,17 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (crtc_state->port_clock > 540000) { - *n_entries = icl_combo_phy_ddi_translations_edp_hbr3.num_entries; - return icl_combo_phy_ddi_translations_edp_hbr3.entries; + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, + n_entries); } else if (dev_priv->vbt.edp.low_vswing) { - *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; - return icl_combo_phy_ddi_translations_edp_hbr2.entries; + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, + n_entries); } else if (IS_DG1(dev_priv) && crtc_state->port_clock > 270000) { - *n_entries = dg1_combo_phy_ddi_translations_dp_hbr2_hbr3.num_entries; - return dg1_combo_phy_ddi_translations_dp_hbr2_hbr3.entries; + return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_hbr2_hbr3, + n_entries); } else if (IS_DG1(dev_priv)) { - *n_entries = dg1_combo_phy_ddi_translations_dp_rbr_hbr.num_entries; - return dg1_combo_phy_ddi_translations_dp_rbr_hbr.entries; + return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_rbr_hbr, + n_entries); } return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); @@ -1424,8 +1429,8 @@ icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = icl_mg_phy_ddi_translations_hdmi.num_entries; - return icl_mg_phy_ddi_translations_hdmi.entries; + return intel_get_buf_trans(&icl_mg_phy_ddi_translations_hdmi, + n_entries); } static const union intel_ddi_buf_trans_entry * @@ -1434,11 +1439,11 @@ icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { if (crtc_state->port_clock > 270000) { - *n_entries = icl_mg_phy_ddi_translations_hbr2_hbr3.num_entries; - return icl_mg_phy_ddi_translations_hbr2_hbr3.entries; + return intel_get_buf_trans(&icl_mg_phy_ddi_translations_hbr2_hbr3, + n_entries); } else { - *n_entries = icl_mg_phy_ddi_translations_rbr_hbr.num_entries; - return icl_mg_phy_ddi_translations_rbr_hbr.entries; + return intel_get_buf_trans(&icl_mg_phy_ddi_translations_rbr_hbr, + n_entries); } } @@ -1458,8 +1463,8 @@ ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; - return icl_combo_phy_ddi_translations_hdmi.entries; + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, + n_entries); } static const union intel_ddi_buf_trans_entry * @@ -1467,8 +1472,8 @@ ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = ehl_combo_phy_ddi_translations_dp.num_entries; - return ehl_combo_phy_ddi_translations_dp.entries; + return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_dp, + n_entries); } static const union intel_ddi_buf_trans_entry * @@ -1479,8 +1484,8 @@ 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) { - *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; - return icl_combo_phy_ddi_translations_edp_hbr2.entries; + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, + n_entries); } return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); @@ -1504,8 +1509,8 @@ jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; - return icl_combo_phy_ddi_translations_hdmi.entries; + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, + n_entries); } static const union intel_ddi_buf_trans_entry * @@ -1513,8 +1518,8 @@ jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = icl_combo_phy_ddi_translations_dp_hbr2.num_entries; - return icl_combo_phy_ddi_translations_dp_hbr2.entries; + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2, + n_entries); } static const union intel_ddi_buf_trans_entry * @@ -1526,11 +1531,11 @@ jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, if (dev_priv->vbt.edp.low_vswing) { if (crtc_state->port_clock > 270000) { - *n_entries = jsl_combo_phy_ddi_translations_edp_hbr2.num_entries; - return jsl_combo_phy_ddi_translations_edp_hbr2.entries; + return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr2, + n_entries); } else { - *n_entries = jsl_combo_phy_ddi_translations_edp_hbr.num_entries; - return jsl_combo_phy_ddi_translations_edp_hbr.entries; + return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr, + n_entries); } } @@ -1555,8 +1560,8 @@ tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; - return icl_combo_phy_ddi_translations_hdmi.entries; + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, + n_entries); } static const union intel_ddi_buf_trans_entry * @@ -1568,22 +1573,22 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, if (crtc_state->port_clock > 270000) { if (IS_ROCKETLAKE(dev_priv)) { - *n_entries = rkl_combo_phy_ddi_translations_dp_hbr2_hbr3.num_entries; - return rkl_combo_phy_ddi_translations_dp_hbr2_hbr3.entries; + return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr2_hbr3, + n_entries); } else if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { - *n_entries = tgl_uy_combo_phy_ddi_translations_dp_hbr2.num_entries; - return tgl_uy_combo_phy_ddi_translations_dp_hbr2.entries; + return intel_get_buf_trans(&tgl_uy_combo_phy_ddi_translations_dp_hbr2, + n_entries); } else { - *n_entries = tgl_combo_phy_ddi_translations_dp_hbr2.num_entries; - return tgl_combo_phy_ddi_translations_dp_hbr2.entries; + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr2, + n_entries); } } else { if (IS_ROCKETLAKE(dev_priv)) { - *n_entries = rkl_combo_phy_ddi_translations_dp_hbr.num_entries; - return rkl_combo_phy_ddi_translations_dp_hbr.entries; + return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr, + n_entries); } else { - *n_entries = tgl_combo_phy_ddi_translations_dp_hbr.num_entries; - return tgl_combo_phy_ddi_translations_dp_hbr.entries; + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr, + n_entries); } } } @@ -1597,14 +1602,14 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, struct intel_dp *intel_dp = enc_to_intel_dp(encoder); if (crtc_state->port_clock > 540000) { - *n_entries = icl_combo_phy_ddi_translations_edp_hbr3.num_entries; - return icl_combo_phy_ddi_translations_edp_hbr3.entries; + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, + n_entries); } else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) { - *n_entries = tgl_combo_phy_ddi_translations_edp_hbr2_hobl.num_entries; - return tgl_combo_phy_ddi_translations_edp_hbr2_hobl.entries; + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, + n_entries); } else if (dev_priv->vbt.edp.low_vswing) { - *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; - return icl_combo_phy_ddi_translations_edp_hbr2.entries; + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, + n_entries); } return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); @@ -1628,8 +1633,8 @@ tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - *n_entries = tgl_dkl_phy_ddi_translations_hdmi.num_entries; - return tgl_dkl_phy_ddi_translations_hdmi.entries; + return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_hdmi, + n_entries); } static const union intel_ddi_buf_trans_entry * @@ -1638,11 +1643,11 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { if (crtc_state->port_clock > 270000) { - *n_entries = tgl_dkl_phy_ddi_translations_dp_hbr2.num_entries; - return tgl_dkl_phy_ddi_translations_dp_hbr2.entries; + return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_dp_hbr2, + n_entries); } else { - *n_entries = tgl_dkl_phy_ddi_translations_dp_hbr.num_entries; - return tgl_dkl_phy_ddi_translations_dp_hbr.entries; + return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_dp_hbr, + n_entries); } } @@ -1663,11 +1668,11 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { if (crtc_state->port_clock > 270000) { - *n_entries = adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3.num_entries; - return adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3.entries; + return intel_get_buf_trans(&adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3, + n_entries); } else { - *n_entries = adlp_dkl_phy_ddi_translations_dp_hbr.num_entries; - return adlp_dkl_phy_ddi_translations_dp_hbr.entries; + return intel_get_buf_trans(&adlp_dkl_phy_ddi_translations_dp_hbr, + n_entries); } } -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 06/17] drm/i915: Introduce intel_get_buf_trans() 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 06/17] drm/i915: Introduce intel_get_buf_trans() Ville Syrjala @ 2021-06-18 12:08 ` Jani Nikula 0 siblings, 0 replies; 39+ messages in thread From: Jani Nikula @ 2021-06-18 12:08 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Add a small helper to get the buf trans entris+num_entries > from the struct. Should avoid copy-paste errors in the > platform specific get_buf_trans() functions. > > @@ > identifier T, N; > @@ > - *N = T.num_entries; > - return T.entries; > + return intel_get_buf_trans(&T, N); > > @@ > @@ > is_hobl_buf_trans(...) { ... } > + > + static const union intel_ddi_buf_trans_entry * > + intel_get_buf_trans(const struct intel_ddi_buf_trans *ddi_translations, int *num_entries) > + { > + *num_entries = ddi_translations->num_entries; > + return ddi_translations->entries; > + } > > v2: Handle adl-p > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Holds for v2. > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > .../drm/i915/display/intel_ddi_buf_trans.c | 253 +++++++++--------- > 1 file changed, 129 insertions(+), 124 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index 5e18056780a8..3149b01aaca7 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -1032,17 +1032,24 @@ bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table) > return table == tgl_combo_phy_ddi_translations_edp_hbr2_hobl.entries; > } > > +static const union intel_ddi_buf_trans_entry * > +intel_get_buf_trans(const struct intel_ddi_buf_trans *ddi_translations, int *num_entries) > +{ > + *num_entries = ddi_translations->num_entries; > + return ddi_translations->entries; > +} > + > static const union intel_ddi_buf_trans_entry * > bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (dev_priv->vbt.edp.low_vswing) { > - *n_entries = bdw_ddi_translations_edp.num_entries; > - return bdw_ddi_translations_edp.entries; > + return intel_get_buf_trans(&bdw_ddi_translations_edp, > + n_entries); > } else { > - *n_entries = bdw_ddi_translations_dp.num_entries; > - return bdw_ddi_translations_dp.entries; > + return intel_get_buf_trans(&bdw_ddi_translations_dp, > + n_entries); > } > } > > @@ -1052,14 +1059,14 @@ skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (IS_SKL_ULX(dev_priv)) { > - *n_entries = skl_y_ddi_translations_dp.num_entries; > - return skl_y_ddi_translations_dp.entries; > + return intel_get_buf_trans(&skl_y_ddi_translations_dp, > + n_entries); > } else if (IS_SKL_ULT(dev_priv)) { > - *n_entries = skl_u_ddi_translations_dp.num_entries; > - return skl_u_ddi_translations_dp.entries; > + return intel_get_buf_trans(&skl_u_ddi_translations_dp, > + n_entries); > } else { > - *n_entries = skl_ddi_translations_dp.num_entries; > - return skl_ddi_translations_dp.entries; > + return intel_get_buf_trans(&skl_ddi_translations_dp, > + n_entries); > } > } > > @@ -1071,16 +1078,16 @@ kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > if (IS_KBL_ULX(dev_priv) || > IS_CFL_ULX(dev_priv) || > IS_CML_ULX(dev_priv)) { > - *n_entries = kbl_y_ddi_translations_dp.num_entries; > - return kbl_y_ddi_translations_dp.entries; > + return intel_get_buf_trans(&kbl_y_ddi_translations_dp, > + n_entries); > } else if (IS_KBL_ULT(dev_priv) || > IS_CFL_ULT(dev_priv) || > IS_CML_ULT(dev_priv)) { > - *n_entries = kbl_u_ddi_translations_dp.num_entries; > - return kbl_u_ddi_translations_dp.entries; > + return intel_get_buf_trans(&kbl_u_ddi_translations_dp, > + n_entries); > } else { > - *n_entries = kbl_ddi_translations_dp.num_entries; > - return kbl_ddi_translations_dp.entries; > + return intel_get_buf_trans(&kbl_ddi_translations_dp, > + n_entries); > } > } > > @@ -1094,17 +1101,17 @@ skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > IS_KBL_ULX(dev_priv) || > IS_CFL_ULX(dev_priv) || > IS_CML_ULX(dev_priv)) { > - *n_entries = skl_y_ddi_translations_edp.num_entries; > - return skl_y_ddi_translations_edp.entries; > + return intel_get_buf_trans(&skl_y_ddi_translations_edp, > + n_entries); > } else if (IS_SKL_ULT(dev_priv) || > IS_KBL_ULT(dev_priv) || > IS_CFL_ULT(dev_priv) || > IS_CML_ULT(dev_priv)) { > - *n_entries = skl_u_ddi_translations_edp.num_entries; > - return skl_u_ddi_translations_edp.entries; > + return intel_get_buf_trans(&skl_u_ddi_translations_edp, > + n_entries); > } else { > - *n_entries = skl_ddi_translations_edp.num_entries; > - return skl_ddi_translations_edp.entries; > + return intel_get_buf_trans(&skl_ddi_translations_edp, > + n_entries); > } > } > > @@ -1123,11 +1130,11 @@ skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries) > IS_KBL_ULX(dev_priv) || > IS_CFL_ULX(dev_priv) || > IS_CML_ULX(dev_priv)) { > - *n_entries = skl_y_ddi_translations_hdmi.num_entries; > - return skl_y_ddi_translations_hdmi.entries; > + return intel_get_buf_trans(&skl_y_ddi_translations_hdmi, > + n_entries); > } else { > - *n_entries = skl_ddi_translations_hdmi.num_entries; > - return skl_ddi_translations_hdmi.entries; > + return intel_get_buf_trans(&skl_ddi_translations_hdmi, > + n_entries); > } > } > > @@ -1158,11 +1165,11 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); > return ddi_translations; > } else if (IS_BROADWELL(dev_priv)) { > - *n_entries = bdw_ddi_translations_dp.num_entries; > - return bdw_ddi_translations_dp.entries; > + return intel_get_buf_trans(&bdw_ddi_translations_dp, > + n_entries); > } else if (IS_HASWELL(dev_priv)) { > - *n_entries = hsw_ddi_translations_dp.num_entries; > - return hsw_ddi_translations_dp.entries; > + return intel_get_buf_trans(&hsw_ddi_translations_dp, > + n_entries); > } > > *n_entries = 0; > @@ -1182,8 +1189,8 @@ hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > } else if (IS_BROADWELL(dev_priv)) { > return bdw_get_buf_trans_edp(encoder, n_entries); > } else if (IS_HASWELL(dev_priv)) { > - *n_entries = hsw_ddi_translations_dp.num_entries; > - return hsw_ddi_translations_dp.entries; > + return intel_get_buf_trans(&hsw_ddi_translations_dp, > + n_entries); > } > > *n_entries = 0; > @@ -1197,11 +1204,11 @@ hsw_get_buf_trans_fdi(struct intel_encoder *encoder, > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (IS_BROADWELL(dev_priv)) { > - *n_entries = bdw_ddi_translations_fdi.num_entries; > - return bdw_ddi_translations_fdi.entries; > + return intel_get_buf_trans(&bdw_ddi_translations_fdi, > + n_entries); > } else if (IS_HASWELL(dev_priv)) { > - *n_entries = hsw_ddi_translations_fdi.num_entries; > - return hsw_ddi_translations_fdi.entries; > + return intel_get_buf_trans(&hsw_ddi_translations_fdi, > + n_entries); > } > > *n_entries = 0; > @@ -1217,11 +1224,11 @@ hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, > if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) { > return skl_get_buf_trans_hdmi(dev_priv, n_entries); > } else if (IS_BROADWELL(dev_priv)) { > - *n_entries = bdw_ddi_translations_hdmi.num_entries; > - return bdw_ddi_translations_hdmi.entries; > + return intel_get_buf_trans(&bdw_ddi_translations_hdmi, > + n_entries); > } else if (IS_HASWELL(dev_priv)) { > - *n_entries = hsw_ddi_translations_hdmi.num_entries; > - return hsw_ddi_translations_hdmi.entries; > + return intel_get_buf_trans(&hsw_ddi_translations_hdmi, > + n_entries); > } > > *n_entries = 0; > @@ -1246,8 +1253,7 @@ hsw_get_buf_trans(struct intel_encoder *encoder, > static const union intel_ddi_buf_trans_entry * > bxt_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > - *n_entries = bxt_ddi_translations_dp.num_entries; > - return bxt_ddi_translations_dp.entries; > + return intel_get_buf_trans(&bxt_ddi_translations_dp, n_entries); > } > > static const union intel_ddi_buf_trans_entry * > @@ -1256,8 +1262,8 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (dev_priv->vbt.edp.low_vswing) { > - *n_entries = bxt_ddi_translations_edp.num_entries; > - return bxt_ddi_translations_edp.entries; > + return intel_get_buf_trans(&bxt_ddi_translations_edp, > + n_entries); > } > > return bxt_get_buf_trans_dp(encoder, n_entries); > @@ -1266,8 +1272,7 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > static const union intel_ddi_buf_trans_entry * > bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) > { > - *n_entries = bxt_ddi_translations_hdmi.num_entries; > - return bxt_ddi_translations_hdmi.entries; > + return intel_get_buf_trans(&bxt_ddi_translations_hdmi, n_entries); > } > > const union intel_ddi_buf_trans_entry * > @@ -1289,14 +1294,14 @@ cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) > u32 voltage = intel_de_read(dev_priv, CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK; > > if (voltage == VOLTAGE_INFO_0_85V) { > - *n_entries = cnl_ddi_translations_hdmi_0_85V.num_entries; > - return cnl_ddi_translations_hdmi_0_85V.entries; > + return intel_get_buf_trans(&cnl_ddi_translations_hdmi_0_85V, > + n_entries); > } else if (voltage == VOLTAGE_INFO_0_95V) { > - *n_entries = cnl_ddi_translations_hdmi_0_95V.num_entries; > - return cnl_ddi_translations_hdmi_0_95V.entries; > + return intel_get_buf_trans(&cnl_ddi_translations_hdmi_0_95V, > + n_entries); > } else if (voltage == VOLTAGE_INFO_1_05V) { > - *n_entries = cnl_ddi_translations_hdmi_1_05V.num_entries; > - return cnl_ddi_translations_hdmi_1_05V.entries; > + return intel_get_buf_trans(&cnl_ddi_translations_hdmi_1_05V, > + n_entries); > } else { > *n_entries = 1; /* shut up gcc */ > MISSING_CASE(voltage); > @@ -1311,14 +1316,14 @@ cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > u32 voltage = intel_de_read(dev_priv, CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK; > > if (voltage == VOLTAGE_INFO_0_85V) { > - *n_entries = cnl_ddi_translations_dp_0_85V.num_entries; > - return cnl_ddi_translations_dp_0_85V.entries; > + return intel_get_buf_trans(&cnl_ddi_translations_dp_0_85V, > + n_entries); > } else if (voltage == VOLTAGE_INFO_0_95V) { > - *n_entries = cnl_ddi_translations_dp_0_95V.num_entries; > - return cnl_ddi_translations_dp_0_95V.entries; > + return intel_get_buf_trans(&cnl_ddi_translations_dp_0_95V, > + n_entries); > } else if (voltage == VOLTAGE_INFO_1_05V) { > - *n_entries = cnl_ddi_translations_dp_1_05V.num_entries; > - return cnl_ddi_translations_dp_1_05V.entries; > + return intel_get_buf_trans(&cnl_ddi_translations_dp_1_05V, > + n_entries); > } else { > *n_entries = 1; /* shut up gcc */ > MISSING_CASE(voltage); > @@ -1334,14 +1339,14 @@ cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > > if (dev_priv->vbt.edp.low_vswing) { > if (voltage == VOLTAGE_INFO_0_85V) { > - *n_entries = cnl_ddi_translations_edp_0_85V.num_entries; > - return cnl_ddi_translations_edp_0_85V.entries; > + return intel_get_buf_trans(&cnl_ddi_translations_edp_0_85V, > + n_entries); > } else if (voltage == VOLTAGE_INFO_0_95V) { > - *n_entries = cnl_ddi_translations_edp_0_95V.num_entries; > - return cnl_ddi_translations_edp_0_95V.entries; > + return intel_get_buf_trans(&cnl_ddi_translations_edp_0_95V, > + n_entries); > } else if (voltage == VOLTAGE_INFO_1_05V) { > - *n_entries = cnl_ddi_translations_edp_1_05V.num_entries; > - return cnl_ddi_translations_edp_1_05V.entries; > + return intel_get_buf_trans(&cnl_ddi_translations_edp_1_05V, > + n_entries); > } else { > *n_entries = 1; /* shut up gcc */ > MISSING_CASE(voltage); > @@ -1369,8 +1374,8 @@ icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; > - return icl_combo_phy_ddi_translations_hdmi.entries; > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, > + n_entries); > } > > static const union intel_ddi_buf_trans_entry * > @@ -1378,8 +1383,8 @@ icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = icl_combo_phy_ddi_translations_dp_hbr2.num_entries; > - return icl_combo_phy_ddi_translations_dp_hbr2.entries; > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2, > + n_entries); > } > > static const union intel_ddi_buf_trans_entry * > @@ -1390,17 +1395,17 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (crtc_state->port_clock > 540000) { > - *n_entries = icl_combo_phy_ddi_translations_edp_hbr3.num_entries; > - return icl_combo_phy_ddi_translations_edp_hbr3.entries; > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, > + n_entries); > } else if (dev_priv->vbt.edp.low_vswing) { > - *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; > - return icl_combo_phy_ddi_translations_edp_hbr2.entries; > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, > + n_entries); > } else if (IS_DG1(dev_priv) && crtc_state->port_clock > 270000) { > - *n_entries = dg1_combo_phy_ddi_translations_dp_hbr2_hbr3.num_entries; > - return dg1_combo_phy_ddi_translations_dp_hbr2_hbr3.entries; > + return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_hbr2_hbr3, > + n_entries); > } else if (IS_DG1(dev_priv)) { > - *n_entries = dg1_combo_phy_ddi_translations_dp_rbr_hbr.num_entries; > - return dg1_combo_phy_ddi_translations_dp_rbr_hbr.entries; > + return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_rbr_hbr, > + n_entries); > } > > return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > @@ -1424,8 +1429,8 @@ icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = icl_mg_phy_ddi_translations_hdmi.num_entries; > - return icl_mg_phy_ddi_translations_hdmi.entries; > + return intel_get_buf_trans(&icl_mg_phy_ddi_translations_hdmi, > + n_entries); > } > > static const union intel_ddi_buf_trans_entry * > @@ -1434,11 +1439,11 @@ icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, > int *n_entries) > { > if (crtc_state->port_clock > 270000) { > - *n_entries = icl_mg_phy_ddi_translations_hbr2_hbr3.num_entries; > - return icl_mg_phy_ddi_translations_hbr2_hbr3.entries; > + return intel_get_buf_trans(&icl_mg_phy_ddi_translations_hbr2_hbr3, > + n_entries); > } else { > - *n_entries = icl_mg_phy_ddi_translations_rbr_hbr.num_entries; > - return icl_mg_phy_ddi_translations_rbr_hbr.entries; > + return intel_get_buf_trans(&icl_mg_phy_ddi_translations_rbr_hbr, > + n_entries); > } > } > > @@ -1458,8 +1463,8 @@ ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; > - return icl_combo_phy_ddi_translations_hdmi.entries; > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, > + n_entries); > } > > static const union intel_ddi_buf_trans_entry * > @@ -1467,8 +1472,8 @@ ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = ehl_combo_phy_ddi_translations_dp.num_entries; > - return ehl_combo_phy_ddi_translations_dp.entries; > + return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_dp, > + n_entries); > } > > static const union intel_ddi_buf_trans_entry * > @@ -1479,8 +1484,8 @@ 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) { > - *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; > - return icl_combo_phy_ddi_translations_edp_hbr2.entries; > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, > + n_entries); > } > > return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > @@ -1504,8 +1509,8 @@ jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; > - return icl_combo_phy_ddi_translations_hdmi.entries; > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, > + n_entries); > } > > static const union intel_ddi_buf_trans_entry * > @@ -1513,8 +1518,8 @@ jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = icl_combo_phy_ddi_translations_dp_hbr2.num_entries; > - return icl_combo_phy_ddi_translations_dp_hbr2.entries; > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2, > + n_entries); > } > > static const union intel_ddi_buf_trans_entry * > @@ -1526,11 +1531,11 @@ jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > > if (dev_priv->vbt.edp.low_vswing) { > if (crtc_state->port_clock > 270000) { > - *n_entries = jsl_combo_phy_ddi_translations_edp_hbr2.num_entries; > - return jsl_combo_phy_ddi_translations_edp_hbr2.entries; > + return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr2, > + n_entries); > } else { > - *n_entries = jsl_combo_phy_ddi_translations_edp_hbr.num_entries; > - return jsl_combo_phy_ddi_translations_edp_hbr.entries; > + return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr, > + n_entries); > } > } > > @@ -1555,8 +1560,8 @@ tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = icl_combo_phy_ddi_translations_hdmi.num_entries; > - return icl_combo_phy_ddi_translations_hdmi.entries; > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, > + n_entries); > } > > static const union intel_ddi_buf_trans_entry * > @@ -1568,22 +1573,22 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > > if (crtc_state->port_clock > 270000) { > if (IS_ROCKETLAKE(dev_priv)) { > - *n_entries = rkl_combo_phy_ddi_translations_dp_hbr2_hbr3.num_entries; > - return rkl_combo_phy_ddi_translations_dp_hbr2_hbr3.entries; > + return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr2_hbr3, > + n_entries); > } else if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { > - *n_entries = tgl_uy_combo_phy_ddi_translations_dp_hbr2.num_entries; > - return tgl_uy_combo_phy_ddi_translations_dp_hbr2.entries; > + return intel_get_buf_trans(&tgl_uy_combo_phy_ddi_translations_dp_hbr2, > + n_entries); > } else { > - *n_entries = tgl_combo_phy_ddi_translations_dp_hbr2.num_entries; > - return tgl_combo_phy_ddi_translations_dp_hbr2.entries; > + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr2, > + n_entries); > } > } else { > if (IS_ROCKETLAKE(dev_priv)) { > - *n_entries = rkl_combo_phy_ddi_translations_dp_hbr.num_entries; > - return rkl_combo_phy_ddi_translations_dp_hbr.entries; > + return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr, > + n_entries); > } else { > - *n_entries = tgl_combo_phy_ddi_translations_dp_hbr.num_entries; > - return tgl_combo_phy_ddi_translations_dp_hbr.entries; > + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr, > + n_entries); > } > } > } > @@ -1597,14 +1602,14 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > > if (crtc_state->port_clock > 540000) { > - *n_entries = icl_combo_phy_ddi_translations_edp_hbr3.num_entries; > - return icl_combo_phy_ddi_translations_edp_hbr3.entries; > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, > + n_entries); > } else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) { > - *n_entries = tgl_combo_phy_ddi_translations_edp_hbr2_hobl.num_entries; > - return tgl_combo_phy_ddi_translations_edp_hbr2_hobl.entries; > + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, > + n_entries); > } else if (dev_priv->vbt.edp.low_vswing) { > - *n_entries = icl_combo_phy_ddi_translations_edp_hbr2.num_entries; > - return icl_combo_phy_ddi_translations_edp_hbr2.entries; > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, > + n_entries); > } > > return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > @@ -1628,8 +1633,8 @@ tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - *n_entries = tgl_dkl_phy_ddi_translations_hdmi.num_entries; > - return tgl_dkl_phy_ddi_translations_hdmi.entries; > + return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_hdmi, > + n_entries); > } > > static const union intel_ddi_buf_trans_entry * > @@ -1638,11 +1643,11 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > int *n_entries) > { > if (crtc_state->port_clock > 270000) { > - *n_entries = tgl_dkl_phy_ddi_translations_dp_hbr2.num_entries; > - return tgl_dkl_phy_ddi_translations_dp_hbr2.entries; > + return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_dp_hbr2, > + n_entries); > } else { > - *n_entries = tgl_dkl_phy_ddi_translations_dp_hbr.num_entries; > - return tgl_dkl_phy_ddi_translations_dp_hbr.entries; > + return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_dp_hbr, > + n_entries); > } > } > > @@ -1663,11 +1668,11 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > int *n_entries) > { > if (crtc_state->port_clock > 270000) { > - *n_entries = adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3.num_entries; > - return adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3.entries; > + return intel_get_buf_trans(&adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3, > + n_entries); > } else { > - *n_entries = adlp_dkl_phy_ddi_translations_dp_hbr.num_entries; > - return adlp_dkl_phy_ddi_translations_dp_hbr.entries; > + return intel_get_buf_trans(&adlp_dkl_phy_ddi_translations_dp_hbr, > + n_entries); > } > } -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 07/17] drm/i915; Return the whole buf_trans struct from get_buf_trans() 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (5 preceding siblings ...) 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 06/17] drm/i915: Introduce intel_get_buf_trans() Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-18 12:11 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 08/17] drm/i915: Store the HDMI default entry in the bug trans struct Ville Syrjala ` (14 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> Raise the abstraction level of the get_buf_trans() functions a bit more by returning the whole wrapper intel_ddi_buf_trans struct. v2: Handle adl-p Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_ddi.c | 76 +++++++------- .../drm/i915/display/intel_ddi_buf_trans.c | 98 +++++++++---------- .../drm/i915/display/intel_ddi_buf_trans.h | 22 ++--- 3 files changed, 98 insertions(+), 98 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index f3fba535812c..37445cec0c23 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -102,7 +102,7 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, u32 iboost_bit = 0; int i, n_entries; enum port port = encoder->port; - const union intel_ddi_buf_trans_entry *ddi_translations; + const struct intel_ddi_buf_trans *ddi_translations; ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); @@ -116,9 +116,9 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, for (i = 0; i < n_entries; i++) { intel_de_write(dev_priv, DDI_BUF_TRANS_LO(port, i), - ddi_translations[i].hsw.trans1 | iboost_bit); + ddi_translations->entries[i].hsw.trans1 | iboost_bit); intel_de_write(dev_priv, DDI_BUF_TRANS_HI(port, i), - ddi_translations[i].hsw.trans2); + ddi_translations->entries[i].hsw.trans2); } } @@ -135,7 +135,7 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, u32 iboost_bit = 0; int n_entries; enum port port = encoder->port; - const union intel_ddi_buf_trans_entry *ddi_translations; + const struct intel_ddi_buf_trans *ddi_translations; ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); @@ -151,9 +151,9 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, /* Entry 9 is for HDMI: */ intel_de_write(dev_priv, DDI_BUF_TRANS_LO(port, 9), - ddi_translations[level].hsw.trans1 | iboost_bit); + ddi_translations->entries[level].hsw.trans1 | iboost_bit); intel_de_write(dev_priv, DDI_BUF_TRANS_HI(port, 9), - ddi_translations[level].hsw.trans2); + ddi_translations->entries[level].hsw.trans2); } void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv, @@ -944,7 +944,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, iboost = intel_bios_encoder_dp_boost_level(encoder->devdata); if (iboost == 0) { - const union intel_ddi_buf_trans_entry *ddi_translations; + const struct intel_ddi_buf_trans *ddi_translations; int n_entries; ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); @@ -954,7 +954,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) level = n_entries - 1; - iboost = ddi_translations[level].hsw.i_boost; + iboost = ddi_translations->entries[level].hsw.i_boost; } /* Make sure that the requested I_boost is valid */ @@ -974,7 +974,7 @@ static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder, int level) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - const union intel_ddi_buf_trans_entry *ddi_translations; + const struct intel_ddi_buf_trans *ddi_translations; enum port port = encoder->port; int n_entries; @@ -985,10 +985,10 @@ static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder, level = n_entries - 1; bxt_ddi_phy_set_signal_level(dev_priv, port, - ddi_translations[level].bxt.margin, - ddi_translations[level].bxt.scale, - ddi_translations[level].bxt.enable, - ddi_translations[level].bxt.deemphasis); + ddi_translations->entries[level].bxt.margin, + ddi_translations->entries[level].bxt.scale, + ddi_translations->entries[level].bxt.enable, + ddi_translations->entries[level].bxt.deemphasis); } static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp, @@ -1049,7 +1049,7 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, int level) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - const union intel_ddi_buf_trans_entry *ddi_translations; + const struct intel_ddi_buf_trans *ddi_translations; enum port port = encoder->port; int n_entries, ln; u32 val; @@ -1071,8 +1071,8 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, val = intel_de_read(dev_priv, CNL_PORT_TX_DW2_LN0(port)); val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK | RCOMP_SCALAR_MASK); - val |= SWING_SEL_UPPER(ddi_translations[level].cnl.dw2_swing_sel); - val |= SWING_SEL_LOWER(ddi_translations[level].cnl.dw2_swing_sel); + val |= SWING_SEL_UPPER(ddi_translations->entries[level].cnl.dw2_swing_sel); + val |= SWING_SEL_LOWER(ddi_translations->entries[level].cnl.dw2_swing_sel); /* Rcomp scalar is fixed as 0x98 for every table entry */ val |= RCOMP_SCALAR(0x98); intel_de_write(dev_priv, CNL_PORT_TX_DW2_GRP(port), val); @@ -1083,9 +1083,9 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, val = intel_de_read(dev_priv, CNL_PORT_TX_DW4_LN(ln, port)); val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK | CURSOR_COEFF_MASK); - val |= POST_CURSOR_1(ddi_translations[level].cnl.dw4_post_cursor_1); - val |= POST_CURSOR_2(ddi_translations[level].cnl.dw4_post_cursor_2); - val |= CURSOR_COEFF(ddi_translations[level].cnl.dw4_cursor_coeff); + val |= POST_CURSOR_1(ddi_translations->entries[level].cnl.dw4_post_cursor_1); + val |= POST_CURSOR_2(ddi_translations->entries[level].cnl.dw4_post_cursor_2); + val |= CURSOR_COEFF(ddi_translations->entries[level].cnl.dw4_cursor_coeff); intel_de_write(dev_priv, CNL_PORT_TX_DW4_LN(ln, port), val); } @@ -1100,7 +1100,7 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, /* Program PORT_TX_DW7 */ val = intel_de_read(dev_priv, CNL_PORT_TX_DW7_LN0(port)); val &= ~N_SCALAR_MASK; - val |= N_SCALAR(ddi_translations[level].cnl.dw7_n_scalar); + val |= N_SCALAR(ddi_translations->entries[level].cnl.dw7_n_scalar); intel_de_write(dev_priv, CNL_PORT_TX_DW7_GRP(port), val); } @@ -1170,7 +1170,7 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, int level) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - const union intel_ddi_buf_trans_entry *ddi_translations; + const struct intel_ddi_buf_trans *ddi_translations; enum phy phy = intel_port_to_phy(dev_priv, encoder->port); int n_entries, ln; u32 val; @@ -1211,8 +1211,8 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, val = intel_de_read(dev_priv, ICL_PORT_TX_DW2_LN0(phy)); val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK | RCOMP_SCALAR_MASK); - val |= SWING_SEL_UPPER(ddi_translations[level].cnl.dw2_swing_sel); - val |= SWING_SEL_LOWER(ddi_translations[level].cnl.dw2_swing_sel); + val |= SWING_SEL_UPPER(ddi_translations->entries[level].cnl.dw2_swing_sel); + val |= SWING_SEL_LOWER(ddi_translations->entries[level].cnl.dw2_swing_sel); /* Program Rcomp scalar for every table entry */ val |= RCOMP_SCALAR(0x98); intel_de_write(dev_priv, ICL_PORT_TX_DW2_GRP(phy), val); @@ -1223,16 +1223,16 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, val = intel_de_read(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy)); val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK | CURSOR_COEFF_MASK); - val |= POST_CURSOR_1(ddi_translations[level].cnl.dw4_post_cursor_1); - val |= POST_CURSOR_2(ddi_translations[level].cnl.dw4_post_cursor_2); - val |= CURSOR_COEFF(ddi_translations[level].cnl.dw4_cursor_coeff); + val |= POST_CURSOR_1(ddi_translations->entries[level].cnl.dw4_post_cursor_1); + val |= POST_CURSOR_2(ddi_translations->entries[level].cnl.dw4_post_cursor_2); + val |= CURSOR_COEFF(ddi_translations->entries[level].cnl.dw4_cursor_coeff); intel_de_write(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy), val); } /* Program PORT_TX_DW7 */ val = intel_de_read(dev_priv, ICL_PORT_TX_DW7_LN0(phy)); val &= ~N_SCALAR_MASK; - val |= N_SCALAR(ddi_translations[level].cnl.dw7_n_scalar); + val |= N_SCALAR(ddi_translations->entries[level].cnl.dw7_n_scalar); intel_de_write(dev_priv, ICL_PORT_TX_DW7_GRP(phy), val); } @@ -1303,7 +1303,7 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port); - const union intel_ddi_buf_trans_entry *ddi_translations; + const struct intel_ddi_buf_trans *ddi_translations; int n_entries, ln; u32 val; @@ -1333,13 +1333,13 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, val = intel_de_read(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port)); val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK; val |= CRI_TXDEEMPH_OVERRIDE_17_12( - ddi_translations[level].mg.cri_txdeemph_override_17_12); + ddi_translations->entries[level].mg.cri_txdeemph_override_17_12); intel_de_write(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port), val); val = intel_de_read(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port)); val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK; val |= CRI_TXDEEMPH_OVERRIDE_17_12( - ddi_translations[level].mg.cri_txdeemph_override_17_12); + ddi_translations->entries[level].mg.cri_txdeemph_override_17_12); intel_de_write(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port), val); } @@ -1349,9 +1349,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK | CRI_TXDEEMPH_OVERRIDE_5_0_MASK); val |= CRI_TXDEEMPH_OVERRIDE_5_0( - ddi_translations[level].mg.cri_txdeemph_override_5_0) | + ddi_translations->entries[level].mg.cri_txdeemph_override_5_0) | CRI_TXDEEMPH_OVERRIDE_11_6( - ddi_translations[level].mg.cri_txdeemph_override_11_6) | + ddi_translations->entries[level].mg.cri_txdeemph_override_11_6) | CRI_TXDEEMPH_OVERRIDE_EN; intel_de_write(dev_priv, MG_TX1_DRVCTRL(ln, tc_port), val); @@ -1359,9 +1359,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK | CRI_TXDEEMPH_OVERRIDE_5_0_MASK); val |= CRI_TXDEEMPH_OVERRIDE_5_0( - ddi_translations[level].mg.cri_txdeemph_override_5_0) | + ddi_translations->entries[level].mg.cri_txdeemph_override_5_0) | CRI_TXDEEMPH_OVERRIDE_11_6( - ddi_translations[level].mg.cri_txdeemph_override_11_6) | + ddi_translations->entries[level].mg.cri_txdeemph_override_11_6) | CRI_TXDEEMPH_OVERRIDE_EN; intel_de_write(dev_priv, MG_TX2_DRVCTRL(ln, tc_port), val); @@ -1441,7 +1441,7 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port); - const union intel_ddi_buf_trans_entry *ddi_translations; + const struct intel_ddi_buf_trans *ddi_translations; u32 val, dpcnt_mask, dpcnt_val; int n_entries, ln; @@ -1461,9 +1461,9 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, dpcnt_mask = (DKL_TX_PRESHOOT_COEFF_MASK | DKL_TX_DE_EMPAHSIS_COEFF_MASK | DKL_TX_VSWING_CONTROL_MASK); - dpcnt_val = DKL_TX_VSWING_CONTROL(ddi_translations[level].dkl.dkl_vswing_control); - dpcnt_val |= DKL_TX_DE_EMPHASIS_COEFF(ddi_translations[level].dkl.dkl_de_emphasis_control); - dpcnt_val |= DKL_TX_PRESHOOT_COEFF(ddi_translations[level].dkl.dkl_preshoot_control); + dpcnt_val = DKL_TX_VSWING_CONTROL(ddi_translations->entries[level].dkl.dkl_vswing_control); + dpcnt_val |= DKL_TX_DE_EMPHASIS_COEFF(ddi_translations->entries[level].dkl.dkl_de_emphasis_control); + dpcnt_val |= DKL_TX_PRESHOOT_COEFF(ddi_translations->entries[level].dkl.dkl_preshoot_control); for (ln = 0; ln < 2; ln++) { intel_de_write(dev_priv, HIP_INDEX_REG(tc_port), diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index 3149b01aaca7..95b8f9b43ea2 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -1027,19 +1027,19 @@ static const struct intel_ddi_buf_trans adlp_dkl_phy_ddi_translations_dp_hbr2_hb .num_entries = ARRAY_SIZE(_adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3), }; -bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table) +bool is_hobl_buf_trans(const struct intel_ddi_buf_trans *table) { - return table == tgl_combo_phy_ddi_translations_edp_hbr2_hobl.entries; + return table == &tgl_combo_phy_ddi_translations_edp_hbr2_hobl; } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * intel_get_buf_trans(const struct intel_ddi_buf_trans *ddi_translations, int *num_entries) { *num_entries = ddi_translations->num_entries; - return ddi_translations->entries; + return ddi_translations; } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1053,7 +1053,7 @@ bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) } } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1070,7 +1070,7 @@ skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) } } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1091,7 +1091,7 @@ kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) } } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1123,7 +1123,7 @@ skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) return skl_get_buf_trans_dp(encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries) { if (IS_SKL_ULX(dev_priv) || @@ -1147,7 +1147,7 @@ static int skl_buf_trans_num_entries(enum port port, int n_entries) return min(n_entries, 9); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1155,12 +1155,12 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv) || IS_COMETLAKE(dev_priv)) { - const union intel_ddi_buf_trans_entry *ddi_translations = + const struct intel_ddi_buf_trans *ddi_translations = kbl_get_buf_trans_dp(encoder, n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); return ddi_translations; } else if (IS_SKYLAKE(dev_priv)) { - const union intel_ddi_buf_trans_entry *ddi_translations = + const struct intel_ddi_buf_trans *ddi_translations = skl_get_buf_trans_dp(encoder, n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); return ddi_translations; @@ -1176,13 +1176,13 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) return NULL; } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) { - const union intel_ddi_buf_trans_entry *ddi_translations = + const struct intel_ddi_buf_trans *ddi_translations = skl_get_buf_trans_edp(encoder, n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); return ddi_translations; @@ -1197,7 +1197,7 @@ hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) return NULL; } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * hsw_get_buf_trans_fdi(struct intel_encoder *encoder, int *n_entries) { @@ -1215,7 +1215,7 @@ hsw_get_buf_trans_fdi(struct intel_encoder *encoder, return NULL; } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) { @@ -1235,7 +1235,7 @@ hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, return NULL; } -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * hsw_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1250,13 +1250,13 @@ hsw_get_buf_trans(struct intel_encoder *encoder, return hsw_get_buf_trans_dp(encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * bxt_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { return intel_get_buf_trans(&bxt_ddi_translations_dp, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1269,13 +1269,13 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) return bxt_get_buf_trans_dp(encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) { return intel_get_buf_trans(&bxt_ddi_translations_hdmi, n_entries); } -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * bxt_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1287,7 +1287,7 @@ bxt_get_buf_trans(struct intel_encoder *encoder, return bxt_get_buf_trans_dp(encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1309,7 +1309,7 @@ cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) return NULL; } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1331,7 +1331,7 @@ cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) return NULL; } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); @@ -1357,7 +1357,7 @@ cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) } } -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * cnl_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1369,7 +1369,7 @@ cnl_get_buf_trans(struct intel_encoder *encoder, return cnl_get_buf_trans_dp(encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1378,7 +1378,7 @@ icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1387,7 +1387,7 @@ icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1411,7 +1411,7 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * icl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1424,7 +1424,7 @@ icl_get_combo_buf_trans(struct intel_encoder *encoder, return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1433,7 +1433,7 @@ icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1447,7 +1447,7 @@ icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, } } -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * icl_get_mg_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1458,7 +1458,7 @@ icl_get_mg_buf_trans(struct intel_encoder *encoder, return icl_get_mg_buf_trans_dp(encoder, crtc_state, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1467,7 +1467,7 @@ ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1476,7 +1476,7 @@ ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1491,7 +1491,7 @@ ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * ehl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1504,7 +1504,7 @@ ehl_get_combo_buf_trans(struct intel_encoder *encoder, return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1513,7 +1513,7 @@ jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1522,7 +1522,7 @@ jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1542,7 +1542,7 @@ jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * jsl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1555,7 +1555,7 @@ jsl_get_combo_buf_trans(struct intel_encoder *encoder, return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1564,7 +1564,7 @@ tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1593,7 +1593,7 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, } } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1615,7 +1615,7 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * tgl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1628,7 +1628,7 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder, return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1637,7 +1637,7 @@ tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1651,7 +1651,7 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, } } -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * tgl_get_dkl_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1662,7 +1662,7 @@ tgl_get_dkl_buf_trans(struct intel_encoder *encoder, return tgl_get_dkl_buf_trans_dp(encoder, crtc_state, n_entries); } -static const union intel_ddi_buf_trans_entry * +static const struct intel_ddi_buf_trans * adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1676,7 +1676,7 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, } } -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * adlp_get_dkl_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h index aa612725d510..2ffa534010b3 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h @@ -58,52 +58,52 @@ struct intel_ddi_buf_trans { u8 num_entries; }; -bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table); +bool is_hobl_buf_trans(const struct intel_ddi_buf_trans *table); int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *default_entry); -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * hsw_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * bxt_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * adlp_get_dkl_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * tgl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * tgl_get_dkl_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * jsl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * ehl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * icl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * icl_get_mg_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -const union intel_ddi_buf_trans_entry * +const struct intel_ddi_buf_trans * cnl_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries); -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 07/17] drm/i915; Return the whole buf_trans struct from get_buf_trans() 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 07/17] drm/i915; Return the whole buf_trans struct from get_buf_trans() Ville Syrjala @ 2021-06-18 12:11 ` Jani Nikula 0 siblings, 0 replies; 39+ messages in thread From: Jani Nikula @ 2021-06-18 12:11 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Raise the abstraction level of the get_buf_trans() functions > a bit more by returning the whole wrapper intel_ddi_buf_trans > struct. > > v2: Handle adl-p > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Holds for v2. > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 76 +++++++------- > .../drm/i915/display/intel_ddi_buf_trans.c | 98 +++++++++---------- > .../drm/i915/display/intel_ddi_buf_trans.h | 22 ++--- > 3 files changed, 98 insertions(+), 98 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index f3fba535812c..37445cec0c23 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -102,7 +102,7 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, > u32 iboost_bit = 0; > int i, n_entries; > enum port port = encoder->port; > - const union intel_ddi_buf_trans_entry *ddi_translations; > + const struct intel_ddi_buf_trans *ddi_translations; > > ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); > > @@ -116,9 +116,9 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, > > for (i = 0; i < n_entries; i++) { > intel_de_write(dev_priv, DDI_BUF_TRANS_LO(port, i), > - ddi_translations[i].hsw.trans1 | iboost_bit); > + ddi_translations->entries[i].hsw.trans1 | iboost_bit); > intel_de_write(dev_priv, DDI_BUF_TRANS_HI(port, i), > - ddi_translations[i].hsw.trans2); > + ddi_translations->entries[i].hsw.trans2); > } > } > > @@ -135,7 +135,7 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, > u32 iboost_bit = 0; > int n_entries; > enum port port = encoder->port; > - const union intel_ddi_buf_trans_entry *ddi_translations; > + const struct intel_ddi_buf_trans *ddi_translations; > > ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); > > @@ -151,9 +151,9 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, > > /* Entry 9 is for HDMI: */ > intel_de_write(dev_priv, DDI_BUF_TRANS_LO(port, 9), > - ddi_translations[level].hsw.trans1 | iboost_bit); > + ddi_translations->entries[level].hsw.trans1 | iboost_bit); > intel_de_write(dev_priv, DDI_BUF_TRANS_HI(port, 9), > - ddi_translations[level].hsw.trans2); > + ddi_translations->entries[level].hsw.trans2); > } > > void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv, > @@ -944,7 +944,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, > iboost = intel_bios_encoder_dp_boost_level(encoder->devdata); > > if (iboost == 0) { > - const union intel_ddi_buf_trans_entry *ddi_translations; > + const struct intel_ddi_buf_trans *ddi_translations; > int n_entries; > > ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); > @@ -954,7 +954,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, > if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) > level = n_entries - 1; > > - iboost = ddi_translations[level].hsw.i_boost; > + iboost = ddi_translations->entries[level].hsw.i_boost; > } > > /* Make sure that the requested I_boost is valid */ > @@ -974,7 +974,7 @@ static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder, > int level) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > - const union intel_ddi_buf_trans_entry *ddi_translations; > + const struct intel_ddi_buf_trans *ddi_translations; > enum port port = encoder->port; > int n_entries; > > @@ -985,10 +985,10 @@ static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder, > level = n_entries - 1; > > bxt_ddi_phy_set_signal_level(dev_priv, port, > - ddi_translations[level].bxt.margin, > - ddi_translations[level].bxt.scale, > - ddi_translations[level].bxt.enable, > - ddi_translations[level].bxt.deemphasis); > + ddi_translations->entries[level].bxt.margin, > + ddi_translations->entries[level].bxt.scale, > + ddi_translations->entries[level].bxt.enable, > + ddi_translations->entries[level].bxt.deemphasis); > } > > static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp, > @@ -1049,7 +1049,7 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, > int level) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > - const union intel_ddi_buf_trans_entry *ddi_translations; > + const struct intel_ddi_buf_trans *ddi_translations; > enum port port = encoder->port; > int n_entries, ln; > u32 val; > @@ -1071,8 +1071,8 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, > val = intel_de_read(dev_priv, CNL_PORT_TX_DW2_LN0(port)); > val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK | > RCOMP_SCALAR_MASK); > - val |= SWING_SEL_UPPER(ddi_translations[level].cnl.dw2_swing_sel); > - val |= SWING_SEL_LOWER(ddi_translations[level].cnl.dw2_swing_sel); > + val |= SWING_SEL_UPPER(ddi_translations->entries[level].cnl.dw2_swing_sel); > + val |= SWING_SEL_LOWER(ddi_translations->entries[level].cnl.dw2_swing_sel); > /* Rcomp scalar is fixed as 0x98 for every table entry */ > val |= RCOMP_SCALAR(0x98); > intel_de_write(dev_priv, CNL_PORT_TX_DW2_GRP(port), val); > @@ -1083,9 +1083,9 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, > val = intel_de_read(dev_priv, CNL_PORT_TX_DW4_LN(ln, port)); > val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK | > CURSOR_COEFF_MASK); > - val |= POST_CURSOR_1(ddi_translations[level].cnl.dw4_post_cursor_1); > - val |= POST_CURSOR_2(ddi_translations[level].cnl.dw4_post_cursor_2); > - val |= CURSOR_COEFF(ddi_translations[level].cnl.dw4_cursor_coeff); > + val |= POST_CURSOR_1(ddi_translations->entries[level].cnl.dw4_post_cursor_1); > + val |= POST_CURSOR_2(ddi_translations->entries[level].cnl.dw4_post_cursor_2); > + val |= CURSOR_COEFF(ddi_translations->entries[level].cnl.dw4_cursor_coeff); > intel_de_write(dev_priv, CNL_PORT_TX_DW4_LN(ln, port), val); > } > > @@ -1100,7 +1100,7 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, > /* Program PORT_TX_DW7 */ > val = intel_de_read(dev_priv, CNL_PORT_TX_DW7_LN0(port)); > val &= ~N_SCALAR_MASK; > - val |= N_SCALAR(ddi_translations[level].cnl.dw7_n_scalar); > + val |= N_SCALAR(ddi_translations->entries[level].cnl.dw7_n_scalar); > intel_de_write(dev_priv, CNL_PORT_TX_DW7_GRP(port), val); > } > > @@ -1170,7 +1170,7 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, > int level) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > - const union intel_ddi_buf_trans_entry *ddi_translations; > + const struct intel_ddi_buf_trans *ddi_translations; > enum phy phy = intel_port_to_phy(dev_priv, encoder->port); > int n_entries, ln; > u32 val; > @@ -1211,8 +1211,8 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, > val = intel_de_read(dev_priv, ICL_PORT_TX_DW2_LN0(phy)); > val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK | > RCOMP_SCALAR_MASK); > - val |= SWING_SEL_UPPER(ddi_translations[level].cnl.dw2_swing_sel); > - val |= SWING_SEL_LOWER(ddi_translations[level].cnl.dw2_swing_sel); > + val |= SWING_SEL_UPPER(ddi_translations->entries[level].cnl.dw2_swing_sel); > + val |= SWING_SEL_LOWER(ddi_translations->entries[level].cnl.dw2_swing_sel); > /* Program Rcomp scalar for every table entry */ > val |= RCOMP_SCALAR(0x98); > intel_de_write(dev_priv, ICL_PORT_TX_DW2_GRP(phy), val); > @@ -1223,16 +1223,16 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, > val = intel_de_read(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy)); > val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK | > CURSOR_COEFF_MASK); > - val |= POST_CURSOR_1(ddi_translations[level].cnl.dw4_post_cursor_1); > - val |= POST_CURSOR_2(ddi_translations[level].cnl.dw4_post_cursor_2); > - val |= CURSOR_COEFF(ddi_translations[level].cnl.dw4_cursor_coeff); > + val |= POST_CURSOR_1(ddi_translations->entries[level].cnl.dw4_post_cursor_1); > + val |= POST_CURSOR_2(ddi_translations->entries[level].cnl.dw4_post_cursor_2); > + val |= CURSOR_COEFF(ddi_translations->entries[level].cnl.dw4_cursor_coeff); > intel_de_write(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy), val); > } > > /* Program PORT_TX_DW7 */ > val = intel_de_read(dev_priv, ICL_PORT_TX_DW7_LN0(phy)); > val &= ~N_SCALAR_MASK; > - val |= N_SCALAR(ddi_translations[level].cnl.dw7_n_scalar); > + val |= N_SCALAR(ddi_translations->entries[level].cnl.dw7_n_scalar); > intel_de_write(dev_priv, ICL_PORT_TX_DW7_GRP(phy), val); > } > > @@ -1303,7 +1303,7 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port); > - const union intel_ddi_buf_trans_entry *ddi_translations; > + const struct intel_ddi_buf_trans *ddi_translations; > int n_entries, ln; > u32 val; > > @@ -1333,13 +1333,13 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > val = intel_de_read(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port)); > val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK; > val |= CRI_TXDEEMPH_OVERRIDE_17_12( > - ddi_translations[level].mg.cri_txdeemph_override_17_12); > + ddi_translations->entries[level].mg.cri_txdeemph_override_17_12); > intel_de_write(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port), val); > > val = intel_de_read(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port)); > val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK; > val |= CRI_TXDEEMPH_OVERRIDE_17_12( > - ddi_translations[level].mg.cri_txdeemph_override_17_12); > + ddi_translations->entries[level].mg.cri_txdeemph_override_17_12); > intel_de_write(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port), val); > } > > @@ -1349,9 +1349,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK | > CRI_TXDEEMPH_OVERRIDE_5_0_MASK); > val |= CRI_TXDEEMPH_OVERRIDE_5_0( > - ddi_translations[level].mg.cri_txdeemph_override_5_0) | > + ddi_translations->entries[level].mg.cri_txdeemph_override_5_0) | > CRI_TXDEEMPH_OVERRIDE_11_6( > - ddi_translations[level].mg.cri_txdeemph_override_11_6) | > + ddi_translations->entries[level].mg.cri_txdeemph_override_11_6) | > CRI_TXDEEMPH_OVERRIDE_EN; > intel_de_write(dev_priv, MG_TX1_DRVCTRL(ln, tc_port), val); > > @@ -1359,9 +1359,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK | > CRI_TXDEEMPH_OVERRIDE_5_0_MASK); > val |= CRI_TXDEEMPH_OVERRIDE_5_0( > - ddi_translations[level].mg.cri_txdeemph_override_5_0) | > + ddi_translations->entries[level].mg.cri_txdeemph_override_5_0) | > CRI_TXDEEMPH_OVERRIDE_11_6( > - ddi_translations[level].mg.cri_txdeemph_override_11_6) | > + ddi_translations->entries[level].mg.cri_txdeemph_override_11_6) | > CRI_TXDEEMPH_OVERRIDE_EN; > intel_de_write(dev_priv, MG_TX2_DRVCTRL(ln, tc_port), val); > > @@ -1441,7 +1441,7 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port); > - const union intel_ddi_buf_trans_entry *ddi_translations; > + const struct intel_ddi_buf_trans *ddi_translations; > u32 val, dpcnt_mask, dpcnt_val; > int n_entries, ln; > > @@ -1461,9 +1461,9 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > dpcnt_mask = (DKL_TX_PRESHOOT_COEFF_MASK | > DKL_TX_DE_EMPAHSIS_COEFF_MASK | > DKL_TX_VSWING_CONTROL_MASK); > - dpcnt_val = DKL_TX_VSWING_CONTROL(ddi_translations[level].dkl.dkl_vswing_control); > - dpcnt_val |= DKL_TX_DE_EMPHASIS_COEFF(ddi_translations[level].dkl.dkl_de_emphasis_control); > - dpcnt_val |= DKL_TX_PRESHOOT_COEFF(ddi_translations[level].dkl.dkl_preshoot_control); > + dpcnt_val = DKL_TX_VSWING_CONTROL(ddi_translations->entries[level].dkl.dkl_vswing_control); > + dpcnt_val |= DKL_TX_DE_EMPHASIS_COEFF(ddi_translations->entries[level].dkl.dkl_de_emphasis_control); > + dpcnt_val |= DKL_TX_PRESHOOT_COEFF(ddi_translations->entries[level].dkl.dkl_preshoot_control); > > for (ln = 0; ln < 2; ln++) { > intel_de_write(dev_priv, HIP_INDEX_REG(tc_port), > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index 3149b01aaca7..95b8f9b43ea2 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -1027,19 +1027,19 @@ static const struct intel_ddi_buf_trans adlp_dkl_phy_ddi_translations_dp_hbr2_hb > .num_entries = ARRAY_SIZE(_adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3), > }; > > -bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table) > +bool is_hobl_buf_trans(const struct intel_ddi_buf_trans *table) > { > - return table == tgl_combo_phy_ddi_translations_edp_hbr2_hobl.entries; > + return table == &tgl_combo_phy_ddi_translations_edp_hbr2_hobl; > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > intel_get_buf_trans(const struct intel_ddi_buf_trans *ddi_translations, int *num_entries) > { > *num_entries = ddi_translations->num_entries; > - return ddi_translations->entries; > + return ddi_translations; > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1053,7 +1053,7 @@ bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > } > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1070,7 +1070,7 @@ skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > } > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1091,7 +1091,7 @@ kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > } > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1123,7 +1123,7 @@ skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > return skl_get_buf_trans_dp(encoder, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries) > { > if (IS_SKL_ULX(dev_priv) || > @@ -1147,7 +1147,7 @@ static int skl_buf_trans_num_entries(enum port port, int n_entries) > return min(n_entries, 9); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1155,12 +1155,12 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > if (IS_KABYLAKE(dev_priv) || > IS_COFFEELAKE(dev_priv) || > IS_COMETLAKE(dev_priv)) { > - const union intel_ddi_buf_trans_entry *ddi_translations = > + const struct intel_ddi_buf_trans *ddi_translations = > kbl_get_buf_trans_dp(encoder, n_entries); > *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); > return ddi_translations; > } else if (IS_SKYLAKE(dev_priv)) { > - const union intel_ddi_buf_trans_entry *ddi_translations = > + const struct intel_ddi_buf_trans *ddi_translations = > skl_get_buf_trans_dp(encoder, n_entries); > *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); > return ddi_translations; > @@ -1176,13 +1176,13 @@ hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > return NULL; > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) { > - const union intel_ddi_buf_trans_entry *ddi_translations = > + const struct intel_ddi_buf_trans *ddi_translations = > skl_get_buf_trans_edp(encoder, n_entries); > *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); > return ddi_translations; > @@ -1197,7 +1197,7 @@ hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > return NULL; > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > hsw_get_buf_trans_fdi(struct intel_encoder *encoder, > int *n_entries) > { > @@ -1215,7 +1215,7 @@ hsw_get_buf_trans_fdi(struct intel_encoder *encoder, > return NULL; > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, > int *n_entries) > { > @@ -1235,7 +1235,7 @@ hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, > return NULL; > } > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > hsw_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1250,13 +1250,13 @@ hsw_get_buf_trans(struct intel_encoder *encoder, > return hsw_get_buf_trans_dp(encoder, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > bxt_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > return intel_get_buf_trans(&bxt_ddi_translations_dp, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1269,13 +1269,13 @@ bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > return bxt_get_buf_trans_dp(encoder, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) > { > return intel_get_buf_trans(&bxt_ddi_translations_hdmi, n_entries); > } > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > bxt_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1287,7 +1287,7 @@ bxt_get_buf_trans(struct intel_encoder *encoder, > return bxt_get_buf_trans_dp(encoder, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1309,7 +1309,7 @@ cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) > return NULL; > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1331,7 +1331,7 @@ cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) > return NULL; > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > @@ -1357,7 +1357,7 @@ cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > } > } > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > cnl_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1369,7 +1369,7 @@ cnl_get_buf_trans(struct intel_encoder *encoder, > return cnl_get_buf_trans_dp(encoder, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1378,7 +1378,7 @@ icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1387,7 +1387,7 @@ icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1411,7 +1411,7 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > icl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1424,7 +1424,7 @@ icl_get_combo_buf_trans(struct intel_encoder *encoder, > return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1433,7 +1433,7 @@ icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, > n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1447,7 +1447,7 @@ icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, > } > } > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > icl_get_mg_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1458,7 +1458,7 @@ icl_get_mg_buf_trans(struct intel_encoder *encoder, > return icl_get_mg_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1467,7 +1467,7 @@ ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1476,7 +1476,7 @@ ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1491,7 +1491,7 @@ ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > ehl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1504,7 +1504,7 @@ ehl_get_combo_buf_trans(struct intel_encoder *encoder, > return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1513,7 +1513,7 @@ jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1522,7 +1522,7 @@ jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1542,7 +1542,7 @@ jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > jsl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1555,7 +1555,7 @@ jsl_get_combo_buf_trans(struct intel_encoder *encoder, > return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1564,7 +1564,7 @@ tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1593,7 +1593,7 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > } > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1615,7 +1615,7 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > tgl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1628,7 +1628,7 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder, > return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1637,7 +1637,7 @@ tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, > n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1651,7 +1651,7 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > } > } > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > tgl_get_dkl_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1662,7 +1662,7 @@ tgl_get_dkl_buf_trans(struct intel_encoder *encoder, > return tgl_get_dkl_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const union intel_ddi_buf_trans_entry * > +static const struct intel_ddi_buf_trans * > adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1676,7 +1676,7 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > } > } > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > adlp_get_dkl_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > index aa612725d510..2ffa534010b3 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > @@ -58,52 +58,52 @@ struct intel_ddi_buf_trans { > u8 num_entries; > }; > > -bool is_hobl_buf_trans(const union intel_ddi_buf_trans_entry *table); > +bool is_hobl_buf_trans(const struct intel_ddi_buf_trans *table); > > int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *default_entry); > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > hsw_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > bxt_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > adlp_get_dkl_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > tgl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > tgl_get_dkl_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > jsl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > ehl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > icl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > icl_get_mg_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); > > -const union intel_ddi_buf_trans_entry * > +const struct intel_ddi_buf_trans * > cnl_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries); -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 08/17] drm/i915: Store the HDMI default entry in the bug trans struct 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (6 preceding siblings ...) 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 07/17] drm/i915; Return the whole buf_trans struct from get_buf_trans() Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 09/17] drm/i915: Introduce encoder->get_buf_trans() Ville Syrjala ` (13 subsequent siblings) 21 siblings, 0 replies; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> Store the default HDMI buf trans entry in struct intel_ddi_buf_trans so that it's next to the actual table. This let's us start ridding ourselves of some platofrm specifics in intel_ddi_hdmi_num_entries(). Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 49 ++++++++++--------- .../drm/i915/display/intel_ddi_buf_trans.h | 1 + 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index 95b8f9b43ea2..fd2216dc8c33 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -66,6 +66,7 @@ static const union intel_ddi_buf_trans_entry _hsw_ddi_translations_hdmi[] = { static const struct intel_ddi_buf_trans hsw_ddi_translations_hdmi = { .entries = _hsw_ddi_translations_hdmi, .num_entries = ARRAY_SIZE(_hsw_ddi_translations_hdmi), + .hdmi_default_entry = 6, }; static const union intel_ddi_buf_trans_entry _bdw_ddi_translations_edp[] = { @@ -136,6 +137,7 @@ static const union intel_ddi_buf_trans_entry _bdw_ddi_translations_hdmi[] = { static const struct intel_ddi_buf_trans bdw_ddi_translations_hdmi = { .entries = _bdw_ddi_translations_hdmi, .num_entries = ARRAY_SIZE(_bdw_ddi_translations_hdmi), + .hdmi_default_entry = 7, }; /* Skylake H and S */ @@ -330,6 +332,7 @@ static const union intel_ddi_buf_trans_entry _skl_ddi_translations_hdmi[] = { static const struct intel_ddi_buf_trans skl_ddi_translations_hdmi = { .entries = _skl_ddi_translations_hdmi, .num_entries = ARRAY_SIZE(_skl_ddi_translations_hdmi), + .hdmi_default_entry = 8, }; /* Skylake/Kabylake Y */ @@ -350,6 +353,7 @@ static const union intel_ddi_buf_trans_entry _skl_y_ddi_translations_hdmi[] = { static const struct intel_ddi_buf_trans skl_y_ddi_translations_hdmi = { .entries = _skl_y_ddi_translations_hdmi, .num_entries = ARRAY_SIZE(_skl_y_ddi_translations_hdmi), + .hdmi_default_entry = 8, }; static const union intel_ddi_buf_trans_entry _bxt_ddi_translations_dp[] = { @@ -410,6 +414,7 @@ static const union intel_ddi_buf_trans_entry _bxt_ddi_translations_hdmi[] = { static const struct intel_ddi_buf_trans bxt_ddi_translations_hdmi = { .entries = _bxt_ddi_translations_hdmi, .num_entries = ARRAY_SIZE(_bxt_ddi_translations_hdmi), + .hdmi_default_entry = ARRAY_SIZE(_bxt_ddi_translations_hdmi) - 1, }; /* Voltage Swing Programming for VccIO 0.85V for DP */ @@ -447,6 +452,7 @@ static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_hdmi_0_85V[] static const struct intel_ddi_buf_trans cnl_ddi_translations_hdmi_0_85V = { .entries = _cnl_ddi_translations_hdmi_0_85V, .num_entries = ARRAY_SIZE(_cnl_ddi_translations_hdmi_0_85V), + .hdmi_default_entry = ARRAY_SIZE(_cnl_ddi_translations_hdmi_0_85V) - 1, }; /* Voltage Swing Programming for VccIO 0.85V for eDP */ @@ -507,6 +513,7 @@ static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_hdmi_0_95V[] static const struct intel_ddi_buf_trans cnl_ddi_translations_hdmi_0_95V = { .entries = _cnl_ddi_translations_hdmi_0_95V, .num_entries = ARRAY_SIZE(_cnl_ddi_translations_hdmi_0_95V), + .hdmi_default_entry = ARRAY_SIZE(_cnl_ddi_translations_hdmi_0_95V) - 1, }; /* Voltage Swing Programming for VccIO 0.95V for eDP */ @@ -568,6 +575,7 @@ static const union intel_ddi_buf_trans_entry _cnl_ddi_translations_hdmi_1_05V[] static const struct intel_ddi_buf_trans cnl_ddi_translations_hdmi_1_05V = { .entries = _cnl_ddi_translations_hdmi_1_05V, .num_entries = ARRAY_SIZE(_cnl_ddi_translations_hdmi_1_05V), + .hdmi_default_entry = ARRAY_SIZE(_cnl_ddi_translations_hdmi_1_05V) - 1, }; /* Voltage Swing Programming for VccIO 1.05V for eDP */ @@ -661,6 +669,7 @@ static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_hdm static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_hdmi = { .entries = _icl_combo_phy_ddi_translations_hdmi, .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_hdmi), + .hdmi_default_entry = ARRAY_SIZE(_icl_combo_phy_ddi_translations_hdmi) - 1, }; static const union intel_ddi_buf_trans_entry _ehl_combo_phy_ddi_translations_dp[] = { @@ -813,6 +822,7 @@ static const union intel_ddi_buf_trans_entry _icl_mg_phy_ddi_translations_hdmi[] static const struct intel_ddi_buf_trans icl_mg_phy_ddi_translations_hdmi = { .entries = _icl_mg_phy_ddi_translations_hdmi, .num_entries = ARRAY_SIZE(_icl_mg_phy_ddi_translations_hdmi), + .hdmi_default_entry = ARRAY_SIZE(_icl_mg_phy_ddi_translations_hdmi) - 1, }; static const union intel_ddi_buf_trans_entry _tgl_dkl_phy_ddi_translations_dp_hbr[] = { @@ -870,6 +880,7 @@ static const union intel_ddi_buf_trans_entry _tgl_dkl_phy_ddi_translations_hdmi[ static const struct intel_ddi_buf_trans tgl_dkl_phy_ddi_translations_hdmi = { .entries = _tgl_dkl_phy_ddi_translations_hdmi, .num_entries = ARRAY_SIZE(_tgl_dkl_phy_ddi_translations_hdmi), + .hdmi_default_entry = ARRAY_SIZE(_tgl_dkl_phy_ddi_translations_hdmi) - 1, }; static const union intel_ddi_buf_trans_entry _tgl_combo_phy_ddi_translations_dp_hbr[] = { @@ -1693,42 +1704,34 @@ int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); enum phy phy = intel_port_to_phy(dev_priv, encoder->port); + const struct intel_ddi_buf_trans *ddi_translations = NULL; int n_entries; if (DISPLAY_VER(dev_priv) >= 12) { if (intel_phy_is_combo(dev_priv, phy)) - tgl_get_combo_buf_trans_hdmi(encoder, crtc_state, &n_entries); + ddi_translations = tgl_get_combo_buf_trans_hdmi(encoder, crtc_state, &n_entries); else - tgl_get_dkl_buf_trans_hdmi(encoder, crtc_state, &n_entries); - *default_entry = n_entries - 1; + ddi_translations = tgl_get_dkl_buf_trans_hdmi(encoder, crtc_state, &n_entries); } else if (DISPLAY_VER(dev_priv) == 11) { if (intel_phy_is_combo(dev_priv, phy)) - icl_get_combo_buf_trans_hdmi(encoder, crtc_state, &n_entries); + ddi_translations = icl_get_combo_buf_trans_hdmi(encoder, crtc_state, &n_entries); else - icl_get_mg_buf_trans_hdmi(encoder, crtc_state, &n_entries); - *default_entry = n_entries - 1; + ddi_translations = icl_get_mg_buf_trans_hdmi(encoder, crtc_state, &n_entries); } else if (IS_CANNONLAKE(dev_priv)) { - cnl_get_buf_trans_hdmi(encoder, &n_entries); - *default_entry = n_entries - 1; + ddi_translations = cnl_get_buf_trans_hdmi(encoder, &n_entries); } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) { - bxt_get_buf_trans_hdmi(encoder, &n_entries); - *default_entry = n_entries - 1; - } else if (DISPLAY_VER(dev_priv) == 9) { - hsw_get_buf_trans_hdmi(encoder, &n_entries); - *default_entry = 8; - } else if (IS_BROADWELL(dev_priv)) { - hsw_get_buf_trans_hdmi(encoder, &n_entries); - *default_entry = 7; - } else if (IS_HASWELL(dev_priv)) { - hsw_get_buf_trans_hdmi(encoder, &n_entries); - *default_entry = 6; - } else { - drm_WARN(&dev_priv->drm, 1, "ddi translation table missing\n"); - return 0; + ddi_translations = bxt_get_buf_trans_hdmi(encoder, &n_entries); + } else if (DISPLAY_VER(dev_priv) == 9 || + IS_BROADWELL(dev_priv) || IS_HASWELL(dev_priv)) { + ddi_translations = hsw_get_buf_trans_hdmi(encoder, &n_entries); } - if (drm_WARN_ON_ONCE(&dev_priv->drm, n_entries == 0)) + if (drm_WARN_ON(&dev_priv->drm, !ddi_translations)) { + *default_entry = 0; return 0; + } + + *default_entry = ddi_translations->hdmi_default_entry; return n_entries; } diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h index 2ffa534010b3..879f1deec3c8 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h @@ -56,6 +56,7 @@ union intel_ddi_buf_trans_entry { struct intel_ddi_buf_trans { const union intel_ddi_buf_trans_entry *entries; u8 num_entries; + u8 hdmi_default_entry; }; bool is_hobl_buf_trans(const struct intel_ddi_buf_trans *table); -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 09/17] drm/i915: Introduce encoder->get_buf_trans() 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (7 preceding siblings ...) 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 08/17] drm/i915: Store the HDMI default entry in the bug trans struct Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-18 12:19 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 10/17] drm/i915: Clean up hsw/bdw/skl/kbl buf trans funcs Ville Syrjala ` (12 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> Convert the get_buf_trans() functions into an encoder vfunc. Allows us to get rid of bunch of platform if-ladders. v2: Handle adl-p Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/display/intel_crt.c | 3 + drivers/gpu/drm/i915/display/intel_ddi.c | 61 +++------------ .../drm/i915/display/intel_ddi_buf_trans.c | 75 +++++++++++-------- .../drm/i915/display/intel_ddi_buf_trans.h | 44 +---------- .../drm/i915/display/intel_display_types.h | 4 + drivers/gpu/drm/i915/display/intel_fdi.c | 3 +- 6 files changed, 65 insertions(+), 125 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c index 648f1c0d3d39..408f82b0dc7d 100644 --- a/drivers/gpu/drm/i915/display/intel_crt.c +++ b/drivers/gpu/drm/i915/display/intel_crt.c @@ -38,6 +38,7 @@ #include "intel_crt.h" #include "intel_crtc.h" #include "intel_ddi.h" +#include "intel_ddi_buf_trans.h" #include "intel_de.h" #include "intel_display_types.h" #include "intel_fdi.h" @@ -1081,6 +1082,8 @@ void intel_crt_init(struct drm_i915_private *dev_priv) crt->base.enable_clock = hsw_ddi_enable_clock; crt->base.disable_clock = hsw_ddi_disable_clock; crt->base.is_clock_enabled = hsw_ddi_is_clock_enabled; + + intel_ddi_buf_trans_init(&crt->base); } else { if (HAS_PCH_SPLIT(dev_priv)) { crt->base.compute_config = pch_crt_compute_config; diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 37445cec0c23..d8b4db602d30 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -104,8 +104,7 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, enum port port = encoder->port; const struct intel_ddi_buf_trans *ddi_translations; - ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); - + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; @@ -137,8 +136,7 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, enum port port = encoder->port; const struct intel_ddi_buf_trans *ddi_translations; - ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); - + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) @@ -947,8 +945,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, const struct intel_ddi_buf_trans *ddi_translations; int n_entries; - ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); - + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) @@ -978,7 +975,7 @@ static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder, enum port port = encoder->port; int n_entries; - ddi_translations = bxt_get_buf_trans(encoder, crtc_state, &n_entries); + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) @@ -996,33 +993,9 @@ static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp, { struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - enum port port = encoder->port; - enum phy phy = intel_port_to_phy(dev_priv, port); int n_entries; - if (DISPLAY_VER(dev_priv) >= 12) { - if (intel_phy_is_combo(dev_priv, phy)) - tgl_get_combo_buf_trans(encoder, crtc_state, &n_entries); - else if (IS_ALDERLAKE_P(dev_priv)) - adlp_get_dkl_buf_trans(encoder, crtc_state, &n_entries); - else - tgl_get_dkl_buf_trans(encoder, crtc_state, &n_entries); - } else if (DISPLAY_VER(dev_priv) == 11) { - 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); - else - icl_get_mg_buf_trans(encoder, crtc_state, &n_entries); - } else if (IS_CANNONLAKE(dev_priv)) { - cnl_get_buf_trans(encoder, crtc_state, &n_entries); - } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) { - bxt_get_buf_trans(encoder, crtc_state, &n_entries); - } else { - hsw_get_buf_trans(encoder, crtc_state, &n_entries); - } + encoder->get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON(&dev_priv->drm, n_entries < 1)) n_entries = 1; @@ -1054,8 +1027,7 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, int n_entries, ln; u32 val; - ddi_translations = cnl_get_buf_trans(encoder, crtc_state, &n_entries); - + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) @@ -1175,15 +1147,7 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, int n_entries, ln; u32 val; - if (DISPLAY_VER(dev_priv) >= 12) - ddi_translations = tgl_get_combo_buf_trans(encoder, crtc_state, &n_entries); - 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); - + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) @@ -1310,8 +1274,7 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, if (enc_to_dig_port(encoder)->tc_mode == TC_PORT_TBT_ALT) return; - ddi_translations = icl_get_mg_buf_trans(encoder, crtc_state, &n_entries); - + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) @@ -1448,11 +1411,7 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, if (enc_to_dig_port(encoder)->tc_mode == TC_PORT_TBT_ALT) return; - if (IS_ALDERLAKE_P(dev_priv)) - ddi_translations = adlp_get_dkl_buf_trans(encoder, crtc_state, &n_entries); - else - ddi_translations = tgl_get_dkl_buf_trans(encoder, crtc_state, &n_entries); - + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) return; if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) @@ -4662,6 +4621,8 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder->get_config = hsw_ddi_get_config; } + intel_ddi_buf_trans_init(encoder); + if (DISPLAY_VER(dev_priv) >= 13) encoder->hpd_pin = xelpd_hpd_pin(dev_priv, port); else if (IS_DG1(dev_priv)) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index fd2216dc8c33..f8915a8c78d8 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -1246,7 +1246,7 @@ hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, return NULL; } -const struct intel_ddi_buf_trans * +static const struct intel_ddi_buf_trans * hsw_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1286,7 +1286,7 @@ bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) return intel_get_buf_trans(&bxt_ddi_translations_hdmi, n_entries); } -const struct intel_ddi_buf_trans * +static const struct intel_ddi_buf_trans * bxt_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1368,7 +1368,7 @@ cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) } } -const struct intel_ddi_buf_trans * +static const struct intel_ddi_buf_trans * cnl_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1422,7 +1422,7 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const struct intel_ddi_buf_trans * +static const struct intel_ddi_buf_trans * icl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1458,7 +1458,7 @@ icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, } } -const struct intel_ddi_buf_trans * +static const struct intel_ddi_buf_trans * icl_get_mg_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1502,7 +1502,7 @@ ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const struct intel_ddi_buf_trans * +static const struct intel_ddi_buf_trans * ehl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1553,7 +1553,7 @@ jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const struct intel_ddi_buf_trans * +static const struct intel_ddi_buf_trans * jsl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1626,7 +1626,7 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -const struct intel_ddi_buf_trans * +static const struct intel_ddi_buf_trans * tgl_get_combo_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1662,7 +1662,7 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, } } -const struct intel_ddi_buf_trans * +static const struct intel_ddi_buf_trans * tgl_get_dkl_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1687,7 +1687,7 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, } } -const struct intel_ddi_buf_trans * +static const struct intel_ddi_buf_trans * adlp_get_dkl_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) @@ -1703,28 +1703,10 @@ int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, int *default_entry) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - enum phy phy = intel_port_to_phy(dev_priv, encoder->port); - const struct intel_ddi_buf_trans *ddi_translations = NULL; + const struct intel_ddi_buf_trans *ddi_translations; int n_entries; - if (DISPLAY_VER(dev_priv) >= 12) { - if (intel_phy_is_combo(dev_priv, phy)) - ddi_translations = tgl_get_combo_buf_trans_hdmi(encoder, crtc_state, &n_entries); - else - ddi_translations = tgl_get_dkl_buf_trans_hdmi(encoder, crtc_state, &n_entries); - } else if (DISPLAY_VER(dev_priv) == 11) { - if (intel_phy_is_combo(dev_priv, phy)) - ddi_translations = icl_get_combo_buf_trans_hdmi(encoder, crtc_state, &n_entries); - else - ddi_translations = icl_get_mg_buf_trans_hdmi(encoder, crtc_state, &n_entries); - } else if (IS_CANNONLAKE(dev_priv)) { - ddi_translations = cnl_get_buf_trans_hdmi(encoder, &n_entries); - } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) { - ddi_translations = bxt_get_buf_trans_hdmi(encoder, &n_entries); - } else if (DISPLAY_VER(dev_priv) == 9 || - IS_BROADWELL(dev_priv) || IS_HASWELL(dev_priv)) { - ddi_translations = hsw_get_buf_trans_hdmi(encoder, &n_entries); - } + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); if (drm_WARN_ON(&dev_priv->drm, !ddi_translations)) { *default_entry = 0; @@ -1735,3 +1717,36 @@ int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, return n_entries; } + +void intel_ddi_buf_trans_init(struct intel_encoder *encoder) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + enum phy phy = intel_port_to_phy(i915, encoder->port); + + if (IS_ALDERLAKE_P(i915)) { + if (intel_phy_is_combo(i915, phy)) + encoder->get_buf_trans = tgl_get_combo_buf_trans; + else + encoder->get_buf_trans = adlp_get_dkl_buf_trans; + } else if (DISPLAY_VER(i915) >= 12) { + if (intel_phy_is_combo(i915, phy)) + encoder->get_buf_trans = tgl_get_combo_buf_trans; + else + encoder->get_buf_trans = tgl_get_dkl_buf_trans; + } else if (DISPLAY_VER(i915) == 11) { + if (IS_PLATFORM(i915, INTEL_JASPERLAKE)) + encoder->get_buf_trans = jsl_get_combo_buf_trans; + else if (IS_PLATFORM(i915, INTEL_ELKHARTLAKE)) + encoder->get_buf_trans = ehl_get_combo_buf_trans; + else if (intel_phy_is_combo(i915, phy)) + encoder->get_buf_trans = icl_get_combo_buf_trans; + else + encoder->get_buf_trans = icl_get_mg_buf_trans; + } else if (IS_CANNONLAKE(i915)) { + encoder->get_buf_trans = cnl_get_buf_trans; + } else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915)) { + encoder->get_buf_trans = bxt_get_buf_trans; + } else { + encoder->get_buf_trans = hsw_get_buf_trans; + } +} diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h index 879f1deec3c8..05226eb46cd6 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h @@ -65,48 +65,6 @@ int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *default_entry); -const struct intel_ddi_buf_trans * -hsw_get_buf_trans(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries); - -const struct intel_ddi_buf_trans * -bxt_get_buf_trans(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries); - -const struct intel_ddi_buf_trans * -adlp_get_dkl_buf_trans(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries); -const struct intel_ddi_buf_trans * -tgl_get_combo_buf_trans(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries); -const struct intel_ddi_buf_trans * -tgl_get_dkl_buf_trans(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries); -const struct intel_ddi_buf_trans * -jsl_get_combo_buf_trans(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries); -const struct intel_ddi_buf_trans * -ehl_get_combo_buf_trans(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries); -const struct intel_ddi_buf_trans * -icl_get_combo_buf_trans(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries); -const struct intel_ddi_buf_trans * -icl_get_mg_buf_trans(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries); - -const struct intel_ddi_buf_trans * -cnl_get_buf_trans(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries); +void intel_ddi_buf_trans_init(struct intel_encoder *encoder); #endif diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index b8d1f702d808..d4a0994f8619 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -48,6 +48,7 @@ struct drm_printer; struct __intel_global_objs_state; +struct intel_ddi_buf_trans; /* * Display related stuff @@ -263,6 +264,9 @@ struct intel_encoder { * Returns whether the port clock is enabled or not. */ bool (*is_clock_enabled)(struct intel_encoder *encoder); + const struct intel_ddi_buf_trans *(*get_buf_trans)(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries); enum hpd_pin hpd_pin; enum intel_display_power_domain power_domain; /* for communication with audio component; protected by av_mutex */ diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c index c602ed17c4fb..15ea28726e7a 100644 --- a/drivers/gpu/drm/i915/display/intel_fdi.c +++ b/drivers/gpu/drm/i915/display/intel_fdi.c @@ -4,7 +4,6 @@ */ #include "intel_atomic.h" #include "intel_ddi.h" -#include "intel_ddi_buf_trans.h" #include "intel_de.h" #include "intel_display_types.h" #include "intel_fdi.h" @@ -569,7 +568,7 @@ void hsw_fdi_link_train(struct intel_encoder *encoder, u32 temp, i, rx_ctl_val; int n_entries; - hsw_get_buf_trans(encoder, crtc_state, &n_entries); + encoder->get_buf_trans(encoder, crtc_state, &n_entries); hsw_prepare_dp_ddi_buffers(encoder, crtc_state); -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 09/17] drm/i915: Introduce encoder->get_buf_trans() 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 09/17] drm/i915: Introduce encoder->get_buf_trans() Ville Syrjala @ 2021-06-18 12:19 ` Jani Nikula 0 siblings, 0 replies; 39+ messages in thread From: Jani Nikula @ 2021-06-18 12:19 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Convert the get_buf_trans() functions into an encoder vfunc. > Allows us to get rid of bunch of platform if-ladders. > > v2: Handle adl-p > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Holds for v2. > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_crt.c | 3 + > drivers/gpu/drm/i915/display/intel_ddi.c | 61 +++------------ > .../drm/i915/display/intel_ddi_buf_trans.c | 75 +++++++++++-------- > .../drm/i915/display/intel_ddi_buf_trans.h | 44 +---------- > .../drm/i915/display/intel_display_types.h | 4 + > drivers/gpu/drm/i915/display/intel_fdi.c | 3 +- > 6 files changed, 65 insertions(+), 125 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c > index 648f1c0d3d39..408f82b0dc7d 100644 > --- a/drivers/gpu/drm/i915/display/intel_crt.c > +++ b/drivers/gpu/drm/i915/display/intel_crt.c > @@ -38,6 +38,7 @@ > #include "intel_crt.h" > #include "intel_crtc.h" > #include "intel_ddi.h" > +#include "intel_ddi_buf_trans.h" > #include "intel_de.h" > #include "intel_display_types.h" > #include "intel_fdi.h" > @@ -1081,6 +1082,8 @@ void intel_crt_init(struct drm_i915_private *dev_priv) > crt->base.enable_clock = hsw_ddi_enable_clock; > crt->base.disable_clock = hsw_ddi_disable_clock; > crt->base.is_clock_enabled = hsw_ddi_is_clock_enabled; > + > + intel_ddi_buf_trans_init(&crt->base); > } else { > if (HAS_PCH_SPLIT(dev_priv)) { > crt->base.compute_config = pch_crt_compute_config; > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 37445cec0c23..d8b4db602d30 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -104,8 +104,7 @@ void hsw_prepare_dp_ddi_buffers(struct intel_encoder *encoder, > enum port port = encoder->port; > const struct intel_ddi_buf_trans *ddi_translations; > > - ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); > - > + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); > if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) > return; > > @@ -137,8 +136,7 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, > enum port port = encoder->port; > const struct intel_ddi_buf_trans *ddi_translations; > > - ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); > - > + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); > if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) > return; > if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) > @@ -947,8 +945,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder, > const struct intel_ddi_buf_trans *ddi_translations; > int n_entries; > > - ddi_translations = hsw_get_buf_trans(encoder, crtc_state, &n_entries); > - > + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); > if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) > return; > if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) > @@ -978,7 +975,7 @@ static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder, > enum port port = encoder->port; > int n_entries; > > - ddi_translations = bxt_get_buf_trans(encoder, crtc_state, &n_entries); > + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); > if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) > return; > if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) > @@ -996,33 +993,9 @@ static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp, > { > struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base; > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > - enum port port = encoder->port; > - enum phy phy = intel_port_to_phy(dev_priv, port); > int n_entries; > > - if (DISPLAY_VER(dev_priv) >= 12) { > - if (intel_phy_is_combo(dev_priv, phy)) > - tgl_get_combo_buf_trans(encoder, crtc_state, &n_entries); > - else if (IS_ALDERLAKE_P(dev_priv)) > - adlp_get_dkl_buf_trans(encoder, crtc_state, &n_entries); > - else > - tgl_get_dkl_buf_trans(encoder, crtc_state, &n_entries); > - } else if (DISPLAY_VER(dev_priv) == 11) { > - 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); > - else > - icl_get_mg_buf_trans(encoder, crtc_state, &n_entries); > - } else if (IS_CANNONLAKE(dev_priv)) { > - cnl_get_buf_trans(encoder, crtc_state, &n_entries); > - } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) { > - bxt_get_buf_trans(encoder, crtc_state, &n_entries); > - } else { > - hsw_get_buf_trans(encoder, crtc_state, &n_entries); > - } > + encoder->get_buf_trans(encoder, crtc_state, &n_entries); > > if (drm_WARN_ON(&dev_priv->drm, n_entries < 1)) > n_entries = 1; > @@ -1054,8 +1027,7 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, > int n_entries, ln; > u32 val; > > - ddi_translations = cnl_get_buf_trans(encoder, crtc_state, &n_entries); > - > + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); > if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) > return; > if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) > @@ -1175,15 +1147,7 @@ static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, > int n_entries, ln; > u32 val; > > - if (DISPLAY_VER(dev_priv) >= 12) > - ddi_translations = tgl_get_combo_buf_trans(encoder, crtc_state, &n_entries); > - 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); > - > + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); > if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) > return; > if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) > @@ -1310,8 +1274,7 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > if (enc_to_dig_port(encoder)->tc_mode == TC_PORT_TBT_ALT) > return; > > - ddi_translations = icl_get_mg_buf_trans(encoder, crtc_state, &n_entries); > - > + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); > if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) > return; > if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) > @@ -1448,11 +1411,7 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, > if (enc_to_dig_port(encoder)->tc_mode == TC_PORT_TBT_ALT) > return; > > - if (IS_ALDERLAKE_P(dev_priv)) > - ddi_translations = adlp_get_dkl_buf_trans(encoder, crtc_state, &n_entries); > - else > - ddi_translations = tgl_get_dkl_buf_trans(encoder, crtc_state, &n_entries); > - > + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); > if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) > return; > if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries)) > @@ -4662,6 +4621,8 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) > encoder->get_config = hsw_ddi_get_config; > } > > + intel_ddi_buf_trans_init(encoder); > + > if (DISPLAY_VER(dev_priv) >= 13) > encoder->hpd_pin = xelpd_hpd_pin(dev_priv, port); > else if (IS_DG1(dev_priv)) > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index fd2216dc8c33..f8915a8c78d8 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -1246,7 +1246,7 @@ hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, > return NULL; > } > > -const struct intel_ddi_buf_trans * > +static const struct intel_ddi_buf_trans * > hsw_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1286,7 +1286,7 @@ bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) > return intel_get_buf_trans(&bxt_ddi_translations_hdmi, n_entries); > } > > -const struct intel_ddi_buf_trans * > +static const struct intel_ddi_buf_trans * > bxt_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1368,7 +1368,7 @@ cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) > } > } > > -const struct intel_ddi_buf_trans * > +static const struct intel_ddi_buf_trans * > cnl_get_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1422,7 +1422,7 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const struct intel_ddi_buf_trans * > +static const struct intel_ddi_buf_trans * > icl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1458,7 +1458,7 @@ icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, > } > } > > -const struct intel_ddi_buf_trans * > +static const struct intel_ddi_buf_trans * > icl_get_mg_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1502,7 +1502,7 @@ ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const struct intel_ddi_buf_trans * > +static const struct intel_ddi_buf_trans * > ehl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1553,7 +1553,7 @@ jsl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const struct intel_ddi_buf_trans * > +static const struct intel_ddi_buf_trans * > jsl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1626,7 +1626,7 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -const struct intel_ddi_buf_trans * > +static const struct intel_ddi_buf_trans * > tgl_get_combo_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1662,7 +1662,7 @@ tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > } > } > > -const struct intel_ddi_buf_trans * > +static const struct intel_ddi_buf_trans * > tgl_get_dkl_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1687,7 +1687,7 @@ adlp_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > } > } > > -const struct intel_ddi_buf_trans * > +static const struct intel_ddi_buf_trans * > adlp_get_dkl_buf_trans(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > @@ -1703,28 +1703,10 @@ int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, > int *default_entry) > { > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > - enum phy phy = intel_port_to_phy(dev_priv, encoder->port); > - const struct intel_ddi_buf_trans *ddi_translations = NULL; > + const struct intel_ddi_buf_trans *ddi_translations; > int n_entries; > > - if (DISPLAY_VER(dev_priv) >= 12) { > - if (intel_phy_is_combo(dev_priv, phy)) > - ddi_translations = tgl_get_combo_buf_trans_hdmi(encoder, crtc_state, &n_entries); > - else > - ddi_translations = tgl_get_dkl_buf_trans_hdmi(encoder, crtc_state, &n_entries); > - } else if (DISPLAY_VER(dev_priv) == 11) { > - if (intel_phy_is_combo(dev_priv, phy)) > - ddi_translations = icl_get_combo_buf_trans_hdmi(encoder, crtc_state, &n_entries); > - else > - ddi_translations = icl_get_mg_buf_trans_hdmi(encoder, crtc_state, &n_entries); > - } else if (IS_CANNONLAKE(dev_priv)) { > - ddi_translations = cnl_get_buf_trans_hdmi(encoder, &n_entries); > - } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) { > - ddi_translations = bxt_get_buf_trans_hdmi(encoder, &n_entries); > - } else if (DISPLAY_VER(dev_priv) == 9 || > - IS_BROADWELL(dev_priv) || IS_HASWELL(dev_priv)) { > - ddi_translations = hsw_get_buf_trans_hdmi(encoder, &n_entries); > - } > + ddi_translations = encoder->get_buf_trans(encoder, crtc_state, &n_entries); > > if (drm_WARN_ON(&dev_priv->drm, !ddi_translations)) { > *default_entry = 0; > @@ -1735,3 +1717,36 @@ int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, > > return n_entries; > } > + > +void intel_ddi_buf_trans_init(struct intel_encoder *encoder) > +{ > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > + enum phy phy = intel_port_to_phy(i915, encoder->port); > + > + if (IS_ALDERLAKE_P(i915)) { > + if (intel_phy_is_combo(i915, phy)) > + encoder->get_buf_trans = tgl_get_combo_buf_trans; > + else > + encoder->get_buf_trans = adlp_get_dkl_buf_trans; > + } else if (DISPLAY_VER(i915) >= 12) { > + if (intel_phy_is_combo(i915, phy)) > + encoder->get_buf_trans = tgl_get_combo_buf_trans; > + else > + encoder->get_buf_trans = tgl_get_dkl_buf_trans; > + } else if (DISPLAY_VER(i915) == 11) { > + if (IS_PLATFORM(i915, INTEL_JASPERLAKE)) > + encoder->get_buf_trans = jsl_get_combo_buf_trans; > + else if (IS_PLATFORM(i915, INTEL_ELKHARTLAKE)) > + encoder->get_buf_trans = ehl_get_combo_buf_trans; > + else if (intel_phy_is_combo(i915, phy)) > + encoder->get_buf_trans = icl_get_combo_buf_trans; > + else > + encoder->get_buf_trans = icl_get_mg_buf_trans; > + } else if (IS_CANNONLAKE(i915)) { > + encoder->get_buf_trans = cnl_get_buf_trans; > + } else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915)) { > + encoder->get_buf_trans = bxt_get_buf_trans; > + } else { > + encoder->get_buf_trans = hsw_get_buf_trans; > + } > +} > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > index 879f1deec3c8..05226eb46cd6 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h > @@ -65,48 +65,6 @@ int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *default_entry); > > -const struct intel_ddi_buf_trans * > -hsw_get_buf_trans(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries); > - > -const struct intel_ddi_buf_trans * > -bxt_get_buf_trans(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries); > - > -const struct intel_ddi_buf_trans * > -adlp_get_dkl_buf_trans(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries); > -const struct intel_ddi_buf_trans * > -tgl_get_combo_buf_trans(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries); > -const struct intel_ddi_buf_trans * > -tgl_get_dkl_buf_trans(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries); > -const struct intel_ddi_buf_trans * > -jsl_get_combo_buf_trans(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries); > -const struct intel_ddi_buf_trans * > -ehl_get_combo_buf_trans(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries); > -const struct intel_ddi_buf_trans * > -icl_get_combo_buf_trans(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries); > -const struct intel_ddi_buf_trans * > -icl_get_mg_buf_trans(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries); > - > -const struct intel_ddi_buf_trans * > -cnl_get_buf_trans(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries); > +void intel_ddi_buf_trans_init(struct intel_encoder *encoder); > > #endif > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h > index b8d1f702d808..d4a0994f8619 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -48,6 +48,7 @@ > > struct drm_printer; > struct __intel_global_objs_state; > +struct intel_ddi_buf_trans; > > /* > * Display related stuff > @@ -263,6 +264,9 @@ struct intel_encoder { > * Returns whether the port clock is enabled or not. > */ > bool (*is_clock_enabled)(struct intel_encoder *encoder); > + const struct intel_ddi_buf_trans *(*get_buf_trans)(struct intel_encoder *encoder, > + const struct intel_crtc_state *crtc_state, > + int *n_entries); > enum hpd_pin hpd_pin; > enum intel_display_power_domain power_domain; > /* for communication with audio component; protected by av_mutex */ > diff --git a/drivers/gpu/drm/i915/display/intel_fdi.c b/drivers/gpu/drm/i915/display/intel_fdi.c > index c602ed17c4fb..15ea28726e7a 100644 > --- a/drivers/gpu/drm/i915/display/intel_fdi.c > +++ b/drivers/gpu/drm/i915/display/intel_fdi.c > @@ -4,7 +4,6 @@ > */ > #include "intel_atomic.h" > #include "intel_ddi.h" > -#include "intel_ddi_buf_trans.h" > #include "intel_de.h" > #include "intel_display_types.h" > #include "intel_fdi.h" > @@ -569,7 +568,7 @@ void hsw_fdi_link_train(struct intel_encoder *encoder, > u32 temp, i, rx_ctl_val; > int n_entries; > > - hsw_get_buf_trans(encoder, crtc_state, &n_entries); > + encoder->get_buf_trans(encoder, crtc_state, &n_entries); > > hsw_prepare_dp_ddi_buffers(encoder, crtc_state); -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 10/17] drm/i915: Clean up hsw/bdw/skl/kbl buf trans funcs 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (8 preceding siblings ...) 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 09/17] drm/i915: Introduce encoder->get_buf_trans() Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 11/17] drm/i915: Introduce rkl_get_combo_buf_trans() Ville Syrjala ` (11 subsequent siblings) 21 siblings, 0 replies; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> Split the hsw/bdw/skl/kbl get_buf_trans() functions into clean platform specific variants. Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 308 +++++++----------- 1 file changed, 118 insertions(+), 190 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index f8915a8c78d8..ef9622ecf390 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -1051,102 +1051,34 @@ intel_get_buf_trans(const struct intel_ddi_buf_trans *ddi_translations, int *num } static const struct intel_ddi_buf_trans * -bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) +hsw_get_buf_trans(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) { - return intel_get_buf_trans(&bdw_ddi_translations_edp, - n_entries); - } else { - return intel_get_buf_trans(&bdw_ddi_translations_dp, - n_entries); - } -} - -static const struct intel_ddi_buf_trans * -skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) -{ - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - - if (IS_SKL_ULX(dev_priv)) { - return intel_get_buf_trans(&skl_y_ddi_translations_dp, - n_entries); - } else if (IS_SKL_ULT(dev_priv)) { - return intel_get_buf_trans(&skl_u_ddi_translations_dp, - n_entries); - } else { - return intel_get_buf_trans(&skl_ddi_translations_dp, - n_entries); - } -} - -static const struct intel_ddi_buf_trans * -kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) -{ - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - - if (IS_KBL_ULX(dev_priv) || - IS_CFL_ULX(dev_priv) || - IS_CML_ULX(dev_priv)) { - return intel_get_buf_trans(&kbl_y_ddi_translations_dp, - n_entries); - } else if (IS_KBL_ULT(dev_priv) || - IS_CFL_ULT(dev_priv) || - IS_CML_ULT(dev_priv)) { - return intel_get_buf_trans(&kbl_u_ddi_translations_dp, - n_entries); - } else { - return intel_get_buf_trans(&kbl_ddi_translations_dp, - n_entries); - } -} - -static const struct intel_ddi_buf_trans * -skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) -{ - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - - if (dev_priv->vbt.edp.low_vswing) { - if (IS_SKL_ULX(dev_priv) || - IS_KBL_ULX(dev_priv) || - IS_CFL_ULX(dev_priv) || - IS_CML_ULX(dev_priv)) { - return intel_get_buf_trans(&skl_y_ddi_translations_edp, - n_entries); - } else if (IS_SKL_ULT(dev_priv) || - IS_KBL_ULT(dev_priv) || - IS_CFL_ULT(dev_priv) || - IS_CML_ULT(dev_priv)) { - return intel_get_buf_trans(&skl_u_ddi_translations_edp, - n_entries); - } else { - return intel_get_buf_trans(&skl_ddi_translations_edp, - n_entries); - } - } - - if (IS_KABYLAKE(dev_priv) || - IS_COFFEELAKE(dev_priv) || - IS_COMETLAKE(dev_priv)) - return kbl_get_buf_trans_dp(encoder, n_entries); + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_ANALOG)) + return intel_get_buf_trans(&hsw_ddi_translations_fdi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) + return intel_get_buf_trans(&hsw_ddi_translations_hdmi, n_entries); else - return skl_get_buf_trans_dp(encoder, n_entries); + return intel_get_buf_trans(&hsw_ddi_translations_dp, n_entries); } static const struct intel_ddi_buf_trans * -skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries) +bdw_get_buf_trans(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) { - if (IS_SKL_ULX(dev_priv) || - IS_KBL_ULX(dev_priv) || - IS_CFL_ULX(dev_priv) || - IS_CML_ULX(dev_priv)) { - return intel_get_buf_trans(&skl_y_ddi_translations_hdmi, - n_entries); - } else { - return intel_get_buf_trans(&skl_ddi_translations_hdmi, - n_entries); - } + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_ANALOG)) + return intel_get_buf_trans(&bdw_ddi_translations_fdi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) + return intel_get_buf_trans(&bdw_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && + i915->vbt.edp.low_vswing) + return intel_get_buf_trans(&bdw_ddi_translations_edp, n_entries); + else + return intel_get_buf_trans(&bdw_ddi_translations_dp, n_entries); } static int skl_buf_trans_num_entries(enum port port, int n_entries) @@ -1159,131 +1091,109 @@ static int skl_buf_trans_num_entries(enum port port, int n_entries) } static const struct intel_ddi_buf_trans * -hsw_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) -{ - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - - if (IS_KABYLAKE(dev_priv) || - IS_COFFEELAKE(dev_priv) || - IS_COMETLAKE(dev_priv)) { - const struct intel_ddi_buf_trans *ddi_translations = - kbl_get_buf_trans_dp(encoder, n_entries); - *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); - return ddi_translations; - } else if (IS_SKYLAKE(dev_priv)) { - const struct intel_ddi_buf_trans *ddi_translations = - skl_get_buf_trans_dp(encoder, n_entries); - *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); - return ddi_translations; - } else if (IS_BROADWELL(dev_priv)) { - return intel_get_buf_trans(&bdw_ddi_translations_dp, - n_entries); - } else if (IS_HASWELL(dev_priv)) { - return intel_get_buf_trans(&hsw_ddi_translations_dp, - n_entries); - } - - *n_entries = 0; - return NULL; -} - -static const struct intel_ddi_buf_trans * -hsw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) -{ - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); - - if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) { - const struct intel_ddi_buf_trans *ddi_translations = - skl_get_buf_trans_edp(encoder, n_entries); - *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); - return ddi_translations; - } else if (IS_BROADWELL(dev_priv)) { - return bdw_get_buf_trans_edp(encoder, n_entries); - } else if (IS_HASWELL(dev_priv)) { - return intel_get_buf_trans(&hsw_ddi_translations_dp, - n_entries); - } - - *n_entries = 0; - return NULL; -} - -static const struct intel_ddi_buf_trans * -hsw_get_buf_trans_fdi(struct intel_encoder *encoder, +_skl_get_buf_trans_dp(struct intel_encoder *encoder, + const struct intel_ddi_buf_trans *ddi_translations, int *n_entries) { - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + ddi_translations = intel_get_buf_trans(ddi_translations, n_entries); + *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries); + return ddi_translations; +} - if (IS_BROADWELL(dev_priv)) { - return intel_get_buf_trans(&bdw_ddi_translations_fdi, - n_entries); - } else if (IS_HASWELL(dev_priv)) { - return intel_get_buf_trans(&hsw_ddi_translations_fdi, - n_entries); - } +static const struct intel_ddi_buf_trans * +skl_y_get_buf_trans(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); - *n_entries = 0; - return NULL; + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) + return intel_get_buf_trans(&skl_y_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && + i915->vbt.edp.low_vswing) + return _skl_get_buf_trans_dp(encoder, &skl_y_ddi_translations_edp, n_entries); + else + return _skl_get_buf_trans_dp(encoder, &skl_y_ddi_translations_dp, n_entries); } static const struct intel_ddi_buf_trans * -hsw_get_buf_trans_hdmi(struct intel_encoder *encoder, - int *n_entries) +skl_u_get_buf_trans(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); + struct drm_i915_private *i915 = to_i915(encoder->base.dev); - if (DISPLAY_VER(dev_priv) == 9 && !IS_BROXTON(dev_priv)) { - return skl_get_buf_trans_hdmi(dev_priv, n_entries); - } else if (IS_BROADWELL(dev_priv)) { - return intel_get_buf_trans(&bdw_ddi_translations_hdmi, - n_entries); - } else if (IS_HASWELL(dev_priv)) { - return intel_get_buf_trans(&hsw_ddi_translations_hdmi, - n_entries); - } - - *n_entries = 0; - return NULL; + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) + return intel_get_buf_trans(&skl_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && + i915->vbt.edp.low_vswing) + return _skl_get_buf_trans_dp(encoder, &skl_u_ddi_translations_edp, n_entries); + else + return _skl_get_buf_trans_dp(encoder, &skl_u_ddi_translations_dp, n_entries); } static const struct intel_ddi_buf_trans * -hsw_get_buf_trans(struct intel_encoder *encoder, +skl_get_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_ANALOG)) - return hsw_get_buf_trans_fdi(encoder, n_entries); - else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - return hsw_get_buf_trans_hdmi(encoder, n_entries); - else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) - return hsw_get_buf_trans_edp(encoder, n_entries); + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) + return intel_get_buf_trans(&skl_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && + i915->vbt.edp.low_vswing) + return _skl_get_buf_trans_dp(encoder, &skl_ddi_translations_edp, n_entries); else - return hsw_get_buf_trans_dp(encoder, n_entries); + return _skl_get_buf_trans_dp(encoder, &skl_ddi_translations_dp, n_entries); } static const struct intel_ddi_buf_trans * -bxt_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries) +kbl_y_get_buf_trans(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) { - return intel_get_buf_trans(&bxt_ddi_translations_dp, n_entries); + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) + return intel_get_buf_trans(&skl_y_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && + i915->vbt.edp.low_vswing) + return _skl_get_buf_trans_dp(encoder, &skl_y_ddi_translations_edp, n_entries); + else + return _skl_get_buf_trans_dp(encoder, &kbl_y_ddi_translations_dp, n_entries); } static const struct intel_ddi_buf_trans * -bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries) +kbl_u_get_buf_trans(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) { - return intel_get_buf_trans(&bxt_ddi_translations_edp, - n_entries); - } + struct drm_i915_private *i915 = to_i915(encoder->base.dev); - return bxt_get_buf_trans_dp(encoder, n_entries); + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) + return intel_get_buf_trans(&skl_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && + i915->vbt.edp.low_vswing) + return _skl_get_buf_trans_dp(encoder, &skl_u_ddi_translations_edp, n_entries); + else + return _skl_get_buf_trans_dp(encoder, &kbl_u_ddi_translations_dp, n_entries); } static const struct intel_ddi_buf_trans * -bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries) +kbl_get_buf_trans(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) { - return intel_get_buf_trans(&bxt_ddi_translations_hdmi, n_entries); + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) + return intel_get_buf_trans(&skl_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && + i915->vbt.edp.low_vswing) + return _skl_get_buf_trans_dp(encoder, &skl_ddi_translations_edp, n_entries); + else + return _skl_get_buf_trans_dp(encoder, &kbl_ddi_translations_dp, n_entries); } static const struct intel_ddi_buf_trans * @@ -1291,11 +1201,15 @@ bxt_get_buf_trans(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - return bxt_get_buf_trans_hdmi(encoder, n_entries); - if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) - return bxt_get_buf_trans_edp(encoder, n_entries); - return bxt_get_buf_trans_dp(encoder, n_entries); + return intel_get_buf_trans(&bxt_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && + i915->vbt.edp.low_vswing) + return intel_get_buf_trans(&bxt_ddi_translations_edp, n_entries); + else + return intel_get_buf_trans(&bxt_ddi_translations_dp, n_entries); } static const struct intel_ddi_buf_trans * @@ -1746,6 +1660,20 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) encoder->get_buf_trans = cnl_get_buf_trans; } else if (IS_GEMINILAKE(i915) || IS_BROXTON(i915)) { encoder->get_buf_trans = bxt_get_buf_trans; + } else if (IS_CML_ULX(i915) || IS_CFL_ULX(i915) || IS_KBL_ULX(i915)) { + encoder->get_buf_trans = kbl_y_get_buf_trans; + } else if (IS_CML_ULT(i915) || IS_CFL_ULT(i915) || IS_KBL_ULT(i915)) { + encoder->get_buf_trans = kbl_u_get_buf_trans; + } else if (IS_COMETLAKE(i915) || IS_COFFEELAKE(i915) || IS_KABYLAKE(i915)) { + encoder->get_buf_trans = kbl_get_buf_trans; + } else if (IS_SKL_ULX(i915)) { + encoder->get_buf_trans = skl_y_get_buf_trans; + } else if (IS_SKL_ULT(i915)) { + encoder->get_buf_trans = skl_u_get_buf_trans; + } else if (IS_SKYLAKE(i915)) { + encoder->get_buf_trans = skl_get_buf_trans; + } else if (IS_BROADWELL(i915)) { + encoder->get_buf_trans = bdw_get_buf_trans; } else { encoder->get_buf_trans = hsw_get_buf_trans; } -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 11/17] drm/i915: Introduce rkl_get_combo_buf_trans() 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (9 preceding siblings ...) 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 10/17] drm/i915: Clean up hsw/bdw/skl/kbl buf trans funcs Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-18 12:22 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 12/17] drm/i915: Fix dg1 buf trans tables Ville Syrjala ` (10 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> Give RKL its own get_buf_trans() func. v2: Drop the FIXME since the spec was clarified to indicate that TGL values are used for the HDMI/eDP cases. Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 62 +++++++++++++++---- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index ef9622ecf390..fcb67deb46dd 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -1497,10 +1497,7 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (crtc_state->port_clock > 270000) { - if (IS_ROCKETLAKE(dev_priv)) { - return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr2_hbr3, - n_entries); - } else if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { + if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { return intel_get_buf_trans(&tgl_uy_combo_phy_ddi_translations_dp_hbr2, n_entries); } else { @@ -1508,13 +1505,8 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, n_entries); } } else { - if (IS_ROCKETLAKE(dev_priv)) { - return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr, - n_entries); - } else { - return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr, - n_entries); - } + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr, + n_entries); } } @@ -1553,6 +1545,52 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder, return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } +static const struct intel_ddi_buf_trans * +rkl_get_combo_buf_trans_dp(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) +{ + if (crtc_state->port_clock > 270000) + return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr2_hbr3, n_entries); + else + return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr, n_entries); +} + +static const struct intel_ddi_buf_trans * +rkl_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); + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + + if (crtc_state->port_clock > 540000) { + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, + n_entries); + } else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) { + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, + n_entries); + } else if (dev_priv->vbt.edp.low_vswing) { + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, + n_entries); + } + + return rkl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); +} + +static const struct intel_ddi_buf_trans * +rkl_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 tgl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) + return rkl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); + else + return rkl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); +} + static const struct intel_ddi_buf_trans * tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, @@ -1642,6 +1680,8 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) encoder->get_buf_trans = tgl_get_combo_buf_trans; else encoder->get_buf_trans = adlp_get_dkl_buf_trans; + } else if (IS_ROCKETLAKE(i915)) { + encoder->get_buf_trans = rkl_get_combo_buf_trans; } else if (DISPLAY_VER(i915) >= 12) { if (intel_phy_is_combo(i915, phy)) encoder->get_buf_trans = tgl_get_combo_buf_trans; -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 11/17] drm/i915: Introduce rkl_get_combo_buf_trans() 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 11/17] drm/i915: Introduce rkl_get_combo_buf_trans() Ville Syrjala @ 2021-06-18 12:22 ` Jani Nikula 0 siblings, 0 replies; 39+ messages in thread From: Jani Nikula @ 2021-06-18 12:22 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Give RKL its own get_buf_trans() func. > > v2: Drop the FIXME since the spec was clarified to > indicate that TGL values are used for the HDMI/eDP cases. > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1 Holds for v2. > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > .../drm/i915/display/intel_ddi_buf_trans.c | 62 +++++++++++++++---- > 1 file changed, 51 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index ef9622ecf390..fcb67deb46dd 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -1497,10 +1497,7 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (crtc_state->port_clock > 270000) { > - if (IS_ROCKETLAKE(dev_priv)) { > - return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr2_hbr3, > - n_entries); > - } else if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { > + if (IS_TGL_U(dev_priv) || IS_TGL_Y(dev_priv)) { > return intel_get_buf_trans(&tgl_uy_combo_phy_ddi_translations_dp_hbr2, > n_entries); > } else { > @@ -1508,13 +1505,8 @@ tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > n_entries); > } > } else { > - if (IS_ROCKETLAKE(dev_priv)) { > - return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr, > - n_entries); > - } else { > - return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr, > - n_entries); > - } > + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr, > + n_entries); > } > } > > @@ -1553,6 +1545,52 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder, > return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > +static const struct intel_ddi_buf_trans * > +rkl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > + const struct intel_crtc_state *crtc_state, > + int *n_entries) > +{ > + if (crtc_state->port_clock > 270000) > + return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr2_hbr3, n_entries); > + else > + return intel_get_buf_trans(&rkl_combo_phy_ddi_translations_dp_hbr, n_entries); > +} > + > +static const struct intel_ddi_buf_trans * > +rkl_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); > + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > + > + if (crtc_state->port_clock > 540000) { > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, > + n_entries); > + } else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) { > + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, > + n_entries); > + } else if (dev_priv->vbt.edp.low_vswing) { > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, > + n_entries); > + } > + > + return rkl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > +} > + > +static const struct intel_ddi_buf_trans * > +rkl_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 tgl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) > + return rkl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); > + else > + return rkl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > +} > + > static const struct intel_ddi_buf_trans * > tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > @@ -1642,6 +1680,8 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) > encoder->get_buf_trans = tgl_get_combo_buf_trans; > else > encoder->get_buf_trans = adlp_get_dkl_buf_trans; > + } else if (IS_ROCKETLAKE(i915)) { > + encoder->get_buf_trans = rkl_get_combo_buf_trans; > } else if (DISPLAY_VER(i915) >= 12) { > if (intel_phy_is_combo(i915, phy)) > encoder->get_buf_trans = tgl_get_combo_buf_trans; -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 12/17] drm/i915: Fix dg1 buf trans tables 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (10 preceding siblings ...) 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 11/17] drm/i915: Introduce rkl_get_combo_buf_trans() Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-18 12:28 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 13/17] drm/i915: Deduplicate icl DP HBR2 vs. eDP HBR3 table Ville Syrjala ` (9 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx; +Cc: Jani Nikula From: Ville Syrjälä <ville.syrjala@linux.intel.com> For some reason the dg1 buf trans tables have been stuffed into icl_get_combo_buf_trans_edp() which doesn't even get called on dg1. Split them out into a proper dg1 specific function, and also make sure we use the proper buf trans tables for DP as well as eDP. v2: Add the hobl stuff Reviewed-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 55 +++++++++++++++++-- 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index fcb67deb46dd..52bc6cbe36cf 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -1325,12 +1325,6 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, } else if (dev_priv->vbt.edp.low_vswing) { return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, n_entries); - } else if (IS_DG1(dev_priv) && crtc_state->port_clock > 270000) { - return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_hbr2_hbr3, - n_entries); - } else if (IS_DG1(dev_priv)) { - return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_rbr_hbr, - n_entries); } return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); @@ -1545,6 +1539,53 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder, return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } +static const struct intel_ddi_buf_trans * +dg1_get_combo_buf_trans_dp(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) +{ + if (crtc_state->port_clock > 270000) + return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_hbr2_hbr3, + n_entries); + else + return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_rbr_hbr, + n_entries); +} + +static const struct intel_ddi_buf_trans * +dg1_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); + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + + if (crtc_state->port_clock > 540000) + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, + n_entries); + else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, + n_entries); + else if (dev_priv->vbt.edp.low_vswing) + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, + n_entries); + else + return dg1_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); +} + +static const struct intel_ddi_buf_trans * +dg1_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 icl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) + return dg1_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); + else + return dg1_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); +} + static const struct intel_ddi_buf_trans * rkl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, @@ -1682,6 +1723,8 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) encoder->get_buf_trans = adlp_get_dkl_buf_trans; } else if (IS_ROCKETLAKE(i915)) { encoder->get_buf_trans = rkl_get_combo_buf_trans; + } else if (IS_DG1(i915)) { + encoder->get_buf_trans = dg1_get_combo_buf_trans; } else if (DISPLAY_VER(i915) >= 12) { if (intel_phy_is_combo(i915, phy)) encoder->get_buf_trans = tgl_get_combo_buf_trans; -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 12/17] drm/i915: Fix dg1 buf trans tables 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 12/17] drm/i915: Fix dg1 buf trans tables Ville Syrjala @ 2021-06-18 12:28 ` Jani Nikula 0 siblings, 0 replies; 39+ messages in thread From: Jani Nikula @ 2021-06-18 12:28 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > For some reason the dg1 buf trans tables have been stuffed into > icl_get_combo_buf_trans_edp() which doesn't even get called > on dg1. Split them out into a proper dg1 specific function, > and also make sure we use the proper buf trans tables for > DP as well as eDP. > > v2: Add the hobl stuff > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> Holds for v2. > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > .../drm/i915/display/intel_ddi_buf_trans.c | 55 +++++++++++++++++-- > 1 file changed, 49 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index fcb67deb46dd..52bc6cbe36cf 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -1325,12 +1325,6 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > } else if (dev_priv->vbt.edp.low_vswing) { > return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, > n_entries); > - } else if (IS_DG1(dev_priv) && crtc_state->port_clock > 270000) { > - return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_hbr2_hbr3, > - n_entries); > - } else if (IS_DG1(dev_priv)) { > - return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_rbr_hbr, > - n_entries); > } > > return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > @@ -1545,6 +1539,53 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder, > return tgl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > +static const struct intel_ddi_buf_trans * > +dg1_get_combo_buf_trans_dp(struct intel_encoder *encoder, > + const struct intel_crtc_state *crtc_state, > + int *n_entries) > +{ > + if (crtc_state->port_clock > 270000) > + return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_hbr2_hbr3, > + n_entries); > + else > + return intel_get_buf_trans(&dg1_combo_phy_ddi_translations_dp_rbr_hbr, > + n_entries); > +} > + > +static const struct intel_ddi_buf_trans * > +dg1_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); > + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > + > + if (crtc_state->port_clock > 540000) > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, > + n_entries); > + else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) > + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, > + n_entries); > + else if (dev_priv->vbt.edp.low_vswing) > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, > + n_entries); > + else > + return dg1_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > +} > + > +static const struct intel_ddi_buf_trans * > +dg1_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 icl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) > + return dg1_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); > + else > + return dg1_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > +} > + > static const struct intel_ddi_buf_trans * > rkl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > @@ -1682,6 +1723,8 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) > encoder->get_buf_trans = adlp_get_dkl_buf_trans; > } else if (IS_ROCKETLAKE(i915)) { > encoder->get_buf_trans = rkl_get_combo_buf_trans; > + } else if (IS_DG1(i915)) { > + encoder->get_buf_trans = dg1_get_combo_buf_trans; > } else if (DISPLAY_VER(i915) >= 12) { > if (intel_phy_is_combo(i915, phy)) > encoder->get_buf_trans = tgl_get_combo_buf_trans; -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 13/17] drm/i915: Deduplicate icl DP HBR2 vs. eDP HBR3 table 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (11 preceding siblings ...) 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 12/17] drm/i915: Fix dg1 buf trans tables Ville Syrjala @ 2021-06-08 7:35 ` Ville Syrjala 2021-06-18 12:30 ` Jani Nikula 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 14/17] drm/i915: Fix ehl edp hbr2 vswing table Ville Syrjala ` (8 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:35 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> The icl combo phy DP HBR2 is identical to the eDP HBR3 table. Get rid of one redundant copy. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 39 +++++-------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index 52bc6cbe36cf..6e2b6c851fb4 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -598,7 +598,7 @@ static const struct intel_ddi_buf_trans cnl_ddi_translations_edp_1_05V = { }; /* icl_combo_phy_ddi_translations */ -static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_dp_hbr2[] = { +static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ @@ -612,9 +612,9 @@ static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_dp_ { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ }; -static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hbr2 = { - .entries = _icl_combo_phy_ddi_translations_dp_hbr2, - .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_dp_hbr2), +static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3 = { + .entries = _icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, + .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3), }; static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_edp_hbr2[] = { @@ -636,25 +636,6 @@ static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr2 .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_edp_hbr2), }; -static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_edp_hbr3[] = { - /* NT mV Trans mV db */ - { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ - { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ - { .cnl = { 0xC, 0x71, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ - { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ - { .cnl = { 0xA, 0x4C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ - { .cnl = { 0xC, 0x73, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ - { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ - { .cnl = { 0xC, 0x6C, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ - { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ - { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ -}; - -static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr3 = { - .entries = _icl_combo_phy_ddi_translations_edp_hbr3, - .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_edp_hbr3), -}; - static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_hdmi[] = { /* NT mV Trans mV db */ { .cnl = { 0xA, 0x60, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ @@ -1308,7 +1289,7 @@ icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2, + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); } @@ -1320,7 +1301,7 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); if (crtc_state->port_clock > 540000) { - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); } else if (dev_priv->vbt.edp.low_vswing) { return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, @@ -1437,7 +1418,7 @@ jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int *n_entries) { - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2, + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); } @@ -1513,7 +1494,7 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, struct intel_dp *intel_dp = enc_to_intel_dp(encoder); if (crtc_state->port_clock > 540000) { - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); } else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) { return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, @@ -1561,7 +1542,7 @@ dg1_get_combo_buf_trans_edp(struct intel_encoder *encoder, struct intel_dp *intel_dp = enc_to_intel_dp(encoder); if (crtc_state->port_clock > 540000) - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, @@ -1606,7 +1587,7 @@ rkl_get_combo_buf_trans_edp(struct intel_encoder *encoder, struct intel_dp *intel_dp = enc_to_intel_dp(encoder); if (crtc_state->port_clock > 540000) { - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); } else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) { return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 13/17] drm/i915: Deduplicate icl DP HBR2 vs. eDP HBR3 table 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 13/17] drm/i915: Deduplicate icl DP HBR2 vs. eDP HBR3 table Ville Syrjala @ 2021-06-18 12:30 ` Jani Nikula 2021-06-23 12:55 ` Ville Syrjälä 0 siblings, 1 reply; 39+ messages in thread From: Jani Nikula @ 2021-06-18 12:30 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > The icl combo phy DP HBR2 is identical to the eDP HBR3 table. > Get rid of one redundant copy. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > .../drm/i915/display/intel_ddi_buf_trans.c | 39 +++++-------------- > 1 file changed, 10 insertions(+), 29 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index 52bc6cbe36cf..6e2b6c851fb4 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -598,7 +598,7 @@ static const struct intel_ddi_buf_trans cnl_ddi_translations_edp_1_05V = { > }; > > /* icl_combo_phy_ddi_translations */ > -static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_dp_hbr2[] = { > +static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > @@ -612,9 +612,9 @@ static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_dp_ > { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > }; > > -static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hbr2 = { > - .entries = _icl_combo_phy_ddi_translations_dp_hbr2, > - .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_dp_hbr2), > +static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3 = { > + .entries = _icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, > + .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3), > }; > > static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_edp_hbr2[] = { > @@ -636,25 +636,6 @@ static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr2 > .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_edp_hbr2), > }; > > -static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_edp_hbr3[] = { > - /* NT mV Trans mV db */ > - { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > - { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > - { .cnl = { 0xC, 0x71, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ > - { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ > - { .cnl = { 0xA, 0x4C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > - { .cnl = { 0xC, 0x73, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ > - { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ > - { .cnl = { 0xC, 0x6C, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ > - { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ > - { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > -}; > - > -static const struct intel_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr3 = { > - .entries = _icl_combo_phy_ddi_translations_edp_hbr3, > - .num_entries = ARRAY_SIZE(_icl_combo_phy_ddi_translations_edp_hbr3), > -}; > - > static const union intel_ddi_buf_trans_entry _icl_combo_phy_ddi_translations_hdmi[] = { > /* NT mV Trans mV db */ > { .cnl = { 0xA, 0x60, 0x3F, 0x00, 0x00 } }, /* 450 450 0.0 */ > @@ -1308,7 +1289,7 @@ icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2, > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, > n_entries); > } > > @@ -1320,7 +1301,7 @@ icl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > > if (crtc_state->port_clock > 540000) { > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, > n_entries); > } else if (dev_priv->vbt.edp.low_vswing) { > return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, > @@ -1437,7 +1418,7 @@ jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > int *n_entries) > { > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2, > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, > n_entries); > } > > @@ -1513,7 +1494,7 @@ tgl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > > if (crtc_state->port_clock > 540000) { > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, > n_entries); > } else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) { > return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, > @@ -1561,7 +1542,7 @@ dg1_get_combo_buf_trans_edp(struct intel_encoder *encoder, > struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > > if (crtc_state->port_clock > 540000) > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, > n_entries); > else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) > return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, > @@ -1606,7 +1587,7 @@ rkl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > > if (crtc_state->port_clock > 540000) { > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr3, > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, > n_entries); > } else if (dev_priv->vbt.edp.hobl && !intel_dp->hobl_failed) { > return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 13/17] drm/i915: Deduplicate icl DP HBR2 vs. eDP HBR3 table 2021-06-18 12:30 ` Jani Nikula @ 2021-06-23 12:55 ` Ville Syrjälä 0 siblings, 0 replies; 39+ messages in thread From: Ville Syrjälä @ 2021-06-23 12:55 UTC (permalink / raw) To: Jani Nikula; +Cc: intel-gfx On Fri, Jun 18, 2021 at 03:30:28PM +0300, Jani Nikula wrote: > On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > The icl combo phy DP HBR2 is identical to the eDP HBR3 table. > > Get rid of one redundant copy. > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> Pushed up to here. Thanks for the reviews. -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 14/17] drm/i915: Fix ehl edp hbr2 vswing table 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (12 preceding siblings ...) 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 13/17] drm/i915: Deduplicate icl DP HBR2 vs. eDP HBR3 table Ville Syrjala @ 2021-06-08 7:36 ` Ville Syrjala 2021-06-23 14:02 ` Jani Nikula 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 15/17] drm/i915: Clean up jsl/ehl buf trans functions Ville Syrjala ` (7 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:36 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> EHL is supposed to use special buf trans values for eDP HBR2+. Add such a table. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index 6e2b6c851fb4..9398aa62585b 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -672,6 +672,25 @@ static const struct intel_ddi_buf_trans ehl_combo_phy_ddi_translations_dp = { .num_entries = ARRAY_SIZE(_ehl_combo_phy_ddi_translations_dp), }; +static const union intel_ddi_buf_trans_entry _ehl_combo_phy_ddi_translations_edp_hbr2[] = { + /* NT mV Trans mV db */ + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 250 1.9 */ + { .cnl = { 0x1, 0x7F, 0x3D, 0x00, 0x02 } }, /* 200 300 3.5 */ + { .cnl = { 0xA, 0x35, 0x39, 0x00, 0x06 } }, /* 200 350 4.9 */ + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 250 250 0.0 */ + { .cnl = { 0x1, 0x7F, 0x3C, 0x00, 0x03 } }, /* 250 300 1.6 */ + { .cnl = { 0xA, 0x35, 0x39, 0x00, 0x06 } }, /* 250 350 2.9 */ + { .cnl = { 0x1, 0x7F, 0x3F, 0x00, 0x00 } }, /* 300 300 0.0 */ + { .cnl = { 0xA, 0x35, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ +}; + +static const struct intel_ddi_buf_trans ehl_combo_phy_ddi_translations_edp_hbr2 = { + .entries = _ehl_combo_phy_ddi_translations_edp_hbr2, + .num_entries = ARRAY_SIZE(_ehl_combo_phy_ddi_translations_edp_hbr2), +}; + static const union intel_ddi_buf_trans_entry _jsl_combo_phy_ddi_translations_edp_hbr[] = { /* NT mV Trans mV db */ { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ @@ -1384,8 +1403,13 @@ 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) { - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, - n_entries); + if (crtc_state->port_clock > 270000) { + return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_edp_hbr2, + n_entries); + } else { + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, + n_entries); + } } return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 14/17] drm/i915: Fix ehl edp hbr2 vswing table 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 14/17] drm/i915: Fix ehl edp hbr2 vswing table Ville Syrjala @ 2021-06-23 14:02 ` Jani Nikula 0 siblings, 0 replies; 39+ messages in thread From: Jani Nikula @ 2021-06-23 14:02 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > EHL is supposed to use special buf trans values for eDP HBR2+. > Add such a table. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > .../drm/i915/display/intel_ddi_buf_trans.c | 28 +++++++++++++++++-- > 1 file changed, 26 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index 6e2b6c851fb4..9398aa62585b 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -672,6 +672,25 @@ static const struct intel_ddi_buf_trans ehl_combo_phy_ddi_translations_dp = { > .num_entries = ARRAY_SIZE(_ehl_combo_phy_ddi_translations_dp), > }; > > +static const union intel_ddi_buf_trans_entry _ehl_combo_phy_ddi_translations_edp_hbr2[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ > + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 250 1.9 */ > + { .cnl = { 0x1, 0x7F, 0x3D, 0x00, 0x02 } }, /* 200 300 3.5 */ > + { .cnl = { 0xA, 0x35, 0x39, 0x00, 0x06 } }, /* 200 350 4.9 */ > + { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 250 250 0.0 */ > + { .cnl = { 0x1, 0x7F, 0x3C, 0x00, 0x03 } }, /* 250 300 1.6 */ > + { .cnl = { 0xA, 0x35, 0x39, 0x00, 0x06 } }, /* 250 350 2.9 */ > + { .cnl = { 0x1, 0x7F, 0x3F, 0x00, 0x00 } }, /* 300 300 0.0 */ > + { .cnl = { 0xA, 0x35, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ > + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > +}; > + > +static const struct intel_ddi_buf_trans ehl_combo_phy_ddi_translations_edp_hbr2 = { > + .entries = _ehl_combo_phy_ddi_translations_edp_hbr2, > + .num_entries = ARRAY_SIZE(_ehl_combo_phy_ddi_translations_edp_hbr2), > +}; > + > static const union intel_ddi_buf_trans_entry _jsl_combo_phy_ddi_translations_edp_hbr[] = { > /* NT mV Trans mV db */ > { .cnl = { 0x8, 0x7F, 0x3F, 0x00, 0x00 } }, /* 200 200 0.0 */ > @@ -1384,8 +1403,13 @@ 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) { > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, > - n_entries); > + if (crtc_state->port_clock > 270000) { > + return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_edp_hbr2, > + n_entries); > + } else { > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, > + n_entries); > + } > } > > return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 15/17] drm/i915: Clean up jsl/ehl buf trans functions 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (13 preceding siblings ...) 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 14/17] drm/i915: Fix ehl edp hbr2 vswing table Ville Syrjala @ 2021-06-08 7:36 ` Ville Syrjala 2021-06-23 14:13 ` Jani Nikula 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 16/17] drm/i915: Nuke buf_trans hdmi functions Ville Syrjala ` (6 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:36 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> The jsl/ehl buf trans functions are needlessly conplicated. Simplify them. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 87 +++++-------------- 1 file changed, 20 insertions(+), 67 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index 9398aa62585b..2bd51ce4aa2c 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -1377,42 +1377,16 @@ icl_get_mg_buf_trans(struct intel_encoder *encoder, return icl_get_mg_buf_trans_dp(encoder, crtc_state, n_entries); } -static const struct intel_ddi_buf_trans * -ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries) -{ - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, - n_entries); -} - -static const struct intel_ddi_buf_trans * -ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries) -{ - return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_dp, - n_entries); -} static const struct intel_ddi_buf_trans * ehl_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) { - return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_edp_hbr2, - n_entries); - } else { - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, - n_entries); - } - } - - return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); + if (crtc_state->port_clock > 270000) + return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_edp_hbr2, n_entries); + else + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, n_entries); } static const struct intel_ddi_buf_trans * @@ -1420,30 +1394,15 @@ ehl_get_combo_buf_trans(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 (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - return ehl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); - else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && + dev_priv->vbt.edp.low_vswing) return ehl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); else - return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); -} - -static const struct intel_ddi_buf_trans * -jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries) -{ - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, - n_entries); -} - -static const struct intel_ddi_buf_trans * -jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries) -{ - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, - n_entries); + return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_dp, n_entries); } static const struct intel_ddi_buf_trans * @@ -1451,19 +1410,10 @@ 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) { - return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr2, - n_entries); - } else { - return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr, - n_entries); - } - } - - return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); + if (crtc_state->port_clock > 270000) + return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr2, n_entries); + else + return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr, n_entries); } static const struct intel_ddi_buf_trans * @@ -1471,12 +1421,15 @@ jsl_get_combo_buf_trans(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 (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 intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && + dev_priv->vbt.edp.low_vswing) 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); + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); } static const struct intel_ddi_buf_trans * -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 15/17] drm/i915: Clean up jsl/ehl buf trans functions 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 15/17] drm/i915: Clean up jsl/ehl buf trans functions Ville Syrjala @ 2021-06-23 14:13 ` Jani Nikula 2021-06-24 17:05 ` Ville Syrjälä 0 siblings, 1 reply; 39+ messages in thread From: Jani Nikula @ 2021-06-23 14:13 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > The jsl/ehl buf trans functions are needlessly conplicated. ^ My only disappointment here is that now some of the *_get_combo_buf_trans_edp() functions handle low vswing inside, and some expect to only be called for low vswing. At least cnl could switch to same style as here, the rest get more complicated. Not a big issue, and the code is easy enough to follow for each individual platform. And I like the reduction in call depth. Reviewed-by: Jani Nikula <jani.nikula@intel.com> > Simplify them. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > .../drm/i915/display/intel_ddi_buf_trans.c | 87 +++++-------------- > 1 file changed, 20 insertions(+), 67 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index 9398aa62585b..2bd51ce4aa2c 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -1377,42 +1377,16 @@ icl_get_mg_buf_trans(struct intel_encoder *encoder, > return icl_get_mg_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const struct intel_ddi_buf_trans * > -ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries) > -{ > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, > - n_entries); > -} > - > -static const struct intel_ddi_buf_trans * > -ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries) > -{ > - return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_dp, > - n_entries); > -} > > static const struct intel_ddi_buf_trans * > ehl_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) { > - return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_edp_hbr2, > - n_entries); > - } else { > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, > - n_entries); > - } > - } > - > - return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > + if (crtc_state->port_clock > 270000) > + return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_edp_hbr2, n_entries); > + else > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, n_entries); > } > > static const struct intel_ddi_buf_trans * > @@ -1420,30 +1394,15 @@ ehl_get_combo_buf_trans(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 (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > - return ehl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); > - else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && > + dev_priv->vbt.edp.low_vswing) > return ehl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); > else > - return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > -} > - > -static const struct intel_ddi_buf_trans * > -jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries) > -{ > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, > - n_entries); > -} > - > -static const struct intel_ddi_buf_trans * > -jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries) > -{ > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, > - n_entries); > + return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_dp, n_entries); > } > > static const struct intel_ddi_buf_trans * > @@ -1451,19 +1410,10 @@ 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) { > - return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr2, > - n_entries); > - } else { > - return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr, > - n_entries); > - } > - } > - > - return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > + if (crtc_state->port_clock > 270000) > + return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr2, n_entries); > + else > + return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr, n_entries); > } > > static const struct intel_ddi_buf_trans * > @@ -1471,12 +1421,15 @@ jsl_get_combo_buf_trans(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 (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 intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && > + dev_priv->vbt.edp.low_vswing) > 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); > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); > } > > static const struct intel_ddi_buf_trans * -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 15/17] drm/i915: Clean up jsl/ehl buf trans functions 2021-06-23 14:13 ` Jani Nikula @ 2021-06-24 17:05 ` Ville Syrjälä 0 siblings, 0 replies; 39+ messages in thread From: Ville Syrjälä @ 2021-06-24 17:05 UTC (permalink / raw) To: Jani Nikula; +Cc: intel-gfx On Wed, Jun 23, 2021 at 05:13:53PM +0300, Jani Nikula wrote: > On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > The jsl/ehl buf trans functions are needlessly conplicated. > ^ > > My only disappointment here is that now some of the > *_get_combo_buf_trans_edp() functions handle low vswing inside, and some > expect to only be called for low vswing. Yeah, that is a bit annoying. Not really sure what the best approach is for everything :/ > > At least cnl could switch to same style as here, the rest get more > complicated. > > Not a big issue, and the code is easy enough to follow for each > individual platform. And I like the reduction in call depth. > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> Ta. > > > > Simplify them. > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > --- > > .../drm/i915/display/intel_ddi_buf_trans.c | 87 +++++-------------- > > 1 file changed, 20 insertions(+), 67 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > > index 9398aa62585b..2bd51ce4aa2c 100644 > > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > > @@ -1377,42 +1377,16 @@ icl_get_mg_buf_trans(struct intel_encoder *encoder, > > return icl_get_mg_buf_trans_dp(encoder, crtc_state, n_entries); > > } > > > > -static const struct intel_ddi_buf_trans * > > -ehl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > > - const struct intel_crtc_state *crtc_state, > > - int *n_entries) > > -{ > > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, > > - n_entries); > > -} > > - > > -static const struct intel_ddi_buf_trans * > > -ehl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > > - const struct intel_crtc_state *crtc_state, > > - int *n_entries) > > -{ > > - return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_dp, > > - n_entries); > > -} > > > > static const struct intel_ddi_buf_trans * > > ehl_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) { > > - return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_edp_hbr2, > > - n_entries); > > - } else { > > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, > > - n_entries); > > - } > > - } > > - > > - return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > > + if (crtc_state->port_clock > 270000) > > + return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_edp_hbr2, n_entries); > > + else > > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_edp_hbr2, n_entries); > > } > > > > static const struct intel_ddi_buf_trans * > > @@ -1420,30 +1394,15 @@ ehl_get_combo_buf_trans(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 (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > > - return ehl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); > > - else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) > > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); > > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && > > + dev_priv->vbt.edp.low_vswing) > > return ehl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); > > else > > - return ehl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > > -} > > - > > -static const struct intel_ddi_buf_trans * > > -jsl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > > - const struct intel_crtc_state *crtc_state, > > - int *n_entries) > > -{ > > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, > > - n_entries); > > -} > > - > > -static const struct intel_ddi_buf_trans * > > -jsl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > > - const struct intel_crtc_state *crtc_state, > > - int *n_entries) > > -{ > > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, > > - n_entries); > > + return intel_get_buf_trans(&ehl_combo_phy_ddi_translations_dp, n_entries); > > } > > > > static const struct intel_ddi_buf_trans * > > @@ -1451,19 +1410,10 @@ 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) { > > - return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr2, > > - n_entries); > > - } else { > > - return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr, > > - n_entries); > > - } > > - } > > - > > - return jsl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > > + if (crtc_state->port_clock > 270000) > > + return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr2, n_entries); > > + else > > + return intel_get_buf_trans(&jsl_combo_phy_ddi_translations_edp_hbr, n_entries); > > } > > > > static const struct intel_ddi_buf_trans * > > @@ -1471,12 +1421,15 @@ jsl_get_combo_buf_trans(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 (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 intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); > > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP) && > > + dev_priv->vbt.edp.low_vswing) > > 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); > > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); > > } > > > > static const struct intel_ddi_buf_trans * > > -- > Jani Nikula, Intel Open Source Graphics Center -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 16/17] drm/i915: Nuke buf_trans hdmi functions 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (14 preceding siblings ...) 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 15/17] drm/i915: Clean up jsl/ehl buf trans functions Ville Syrjala @ 2021-06-08 7:36 ` Ville Syrjala 2021-06-23 14:14 ` Jani Nikula 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 17/17] drm/i915: Add the missing adls vswing tables Ville Syrjala ` (5 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:36 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> All the foo_get_buf_trans_hdmi() functions just reuturn a single table. Remove the pointless wrappers. v2: Handle adl-p Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 51 +++---------------- 1 file changed, 7 insertions(+), 44 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index 2bd51ce4aa2c..a456823df102 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -1294,15 +1294,6 @@ cnl_get_buf_trans(struct intel_encoder *encoder, return cnl_get_buf_trans_dp(encoder, n_entries); } -static const struct intel_ddi_buf_trans * -icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries) -{ - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, - n_entries); -} - static const struct intel_ddi_buf_trans * icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, @@ -1336,22 +1327,13 @@ icl_get_combo_buf_trans(struct intel_encoder *encoder, int *n_entries) { if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - return icl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) return icl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); else return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -static const struct intel_ddi_buf_trans * -icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries) -{ - return intel_get_buf_trans(&icl_mg_phy_ddi_translations_hdmi, - n_entries); -} - static const struct intel_ddi_buf_trans * icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, @@ -1372,12 +1354,11 @@ icl_get_mg_buf_trans(struct intel_encoder *encoder, int *n_entries) { if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - return icl_get_mg_buf_trans_hdmi(encoder, crtc_state, n_entries); + return intel_get_buf_trans(&icl_mg_phy_ddi_translations_hdmi, n_entries); else return icl_get_mg_buf_trans_dp(encoder, crtc_state, n_entries); } - static const struct intel_ddi_buf_trans * ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, @@ -1432,15 +1413,6 @@ jsl_get_combo_buf_trans(struct intel_encoder *encoder, return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); } -static const struct intel_ddi_buf_trans * -tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries) -{ - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, - n_entries); -} - static const struct intel_ddi_buf_trans * tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, @@ -1490,7 +1462,7 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder, int *n_entries) { if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - return tgl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) return tgl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); else @@ -1537,7 +1509,7 @@ dg1_get_combo_buf_trans(struct intel_encoder *encoder, int *n_entries) { if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - return icl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) return dg1_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); else @@ -1583,22 +1555,13 @@ rkl_get_combo_buf_trans(struct intel_encoder *encoder, int *n_entries) { if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - return tgl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) return rkl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); else return rkl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } -static const struct intel_ddi_buf_trans * -tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, - const struct intel_crtc_state *crtc_state, - int *n_entries) -{ - return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_hdmi, - n_entries); -} - static const struct intel_ddi_buf_trans * tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, @@ -1619,7 +1582,7 @@ tgl_get_dkl_buf_trans(struct intel_encoder *encoder, int *n_entries) { if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - return tgl_get_dkl_buf_trans_hdmi(encoder, crtc_state, n_entries); + return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_hdmi, n_entries); else return tgl_get_dkl_buf_trans_dp(encoder, crtc_state, n_entries); } @@ -1644,7 +1607,7 @@ adlp_get_dkl_buf_trans(struct intel_encoder *encoder, int *n_entries) { if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) - return tgl_get_dkl_buf_trans_hdmi(encoder, crtc_state, n_entries); + return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_hdmi, n_entries); else return adlp_get_dkl_buf_trans_dp(encoder, crtc_state, n_entries); } -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 16/17] drm/i915: Nuke buf_trans hdmi functions 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 16/17] drm/i915: Nuke buf_trans hdmi functions Ville Syrjala @ 2021-06-23 14:14 ` Jani Nikula 0 siblings, 0 replies; 39+ messages in thread From: Jani Nikula @ 2021-06-23 14:14 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > All the foo_get_buf_trans_hdmi() functions just reuturn a single table. > Remove the pointless wrappers. > > v2: Handle adl-p > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Less is more. Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > .../drm/i915/display/intel_ddi_buf_trans.c | 51 +++---------------- > 1 file changed, 7 insertions(+), 44 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index 2bd51ce4aa2c..a456823df102 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -1294,15 +1294,6 @@ cnl_get_buf_trans(struct intel_encoder *encoder, > return cnl_get_buf_trans_dp(encoder, n_entries); > } > > -static const struct intel_ddi_buf_trans * > -icl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries) > -{ > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, > - n_entries); > -} > - > static const struct intel_ddi_buf_trans * > icl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > @@ -1336,22 +1327,13 @@ icl_get_combo_buf_trans(struct intel_encoder *encoder, > int *n_entries) > { > if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > - return icl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); > else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) > return icl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); > else > return icl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const struct intel_ddi_buf_trans * > -icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries) > -{ > - return intel_get_buf_trans(&icl_mg_phy_ddi_translations_hdmi, > - n_entries); > -} > - > static const struct intel_ddi_buf_trans * > icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > @@ -1372,12 +1354,11 @@ icl_get_mg_buf_trans(struct intel_encoder *encoder, > int *n_entries) > { > if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > - return icl_get_mg_buf_trans_hdmi(encoder, crtc_state, n_entries); > + return intel_get_buf_trans(&icl_mg_phy_ddi_translations_hdmi, n_entries); > else > return icl_get_mg_buf_trans_dp(encoder, crtc_state, n_entries); > } > > - > static const struct intel_ddi_buf_trans * > ehl_get_combo_buf_trans_edp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > @@ -1432,15 +1413,6 @@ jsl_get_combo_buf_trans(struct intel_encoder *encoder, > return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); > } > > -static const struct intel_ddi_buf_trans * > -tgl_get_combo_buf_trans_hdmi(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries) > -{ > - return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, > - n_entries); > -} > - > static const struct intel_ddi_buf_trans * > tgl_get_combo_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > @@ -1490,7 +1462,7 @@ tgl_get_combo_buf_trans(struct intel_encoder *encoder, > int *n_entries) > { > if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > - return tgl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); > else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) > return tgl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); > else > @@ -1537,7 +1509,7 @@ dg1_get_combo_buf_trans(struct intel_encoder *encoder, > int *n_entries) > { > if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > - return icl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); > else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) > return dg1_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); > else > @@ -1583,22 +1555,13 @@ rkl_get_combo_buf_trans(struct intel_encoder *encoder, > int *n_entries) > { > if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > - return tgl_get_combo_buf_trans_hdmi(encoder, crtc_state, n_entries); > + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); > else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) > return rkl_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); > else > return rkl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > -static const struct intel_ddi_buf_trans * > -tgl_get_dkl_buf_trans_hdmi(struct intel_encoder *encoder, > - const struct intel_crtc_state *crtc_state, > - int *n_entries) > -{ > - return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_hdmi, > - n_entries); > -} > - > static const struct intel_ddi_buf_trans * > tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > @@ -1619,7 +1582,7 @@ tgl_get_dkl_buf_trans(struct intel_encoder *encoder, > int *n_entries) > { > if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > - return tgl_get_dkl_buf_trans_hdmi(encoder, crtc_state, n_entries); > + return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_hdmi, n_entries); > else > return tgl_get_dkl_buf_trans_dp(encoder, crtc_state, n_entries); > } > @@ -1644,7 +1607,7 @@ adlp_get_dkl_buf_trans(struct intel_encoder *encoder, > int *n_entries) > { > if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) > - return tgl_get_dkl_buf_trans_hdmi(encoder, crtc_state, n_entries); > + return intel_get_buf_trans(&tgl_dkl_phy_ddi_translations_hdmi, n_entries); > else > return adlp_get_dkl_buf_trans_dp(encoder, crtc_state, n_entries); > } -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 17/17] drm/i915: Add the missing adls vswing tables 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (15 preceding siblings ...) 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 16/17] drm/i915: Nuke buf_trans hdmi functions Ville Syrjala @ 2021-06-08 7:36 ` Ville Syrjala 2021-06-23 14:36 ` Jani Nikula 2021-06-08 8:46 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: DDI buf trans cleaup and fixes (rev4) Patchwork ` (4 subsequent siblings) 21 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-06-08 7:36 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> adls is supposed to use special buf trans tables. Add what's missing. v2: Drop the RBR/HBR table since it's the same as for tgl Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index a456823df102..63b1ae830d9a 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -1000,6 +1000,63 @@ static const struct intel_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr2_h .num_entries = ARRAY_SIZE(_rkl_combo_phy_ddi_translations_dp_hbr2_hbr3), }; +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x63, 0x30, 0x00, 0x0F } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x47, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x63, 0x37, 0x00, 0x08 } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x31, 0x00, 0x0E } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x61, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7B, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_dp_hbr2_hbr3 = { + .entries = _adls_combo_phy_ddi_translations_dp_hbr2_hbr3, + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_dp_hbr2_hbr3), +}; + +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_edp_hbr2[] = { + /* NT mV Trans mV db */ + { .cnl = { 0x9, 0x70, 0x3C, 0x00, 0x03 } }, /* 200 200 0.0 */ + { .cnl = { 0x9, 0x6D, 0x3A, 0x00, 0x05 } }, /* 200 250 1.9 */ + { .cnl = { 0x9, 0x7F, 0x36, 0x00, 0x09 } }, /* 200 300 3.5 */ + { .cnl = { 0x4, 0x59, 0x32, 0x00, 0x0D } }, /* 200 350 4.9 */ + { .cnl = { 0x2, 0x77, 0x3A, 0x00, 0x05 } }, /* 250 250 0.0 */ + { .cnl = { 0x2, 0x7F, 0x38, 0x00, 0x07 } }, /* 250 300 1.6 */ + { .cnl = { 0x4, 0x5A, 0x36, 0x00, 0x09 } }, /* 250 350 2.9 */ + { .cnl = { 0x4, 0x5E, 0x3D, 0x00, 0x04 } }, /* 300 300 0.0 */ + { .cnl = { 0x4, 0x65, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ + { .cnl = { 0x4, 0x6F, 0x3A, 0x00, 0x05 } }, /* 350 350 0.0 */ +}; + +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_edp_hbr2 = { + .entries = _adls_combo_phy_ddi_translations_edp_hbr2, + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_edp_hbr2), +}; + +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_edp_hbr3[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x5E, 0x34, 0x00, 0x0B } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x69, 0x32, 0x00, 0x0D } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x74, 0x31, 0x00, 0x0E } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2E, 0x00, 0x11 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x5C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x7F, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x33, 0x00, 0x0C } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x7F, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x3C, 0x00, 0x03 } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_edp_hbr3 = { + .entries = _adls_combo_phy_ddi_translations_edp_hbr3, + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_edp_hbr3), +}; + static const union intel_ddi_buf_trans_entry _adlp_dkl_phy_ddi_translations_dp_hbr[] = { /* VS pre-emp Non-trans mV Pre-emph dB */ { .dkl = { 0x7, 0x0, 0x01 } }, /* 0 0 400mV 0 dB */ @@ -1562,6 +1619,48 @@ rkl_get_combo_buf_trans(struct intel_encoder *encoder, return rkl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } +static const struct intel_ddi_buf_trans * +adls_get_combo_buf_trans_dp(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) +{ + if (crtc_state->port_clock > 270000) + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_dp_hbr2_hbr3, n_entries); + else + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr, n_entries); +} + +static const struct intel_ddi_buf_trans * +adls_get_combo_buf_trans_edp(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + + if (crtc_state->port_clock > 540000) + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_edp_hbr3, n_entries); + else if (i915->vbt.edp.hobl && !intel_dp->hobl_failed) + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, n_entries); + else if (i915->vbt.edp.low_vswing) + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_edp_hbr2, n_entries); + else + return adls_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); +} + +static const struct intel_ddi_buf_trans * +adls_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 intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) + return adls_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); + else + return adls_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); +} + static const struct intel_ddi_buf_trans * tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, @@ -1642,6 +1741,8 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) encoder->get_buf_trans = tgl_get_combo_buf_trans; else encoder->get_buf_trans = adlp_get_dkl_buf_trans; + } else if (IS_ALDERLAKE_S(i915)) { + encoder->get_buf_trans = adls_get_combo_buf_trans; } else if (IS_ROCKETLAKE(i915)) { encoder->get_buf_trans = rkl_get_combo_buf_trans; } else if (IS_DG1(i915)) { -- 2.31.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* Re: [Intel-gfx] [PATCH v2 17/17] drm/i915: Add the missing adls vswing tables 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 17/17] drm/i915: Add the missing adls vswing tables Ville Syrjala @ 2021-06-23 14:36 ` Jani Nikula 0 siblings, 0 replies; 39+ messages in thread From: Jani Nikula @ 2021-06-23 14:36 UTC (permalink / raw) To: Ville Syrjala, intel-gfx On Tue, 08 Jun 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > adls is supposed to use special buf trans tables. Add what's > missing. > > v2: Drop the RBR/HBR table since it's the same as for tgl > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Pedantically reviewed every value, Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > .../drm/i915/display/intel_ddi_buf_trans.c | 101 ++++++++++++++++++ > 1 file changed, 101 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > index a456823df102..63b1ae830d9a 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c > @@ -1000,6 +1000,63 @@ static const struct intel_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr2_h > .num_entries = ARRAY_SIZE(_rkl_combo_phy_ddi_translations_dp_hbr2_hbr3), > }; > > +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x63, 0x30, 0x00, 0x0F } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x47, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x63, 0x37, 0x00, 0x08 } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x31, 0x00, 0x0E } }, /* 500 900 5.1 */ > + { .cnl = { 0xC, 0x61, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7B, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > +}; > + > +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_dp_hbr2_hbr3 = { > + .entries = _adls_combo_phy_ddi_translations_dp_hbr2_hbr3, > + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_dp_hbr2_hbr3), > +}; > + > +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_edp_hbr2[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0x9, 0x70, 0x3C, 0x00, 0x03 } }, /* 200 200 0.0 */ > + { .cnl = { 0x9, 0x6D, 0x3A, 0x00, 0x05 } }, /* 200 250 1.9 */ > + { .cnl = { 0x9, 0x7F, 0x36, 0x00, 0x09 } }, /* 200 300 3.5 */ > + { .cnl = { 0x4, 0x59, 0x32, 0x00, 0x0D } }, /* 200 350 4.9 */ > + { .cnl = { 0x2, 0x77, 0x3A, 0x00, 0x05 } }, /* 250 250 0.0 */ > + { .cnl = { 0x2, 0x7F, 0x38, 0x00, 0x07 } }, /* 250 300 1.6 */ > + { .cnl = { 0x4, 0x5A, 0x36, 0x00, 0x09 } }, /* 250 350 2.9 */ > + { .cnl = { 0x4, 0x5E, 0x3D, 0x00, 0x04 } }, /* 300 300 0.0 */ > + { .cnl = { 0x4, 0x65, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ > + { .cnl = { 0x4, 0x6F, 0x3A, 0x00, 0x05 } }, /* 350 350 0.0 */ > +}; > + > +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_edp_hbr2 = { > + .entries = _adls_combo_phy_ddi_translations_edp_hbr2, > + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_edp_hbr2), > +}; > + > +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_edp_hbr3[] = { > + /* NT mV Trans mV db */ > + { .cnl = { 0xA, 0x5E, 0x34, 0x00, 0x0B } }, /* 350 350 0.0 */ > + { .cnl = { 0xA, 0x69, 0x32, 0x00, 0x0D } }, /* 350 500 3.1 */ > + { .cnl = { 0xC, 0x74, 0x31, 0x00, 0x0E } }, /* 350 700 6.0 */ > + { .cnl = { 0x6, 0x7F, 0x2E, 0x00, 0x11 } }, /* 350 900 8.2 */ > + { .cnl = { 0xA, 0x5C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ > + { .cnl = { 0xC, 0x7F, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ > + { .cnl = { 0x6, 0x7F, 0x33, 0x00, 0x0C } }, /* 500 900 5.1 */ > + { .cnl = { 0xC, 0x7F, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ > + { .cnl = { 0x6, 0x7F, 0x3C, 0x00, 0x03 } }, /* 600 900 3.5 */ > + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ > +}; > + > +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_edp_hbr3 = { > + .entries = _adls_combo_phy_ddi_translations_edp_hbr3, > + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_edp_hbr3), > +}; > + > static const union intel_ddi_buf_trans_entry _adlp_dkl_phy_ddi_translations_dp_hbr[] = { > /* VS pre-emp Non-trans mV Pre-emph dB */ > { .dkl = { 0x7, 0x0, 0x01 } }, /* 0 0 400mV 0 dB */ > @@ -1562,6 +1619,48 @@ rkl_get_combo_buf_trans(struct intel_encoder *encoder, > return rkl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > } > > +static const struct intel_ddi_buf_trans * > +adls_get_combo_buf_trans_dp(struct intel_encoder *encoder, > + const struct intel_crtc_state *crtc_state, > + int *n_entries) > +{ > + if (crtc_state->port_clock > 270000) > + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_dp_hbr2_hbr3, n_entries); > + else > + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr, n_entries); > +} > + > +static const struct intel_ddi_buf_trans * > +adls_get_combo_buf_trans_edp(struct intel_encoder *encoder, > + const struct intel_crtc_state *crtc_state, > + int *n_entries) > +{ > + struct drm_i915_private *i915 = to_i915(encoder->base.dev); > + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); > + > + if (crtc_state->port_clock > 540000) > + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_edp_hbr3, n_entries); > + else if (i915->vbt.edp.hobl && !intel_dp->hobl_failed) > + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, n_entries); > + else if (i915->vbt.edp.low_vswing) > + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_edp_hbr2, n_entries); > + else > + return adls_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > +} > + > +static const struct intel_ddi_buf_trans * > +adls_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 intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); > + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) > + return adls_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); > + else > + return adls_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); > +} > + > static const struct intel_ddi_buf_trans * > tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state, > @@ -1642,6 +1741,8 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) > encoder->get_buf_trans = tgl_get_combo_buf_trans; > else > encoder->get_buf_trans = adlp_get_dkl_buf_trans; > + } else if (IS_ALDERLAKE_S(i915)) { > + encoder->get_buf_trans = adls_get_combo_buf_trans; > } else if (IS_ROCKETLAKE(i915)) { > encoder->get_buf_trans = rkl_get_combo_buf_trans; > } else if (IS_DG1(i915)) { -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: DDI buf trans cleaup and fixes (rev4) 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (16 preceding siblings ...) 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 17/17] drm/i915: Add the missing adls vswing tables Ville Syrjala @ 2021-06-08 8:46 ` Patchwork 2021-06-08 8:47 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork ` (3 subsequent siblings) 21 siblings, 0 replies; 39+ messages in thread From: Patchwork @ 2021-06-08 8:46 UTC (permalink / raw) To: Ville Syrjala; +Cc: intel-gfx == Series Details == Series: drm/i915: DDI buf trans cleaup and fixes (rev4) URL : https://patchwork.freedesktop.org/series/89311/ State : warning == Summary == $ dim checkpatch origin/drm-tip 52f3229452fb drm/i915: s/intel/hsw/ for hsw/bdw/skl buf trans 92cd92c06299 drm/i915: Introduce hsw_get_buf_trans() 05c03e8ca7cf drm/i915: Wrap the platform specific buf trans structs into a union be978537cd1a drm/i915: Rename dkl phy buf trans tables -:101: WARNING:UNNECESSARY_ELSE: else is not generally useful after a break or return #101: FILE: drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:1403: + return adlp_dkl_phy_ddi_translations_dp_hbr2_hbr3; + } else { total: 0 errors, 1 warnings, 0 checks, 82 lines checked 96b3ebba8a49 drm/i915: Wrap the buf trans tables into a struct a7a82eabdb38 drm/i915: Introduce intel_get_buf_trans() -:25: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #25: + intel_get_buf_trans(const struct intel_ddi_buf_trans *ddi_translations, int *num_entries) total: 0 errors, 1 warnings, 0 checks, 488 lines checked edb3783fae3c drm/i915; Return the whole buf_trans struct from get_buf_trans() -:256: WARNING:LONG_LINE: line length of 108 exceeds 100 columns #256: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:1465: + dpcnt_val |= DKL_TX_DE_EMPHASIS_COEFF(ddi_translations->entries[level].dkl.dkl_de_emphasis_control); -:257: WARNING:LONG_LINE: line length of 102 exceeds 100 columns #257: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:1466: + dpcnt_val |= DKL_TX_PRESHOOT_COEFF(ddi_translations->entries[level].dkl.dkl_preshoot_control); total: 0 errors, 2 warnings, 0 checks, 651 lines checked a5fa7896aa86 drm/i915: Store the HDMI default entry in the bug trans struct -:119: WARNING:LONG_LINE: line length of 105 exceeds 100 columns #119: FILE: drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:1712: + ddi_translations = tgl_get_combo_buf_trans_hdmi(encoder, crtc_state, &n_entries); -:123: WARNING:LONG_LINE: line length of 103 exceeds 100 columns #123: FILE: drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:1714: + ddi_translations = tgl_get_dkl_buf_trans_hdmi(encoder, crtc_state, &n_entries); -:127: WARNING:LONG_LINE: line length of 105 exceeds 100 columns #127: FILE: drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:1717: + ddi_translations = icl_get_combo_buf_trans_hdmi(encoder, crtc_state, &n_entries); -:131: WARNING:LONG_LINE: line length of 102 exceeds 100 columns #131: FILE: drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:1719: + ddi_translations = icl_get_mg_buf_trans_hdmi(encoder, crtc_state, &n_entries); total: 0 errors, 4 warnings, 0 checks, 141 lines checked 7dc2a2bae0f1 drm/i915: Introduce encoder->get_buf_trans() -:408: WARNING:LONG_LINE: line length of 101 exceeds 100 columns #408: FILE: drivers/gpu/drm/i915/display/intel_display_types.h:268: + const struct intel_crtc_state *crtc_state, total: 0 errors, 1 warnings, 0 checks, 364 lines checked 9e161e21bd23 drm/i915: Clean up hsw/bdw/skl/kbl buf trans funcs a024fc673e7d drm/i915: Introduce rkl_get_combo_buf_trans() 57bf0c2042ff drm/i915: Fix dg1 buf trans tables 5b87954c2ede drm/i915: Deduplicate icl DP HBR2 vs. eDP HBR3 table 5e5a65a61db3 drm/i915: Fix ehl edp hbr2 vswing table 7c13bdf62ebe drm/i915: Clean up jsl/ehl buf trans functions -:141: WARNING:LONG_LINE: line length of 104 exceeds 100 columns #141: FILE: drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:1432: + return intel_get_buf_trans(&icl_combo_phy_ddi_translations_dp_hbr2_edp_hbr3, n_entries); total: 0 errors, 1 warnings, 0 checks, 123 lines checked ebb8659f2fe4 drm/i915: Nuke buf_trans hdmi functions 80e1204635e7 drm/i915: Add the missing adls vswing tables -:94: WARNING:LONG_LINE: line length of 101 exceeds 100 columns #94: FILE: drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:1628: + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_dp_hbr2_hbr3, n_entries); -:110: WARNING:LONG_LINE: line length of 101 exceeds 100 columns #110: FILE: drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c:1644: + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, n_entries); total: 0 errors, 2 warnings, 0 checks, 119 lines checked _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: DDI buf trans cleaup and fixes (rev4) 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (17 preceding siblings ...) 2021-06-08 8:46 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: DDI buf trans cleaup and fixes (rev4) Patchwork @ 2021-06-08 8:47 ` Patchwork 2021-06-08 9:15 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork ` (2 subsequent siblings) 21 siblings, 0 replies; 39+ messages in thread From: Patchwork @ 2021-06-08 8:47 UTC (permalink / raw) To: Ville Syrjala; +Cc: intel-gfx == Series Details == Series: drm/i915: DDI buf trans cleaup and fixes (rev4) URL : https://patchwork.freedesktop.org/series/89311/ State : warning == Summary == $ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. - +drivers/gpu/drm/i915/display/intel_display.c:1893:21: expected struct i915_vma *[assigned] vma +drivers/gpu/drm/i915/display/intel_display.c:1893:21: got void [noderef] __iomem *[assigned] iomem +drivers/gpu/drm/i915/display/intel_display.c:1893:21: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:32:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:32:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:56:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:56:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_reset.c:1396:5: warning: context imbalance in 'intel_gt_reset_trylock' - different lock contexts for basic block +./include/asm-generic/bitops/find.h:112:45: warning: shift count is negative (-262080) +./include/asm-generic/bitops/find.h:32:31: warning: shift count is negative (-262080) +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write8' - different lock contexts for basic block _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: DDI buf trans cleaup and fixes (rev4) 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (18 preceding siblings ...) 2021-06-08 8:47 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork @ 2021-06-08 9:15 ` Patchwork 2021-06-08 9:15 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork 2021-06-08 13:33 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork 21 siblings, 0 replies; 39+ messages in thread From: Patchwork @ 2021-06-08 9:15 UTC (permalink / raw) To: Ville Syrjala; +Cc: intel-gfx [-- Attachment #1.1: Type: text/plain, Size: 7984 bytes --] == Series Details == Series: drm/i915: DDI buf trans cleaup and fixes (rev4) URL : https://patchwork.freedesktop.org/series/89311/ State : success == Summary == CI Bug Log - changes from CI_DRM_10188 -> Patchwork_20306 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/index.html Known issues ------------ Here are the changes found in Patchwork_20306 that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_huc_copy@huc-copy: - fi-tgl-u2: NOTRUN -> [SKIP][1] ([i915#2190]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-tgl-u2/igt@gem_huc_copy@huc-copy.html * igt@i915_selftest@live@execlists: - fi-tgl-u2: NOTRUN -> [INCOMPLETE][2] ([i915#3462]) [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-tgl-u2/igt@i915_selftest@live@execlists.html * igt@i915_selftest@live@hangcheck: - fi-snb-2600: [PASS][3] -> [INCOMPLETE][4] ([i915#2782]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/fi-snb-2600/igt@i915_selftest@live@hangcheck.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-snb-2600/igt@i915_selftest@live@hangcheck.html * igt@kms_chamelium@dp-hpd-fast: - fi-tgl-u2: NOTRUN -> [SKIP][5] ([fdo#109284] / [fdo#111827]) +8 similar issues [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-tgl-u2/igt@kms_chamelium@dp-hpd-fast.html * igt@kms_force_connector_basic@force-load-detect: - fi-tgl-u2: NOTRUN -> [SKIP][6] ([fdo#109285]) [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-tgl-u2/igt@kms_force_connector_basic@force-load-detect.html * igt@prime_vgem@basic-userptr: - fi-tgl-u2: NOTRUN -> [SKIP][7] ([i915#3301]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-tgl-u2/igt@prime_vgem@basic-userptr.html * igt@runner@aborted: - fi-tgl-u2: NOTRUN -> [FAIL][8] ([i915#1436] / [i915#2966]) [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-tgl-u2/igt@runner@aborted.html #### Warnings #### * igt@runner@aborted: - fi-kbl-8809g: [FAIL][9] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][10] ([i915#1436] / [i915#3363]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/fi-kbl-8809g/igt@runner@aborted.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-kbl-8809g/igt@runner@aborted.html - fi-kbl-soraka: [FAIL][11] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][12] ([i915#1436] / [i915#3363]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/fi-kbl-soraka/igt@runner@aborted.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-kbl-soraka/igt@runner@aborted.html - fi-kbl-guc: [FAIL][13] ([i915#1436] / [i915#3363]) -> [FAIL][14] ([i915#1436] / [i915#2426] / [i915#3363]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/fi-kbl-guc/igt@runner@aborted.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-kbl-guc/igt@runner@aborted.html - fi-cfl-guc: [FAIL][15] ([i915#3363]) -> [FAIL][16] ([i915#2426] / [i915#3363]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/fi-cfl-guc/igt@runner@aborted.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-cfl-guc/igt@runner@aborted.html - fi-skl-6700k2: [FAIL][17] ([i915#1436] / [i915#3363]) -> [FAIL][18] ([i915#1436] / [i915#2426] / [i915#3363]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/fi-skl-6700k2/igt@runner@aborted.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/fi-skl-6700k2/igt@runner@aborted.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284 [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285 [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827 [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072 [i915#1222]: https://gitlab.freedesktop.org/drm/intel/issues/1222 [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426 [i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782 [i915#2966]: https://gitlab.freedesktop.org/drm/intel/issues/2966 [i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012 [i915#3276]: https://gitlab.freedesktop.org/drm/intel/issues/3276 [i915#3277]: https://gitlab.freedesktop.org/drm/intel/issues/3277 [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282 [i915#3283]: https://gitlab.freedesktop.org/drm/intel/issues/3283 [i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301 [i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363 [i915#3462]: https://gitlab.freedesktop.org/drm/intel/issues/3462 [i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539 [i915#3542]: https://gitlab.freedesktop.org/drm/intel/issues/3542 [i915#3544]: https://gitlab.freedesktop.org/drm/intel/issues/3544 [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533 Participating hosts (46 -> 43) ------------------------------ Additional (2): fi-rkl-11500t fi-tgl-u2 Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus Build changes ------------- * Linux: CI_DRM_10188 -> Patchwork_20306 CI-20190529: 20190529 CI_DRM_10188: 8663aa75dada3153f7d48c8bc727da0444f98de2 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_6099: adb9ee4ed7206725cfe3589bf49f47f9dcf661f2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_20306: 80e1204635e741f8e9294bcaaab6132581e62640 @ git://anongit.freedesktop.org/gfx-ci/linux == Kernel 32bit build == Warning: Kernel 32bit buildtest failed: https://intel-gfx-ci.01.org/Patchwork_20306/build_32bit.log CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh CHK include/generated/compile.h Kernel: arch/x86/boot/bzImage is ready (#1) MODPOST modules-only.symvers ERROR: modpost: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! scripts/Makefile.modpost:150: recipe for target 'modules-only.symvers' failed make[1]: *** [modules-only.symvers] Error 1 make[1]: *** Deleting file 'modules-only.symvers' Makefile:1759: recipe for target 'modules' failed make: *** [modules] Error 2 == Linux commits == 80e1204635e7 drm/i915: Add the missing adls vswing tables ebb8659f2fe4 drm/i915: Nuke buf_trans hdmi functions 7c13bdf62ebe drm/i915: Clean up jsl/ehl buf trans functions 5e5a65a61db3 drm/i915: Fix ehl edp hbr2 vswing table 5b87954c2ede drm/i915: Deduplicate icl DP HBR2 vs. eDP HBR3 table 57bf0c2042ff drm/i915: Fix dg1 buf trans tables a024fc673e7d drm/i915: Introduce rkl_get_combo_buf_trans() 9e161e21bd23 drm/i915: Clean up hsw/bdw/skl/kbl buf trans funcs 7dc2a2bae0f1 drm/i915: Introduce encoder->get_buf_trans() a5fa7896aa86 drm/i915: Store the HDMI default entry in the bug trans struct edb3783fae3c drm/i915; Return the whole buf_trans struct from get_buf_trans() a7a82eabdb38 drm/i915: Introduce intel_get_buf_trans() 96b3ebba8a49 drm/i915: Wrap the buf trans tables into a struct be978537cd1a drm/i915: Rename dkl phy buf trans tables 05c03e8ca7cf drm/i915: Wrap the platform specific buf trans structs into a union 92cd92c06299 drm/i915: Introduce hsw_get_buf_trans() 52f3229452fb drm/i915: s/intel/hsw/ for hsw/bdw/skl buf trans == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/index.html [-- Attachment #1.2: Type: text/html, Size: 9896 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: warning for drm/i915: DDI buf trans cleaup and fixes (rev4) 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (19 preceding siblings ...) 2021-06-08 9:15 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork @ 2021-06-08 9:15 ` Patchwork 2021-06-08 13:33 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork 21 siblings, 0 replies; 39+ messages in thread From: Patchwork @ 2021-06-08 9:15 UTC (permalink / raw) To: Ville Syrjala; +Cc: intel-gfx == Series Details == Series: drm/i915: DDI buf trans cleaup and fixes (rev4) URL : https://patchwork.freedesktop.org/series/89311/ State : warning == Summary == CALL scripts/checksyscalls.sh CALL scripts/atomic/check-atomics.sh CHK include/generated/compile.h Kernel: arch/x86/boot/bzImage is ready (#1) MODPOST modules-only.symvers ERROR: modpost: "__udivdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! ERROR: modpost: "__divdi3" [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined! scripts/Makefile.modpost:150: recipe for target 'modules-only.symvers' failed make[1]: *** [modules-only.symvers] Error 1 make[1]: *** Deleting file 'modules-only.symvers' Makefile:1759: recipe for target 'modules' failed make: *** [modules] Error 2 == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/build_32bit.log _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: DDI buf trans cleaup and fixes (rev4) 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala ` (20 preceding siblings ...) 2021-06-08 9:15 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork @ 2021-06-08 13:33 ` Patchwork 21 siblings, 0 replies; 39+ messages in thread From: Patchwork @ 2021-06-08 13:33 UTC (permalink / raw) To: Ville Syrjala; +Cc: intel-gfx [-- Attachment #1.1: Type: text/plain, Size: 30270 bytes --] == Series Details == Series: drm/i915: DDI buf trans cleaup and fixes (rev4) URL : https://patchwork.freedesktop.org/series/89311/ State : success == Summary == CI Bug Log - changes from CI_DRM_10188_full -> Patchwork_20306_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_20306_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@feature_discovery@display-2x: - shard-iclb: NOTRUN -> [SKIP][1] ([i915#1839]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@feature_discovery@display-2x.html * igt@gem_create@create-massive: - shard-snb: NOTRUN -> [DMESG-WARN][2] ([i915#3002]) [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-snb7/igt@gem_create@create-massive.html - shard-apl: NOTRUN -> [DMESG-WARN][3] ([i915#3002]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-apl8/igt@gem_create@create-massive.html * igt@gem_ctx_persistence@clone: - shard-snb: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#1099]) +5 similar issues [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-snb5/igt@gem_ctx_persistence@clone.html * igt@gem_exec_fair@basic-none@vcs0: - shard-kbl: [PASS][5] -> [FAIL][6] ([i915#2842]) +2 similar issues [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl4/igt@gem_exec_fair@basic-none@vcs0.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl4/igt@gem_exec_fair@basic-none@vcs0.html * igt@gem_exec_fair@basic-none@vcs1: - shard-iclb: NOTRUN -> [FAIL][7] ([i915#2842]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb2/igt@gem_exec_fair@basic-none@vcs1.html * igt@gem_exec_fair@basic-pace-share@rcs0: - shard-tglb: [PASS][8] -> [FAIL][9] ([i915#2842]) +1 similar issue [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-tglb5/igt@gem_exec_fair@basic-pace-share@rcs0.html [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-tglb8/igt@gem_exec_fair@basic-pace-share@rcs0.html * igt@gem_exec_fair@basic-pace@vcs0: - shard-kbl: [PASS][10] -> [SKIP][11] ([fdo#109271]) [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl1/igt@gem_exec_fair@basic-pace@vcs0.html [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl3/igt@gem_exec_fair@basic-pace@vcs0.html - shard-glk: NOTRUN -> [FAIL][12] ([i915#2842]) +1 similar issue [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-glk9/igt@gem_exec_fair@basic-pace@vcs0.html * igt@gem_pwrite@basic-exhaustion: - shard-snb: NOTRUN -> [WARN][13] ([i915#2658]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-snb5/igt@gem_pwrite@basic-exhaustion.html * igt@gem_userptr_blits@dmabuf-sync: - shard-iclb: NOTRUN -> [SKIP][14] ([i915#3323]) [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@gem_userptr_blits@dmabuf-sync.html * igt@gem_userptr_blits@vma-merge: - shard-snb: NOTRUN -> [FAIL][15] ([i915#2724]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-snb7/igt@gem_userptr_blits@vma-merge.html - shard-apl: NOTRUN -> [FAIL][16] ([i915#3318]) [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-apl8/igt@gem_userptr_blits@vma-merge.html - shard-kbl: NOTRUN -> [FAIL][17] ([i915#3318]) [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl3/igt@gem_userptr_blits@vma-merge.html * igt@gen7_exec_parse@basic-offset: - shard-apl: NOTRUN -> [SKIP][18] ([fdo#109271]) +178 similar issues [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-apl7/igt@gen7_exec_parse@basic-offset.html * igt@gen9_exec_parse@allowed-single: - shard-skl: [PASS][19] -> [DMESG-WARN][20] ([i915#1436] / [i915#1982] / [i915#716]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl5/igt@gen9_exec_parse@allowed-single.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl5/igt@gen9_exec_parse@allowed-single.html * igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp: - shard-apl: NOTRUN -> [SKIP][21] ([fdo#109271] / [i915#1937]) [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-apl2/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp.html * igt@i915_pm_rpm@dpms-non-lpsp: - shard-iclb: NOTRUN -> [SKIP][22] ([fdo#110892]) [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@i915_pm_rpm@dpms-non-lpsp.html * igt@kms_chamelium@dp-edid-change-during-suspend: - shard-apl: NOTRUN -> [SKIP][23] ([fdo#109271] / [fdo#111827]) +15 similar issues [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-apl7/igt@kms_chamelium@dp-edid-change-during-suspend.html * igt@kms_chamelium@vga-hpd-after-suspend: - shard-skl: NOTRUN -> [SKIP][24] ([fdo#109271] / [fdo#111827]) +4 similar issues [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl9/igt@kms_chamelium@vga-hpd-after-suspend.html * igt@kms_chamelium@vga-hpd-with-enabled-mode: - shard-iclb: NOTRUN -> [SKIP][25] ([fdo#109284] / [fdo#111827]) +4 similar issues [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@kms_chamelium@vga-hpd-with-enabled-mode.html * igt@kms_color_chamelium@pipe-a-ctm-0-5: - shard-glk: NOTRUN -> [SKIP][26] ([fdo#109271] / [fdo#111827]) +2 similar issues [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-glk9/igt@kms_color_chamelium@pipe-a-ctm-0-5.html * igt@kms_color_chamelium@pipe-c-ctm-0-25: - shard-kbl: NOTRUN -> [SKIP][27] ([fdo#109271] / [fdo#111827]) +7 similar issues [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl3/igt@kms_color_chamelium@pipe-c-ctm-0-25.html * igt@kms_color_chamelium@pipe-c-ctm-limited-range: - shard-snb: NOTRUN -> [SKIP][28] ([fdo#109271] / [fdo#111827]) +18 similar issues [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-snb5/igt@kms_color_chamelium@pipe-c-ctm-limited-range.html * igt@kms_content_protection@atomic: - shard-kbl: NOTRUN -> [TIMEOUT][29] ([i915#1319]) [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl3/igt@kms_content_protection@atomic.html * igt@kms_content_protection@legacy: - shard-glk: NOTRUN -> [SKIP][30] ([fdo#109271]) +19 similar issues [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-glk9/igt@kms_content_protection@legacy.html * igt@kms_cursor_crc@pipe-a-cursor-256x256-random: - shard-apl: NOTRUN -> [FAIL][31] ([i915#3444]) [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-apl2/igt@kms_cursor_crc@pipe-a-cursor-256x256-random.html * igt@kms_cursor_crc@pipe-a-cursor-512x512-rapid-movement: - shard-iclb: NOTRUN -> [SKIP][32] ([fdo#109278] / [fdo#109279]) +1 similar issue [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@kms_cursor_crc@pipe-a-cursor-512x512-rapid-movement.html * igt@kms_cursor_crc@pipe-c-cursor-dpms: - shard-kbl: NOTRUN -> [FAIL][33] ([i915#3444]) [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl3/igt@kms_cursor_crc@pipe-c-cursor-dpms.html * igt@kms_cursor_edge_walk@pipe-d-64x64-left-edge: - shard-kbl: NOTRUN -> [SKIP][34] ([fdo#109271]) +90 similar issues [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl7/igt@kms_cursor_edge_walk@pipe-d-64x64-left-edge.html * igt@kms_cursor_legacy@cursorb-vs-flipa-legacy: - shard-iclb: NOTRUN -> [SKIP][35] ([fdo#109274] / [fdo#109278]) +1 similar issue [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@kms_cursor_legacy@cursorb-vs-flipa-legacy.html * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions: - shard-skl: [PASS][36] -> [FAIL][37] ([i915#2346]) [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl4/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl1/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size: - shard-skl: [PASS][38] -> [FAIL][39] ([i915#2346] / [i915#533]) [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl4/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl5/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html * igt@kms_flip@2x-flip-vs-expired-vblank: - shard-iclb: NOTRUN -> [SKIP][40] ([fdo#109274]) [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@kms_flip@2x-flip-vs-expired-vblank.html * igt@kms_flip@flip-vs-expired-vblank@c-edp1: - shard-skl: [PASS][41] -> [FAIL][42] ([i915#79]) [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl6/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl4/igt@kms_flip@flip-vs-expired-vblank@c-edp1.html * igt@kms_flip@flip-vs-suspend-interruptible@a-dp1: - shard-kbl: NOTRUN -> [DMESG-WARN][43] ([i915#180]) +2 similar issues [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl3/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html * igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile: - shard-kbl: NOTRUN -> [SKIP][44] ([fdo#109271] / [i915#2642]) [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl1/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile.html * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-blt: - shard-glk: [PASS][45] -> [FAIL][46] ([i915#49]) [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-glk7/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-blt.html [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-glk6/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-blt.html * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-shrfb-msflip-blt: - shard-snb: NOTRUN -> [SKIP][47] ([fdo#109271]) +350 similar issues [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-snb5/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-shrfb-msflip-blt.html * igt@kms_frontbuffer_tracking@fbcpsr-1p-shrfb-fliptrack-mmap-gtt: - shard-skl: NOTRUN -> [SKIP][48] ([fdo#109271]) +40 similar issues [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl9/igt@kms_frontbuffer_tracking@fbcpsr-1p-shrfb-fliptrack-mmap-gtt.html * igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-move: - shard-iclb: NOTRUN -> [SKIP][49] ([fdo#109280]) +6 similar issues [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-move.html * igt@kms_hdr@bpc-switch-dpms: - shard-skl: [PASS][50] -> [FAIL][51] ([i915#1188]) [50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl6/igt@kms_hdr@bpc-switch-dpms.html [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl3/igt@kms_hdr@bpc-switch-dpms.html * igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d: - shard-kbl: NOTRUN -> [SKIP][52] ([fdo#109271] / [i915#533]) [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl1/igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d.html * igt@kms_pipe_crc_basic@hang-read-crc-pipe-d: - shard-apl: NOTRUN -> [SKIP][53] ([fdo#109271] / [i915#533]) [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-apl3/igt@kms_pipe_crc_basic@hang-read-crc-pipe-d.html * igt@kms_plane_alpha_blend@pipe-a-alpha-7efc: - shard-skl: NOTRUN -> [FAIL][54] ([fdo#108145] / [i915#265]) [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-alpha-7efc.html * igt@kms_plane_alpha_blend@pipe-a-alpha-basic: - shard-apl: NOTRUN -> [FAIL][55] ([fdo#108145] / [i915#265]) +3 similar issues [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-apl2/igt@kms_plane_alpha_blend@pipe-a-alpha-basic.html * igt@kms_plane_alpha_blend@pipe-c-alpha-7efc: - shard-kbl: NOTRUN -> [FAIL][56] ([fdo#108145] / [i915#265]) [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl3/igt@kms_plane_alpha_blend@pipe-c-alpha-7efc.html * igt@kms_plane_alpha_blend@pipe-d-constant-alpha-max: - shard-iclb: NOTRUN -> [SKIP][57] ([fdo#109278]) +5 similar issues [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@kms_plane_alpha_blend@pipe-d-constant-alpha-max.html * igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3: - shard-iclb: NOTRUN -> [SKIP][58] ([i915#658]) [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-3.html * igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3: - shard-kbl: NOTRUN -> [SKIP][59] ([fdo#109271] / [i915#658]) +2 similar issues [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl3/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3.html * igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4: - shard-apl: NOTRUN -> [SKIP][60] ([fdo#109271] / [i915#658]) +6 similar issues [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-apl3/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4.html * igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1: - shard-skl: NOTRUN -> [SKIP][61] ([fdo#109271] / [i915#658]) [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl9/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1.html * igt@kms_psr@psr2_primary_mmap_cpu: - shard-iclb: NOTRUN -> [SKIP][62] ([fdo#109441]) [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@kms_psr@psr2_primary_mmap_cpu.html * igt@kms_psr@psr2_sprite_mmap_cpu: - shard-iclb: [PASS][63] -> [SKIP][64] ([fdo#109441]) [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_cpu.html [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb8/igt@kms_psr@psr2_sprite_mmap_cpu.html * igt@kms_vblank@pipe-b-ts-continuation-suspend: - shard-kbl: [PASS][65] -> [DMESG-WARN][66] ([i915#180]) [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl2/igt@kms_vblank@pipe-b-ts-continuation-suspend.html [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl6/igt@kms_vblank@pipe-b-ts-continuation-suspend.html * igt@kms_vblank@pipe-d-wait-idle: - shard-skl: NOTRUN -> [SKIP][67] ([fdo#109271] / [i915#533]) +1 similar issue [67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl9/igt@kms_vblank@pipe-d-wait-idle.html * igt@kms_writeback@writeback-check-output: - shard-apl: NOTRUN -> [SKIP][68] ([fdo#109271] / [i915#2437]) +1 similar issue [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-apl7/igt@kms_writeback@writeback-check-output.html * igt@nouveau_crc@ctx-flip-threshold-reset-after-capture: - shard-iclb: NOTRUN -> [SKIP][69] ([i915#2530]) [69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@nouveau_crc@ctx-flip-threshold-reset-after-capture.html * igt@perf@gen12-mi-rpc: - shard-iclb: NOTRUN -> [SKIP][70] ([fdo#109289]) [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@perf@gen12-mi-rpc.html * igt@prime_mmap@test_reprime: - shard-skl: [PASS][71] -> [DMESG-WARN][72] ([i915#1982]) [71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl5/igt@prime_mmap@test_reprime.html [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl5/igt@prime_mmap@test_reprime.html * igt@prime_udl: - shard-iclb: NOTRUN -> [SKIP][73] ([fdo#109291]) [73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@prime_udl.html * igt@sysfs_clients@fair-3: - shard-kbl: NOTRUN -> [SKIP][74] ([fdo#109271] / [i915#2994]) +2 similar issues [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl7/igt@sysfs_clients@fair-3.html * igt@sysfs_clients@fair-7: - shard-iclb: NOTRUN -> [SKIP][75] ([i915#2994]) +1 similar issue [75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@sysfs_clients@fair-7.html * igt@sysfs_clients@sema-50: - shard-apl: NOTRUN -> [SKIP][76] ([fdo#109271] / [i915#2994]) +3 similar issues [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-apl2/igt@sysfs_clients@sema-50.html #### Possible fixes #### * igt@drm_mm@all@insert_range: - shard-skl: [INCOMPLETE][77] ([i915#2485]) -> [PASS][78] [77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl1/igt@drm_mm@all@insert_range.html [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl9/igt@drm_mm@all@insert_range.html * igt@gem_create@create-clear: - shard-glk: [FAIL][79] ([i915#1888] / [i915#3160]) -> [PASS][80] [79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-glk1/igt@gem_create@create-clear.html [80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-glk4/igt@gem_create@create-clear.html * igt@gem_exec_endless@dispatch@rcs0: - shard-iclb: [INCOMPLETE][81] ([i915#2502]) -> [PASS][82] [81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-iclb3/igt@gem_exec_endless@dispatch@rcs0.html [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb1/igt@gem_exec_endless@dispatch@rcs0.html * igt@gem_exec_fair@basic-pace-share@rcs0: - shard-glk: [FAIL][83] ([i915#2842]) -> [PASS][84] [83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-glk8/igt@gem_exec_fair@basic-pace-share@rcs0.html [84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-glk7/igt@gem_exec_fair@basic-pace-share@rcs0.html * igt@gem_exec_fair@basic-pace@vcs0: - shard-iclb: [FAIL][85] ([i915#2842]) -> [PASS][86] +1 similar issue [85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-iclb2/igt@gem_exec_fair@basic-pace@vcs0.html [86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb2/igt@gem_exec_fair@basic-pace@vcs0.html * igt@gem_huc_copy@huc-copy: - shard-tglb: [SKIP][87] ([i915#2190]) -> [PASS][88] [87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-tglb6/igt@gem_huc_copy@huc-copy.html [88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-tglb5/igt@gem_huc_copy@huc-copy.html * igt@gem_vm_create@destroy-race: - shard-tglb: [TIMEOUT][89] ([i915#2795]) -> [PASS][90] [89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-tglb3/igt@gem_vm_create@destroy-race.html [90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-tglb8/igt@gem_vm_create@destroy-race.html * igt@gen9_exec_parse@allowed-all: - shard-glk: [DMESG-WARN][91] ([i915#1436] / [i915#716]) -> [PASS][92] [91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-glk5/igt@gen9_exec_parse@allowed-all.html [92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-glk9/igt@gen9_exec_parse@allowed-all.html * igt@kms_async_flips@alternate-sync-async-flip: - shard-skl: [FAIL][93] ([i915#2521]) -> [PASS][94] [93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl7/igt@kms_async_flips@alternate-sync-async-flip.html [94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl6/igt@kms_async_flips@alternate-sync-async-flip.html * igt@kms_cursor_crc@pipe-b-cursor-suspend: - shard-iclb: [INCOMPLETE][95] ([i915#1185] / [i915#2405]) -> [PASS][96] [95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-iclb3/igt@kms_cursor_crc@pipe-b-cursor-suspend.html [96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@kms_cursor_crc@pipe-b-cursor-suspend.html * igt@kms_cursor_legacy@flip-vs-cursor-atomic: - shard-skl: [FAIL][97] ([i915#2346]) -> [PASS][98] +1 similar issue [97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl5/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html [98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic.html * igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-xtiled: - shard-skl: [DMESG-WARN][99] ([i915#1982]) -> [PASS][100] [99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl4/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-xtiled.html [100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl5/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-xtiled.html * igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-ytiled: - shard-skl: [FAIL][101] -> [PASS][102] [101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl7/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-ytiled.html [102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl5/igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-ytiled.html * igt@kms_fbcon_fbt@fbc-suspend: - shard-kbl: [INCOMPLETE][103] ([i915#155] / [i915#180] / [i915#636]) -> [PASS][104] [103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl4/igt@kms_fbcon_fbt@fbc-suspend.html [104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl7/igt@kms_fbcon_fbt@fbc-suspend.html * igt@kms_flip@2x-flip-vs-absolute-wf_vblank@ab-hdmi-a1-hdmi-a2: - shard-glk: [DMESG-WARN][105] ([i915#118] / [i915#95]) -> [PASS][106] +3 similar issues [105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-glk7/igt@kms_flip@2x-flip-vs-absolute-wf_vblank@ab-hdmi-a1-hdmi-a2.html [106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-glk6/igt@kms_flip@2x-flip-vs-absolute-wf_vblank@ab-hdmi-a1-hdmi-a2.html * igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1: - shard-tglb: [FAIL][107] ([i915#79]) -> [PASS][108] [107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-tglb5/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html [108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-tglb1/igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1.html * igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1: - shard-skl: [FAIL][109] ([i915#79]) -> [PASS][110] [109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl2/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html [110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible@b-edp1.html * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-cpu: - shard-tglb: [DMESG-WARN][111] ([i915#2868]) -> [PASS][112] +1 similar issue [111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-tglb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-cpu.html [112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-tglb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-shrfb-draw-mmap-cpu.html * igt@kms_frontbuffer_tracking@fbc-suspend: - shard-kbl: [DMESG-WARN][113] ([i915#180]) -> [PASS][114] +7 similar issues [113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl4/igt@kms_frontbuffer_tracking@fbc-suspend.html [114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-suspend.html * igt@kms_plane_alpha_blend@pipe-c-coverage-7efc: - shard-skl: [FAIL][115] ([fdo#108145] / [i915#265]) -> [PASS][116] +2 similar issues [115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl4/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html [116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-coverage-7efc.html * igt@kms_psr@psr2_sprite_mmap_gtt: - shard-iclb: [SKIP][117] ([fdo#109441]) -> [PASS][118] +1 similar issue [117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-iclb3/igt@kms_psr@psr2_sprite_mmap_gtt.html [118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html * igt@kms_vblank@pipe-a-ts-continuation-suspend: - shard-kbl: [DMESG-WARN][119] ([i915#180] / [i915#295]) -> [PASS][120] [119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl4/igt@kms_vblank@pipe-a-ts-continuation-suspend.html [120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-kbl4/igt@kms_vblank@pipe-a-ts-continuation-suspend.html * igt@perf@polling: - shard-skl: [FAIL][121] ([i915#1542]) -> [PASS][122] [121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl4/igt@perf@polling.html [122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl2/igt@perf@polling.html * igt@prime_vgem@sync@rcs0: - shard-skl: [INCOMPLETE][123] ([i915#409]) -> [PASS][124] [123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-skl9/igt@prime_vgem@sync@rcs0.html [124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-skl9/igt@prime_vgem@sync@rcs0.html #### Warnings #### * igt@i915_pm_rc6_residency@rc6-fence: - shard-iclb: [WARN][125] ([i915#2684]) -> [WARN][126] ([i915#1804] / [i915#2684]) [125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-iclb1/igt@i915_pm_rc6_residency@rc6-fence.html [126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb7/igt@i915_pm_rc6_residency@rc6-fence.html * igt@i915_selftest@live@execlists: - shard-tglb: [INCOMPLETE][127] ([i915#3462]) -> [DMESG-FAIL][128] ([i915#3462]) [127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-tglb8/igt@i915_selftest@live@execlists.html [128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-tglb7/igt@i915_selftest@live@execlists.html * igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5: - shard-iclb: [SKIP][129] ([i915#2920]) -> [SKIP][130] ([i915#658]) [129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-iclb2/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5.html [130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb8/igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5.html * igt@kms_psr2_sf@plane-move-sf-dmg-area-3: - shard-iclb: [SKIP][131] ([i915#658]) -> [SKIP][132] ([i915#2920]) [131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-iclb3/igt@kms_psr2_sf@plane-move-sf-dmg-area-3.html [132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/shard-iclb2/igt@kms_psr2_sf@plane-move-sf-dmg-area-3.html * igt@runner@aborted: - shard-kbl: ([FAIL][133], [FAIL][134], [FAIL][135], [FAIL][136], [FAIL][137], [FAIL][138], [FAIL][139], [FAIL][140], [FAIL][141], [FAIL][142], [FAIL][143], [FAIL][144], [FAIL][145], [FAIL][146], [FAIL][147], [FAIL][148]) ([fdo#109271] / [i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#602] / [i915#92]) -> ([FAIL][149], [FAIL][150], [FAIL][151], [FAIL][152], [FAIL][153], [FAIL][154], [FAIL][155], [FAIL][156], [FAIL][157], [FAIL][158], [FAIL][159]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#2505] / [i915#3002] / [i915#3363] / [i915#602]) [133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl4/igt@runner@aborted.html [134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl4/igt@runner@aborted.html [135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl2/igt@runner@aborted.html [136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl4/igt@runner@aborted.html [137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl4/igt@runner@aborted.html [138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl4/igt@runner@aborted.html [139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl2/igt@runner@aborted.html [140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl1/igt@runner@aborted.html [141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl1/igt@runner@aborted.html [142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl1/igt@runner@aborted.html [143]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl1/igt@runner@aborted.html [144]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl1/igt@runner@aborted.html [145]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl1/igt@runner@aborted.html [146]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl1/igt@runner@aborted.html [147]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shard-kbl1/igt@runner@aborted.html [148]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10188/shar == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20306/index.html [-- Attachment #1.2: Type: text/html, Size: 33947 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH 17/17] drm/i915: Add the missing adls vswing tables @ 2021-04-21 16:48 Ville Syrjala 2021-05-04 10:16 ` [Intel-gfx] [PATCH v2 " Ville Syrjala 0 siblings, 1 reply; 39+ messages in thread From: Ville Syrjala @ 2021-04-21 16:48 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> adls is supposed to use special buf trans tables. Add what's missing. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 122 +++++++++++++++++- 1 file changed, 121 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index c5b7ce7464bc..7acb24a55738 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -999,6 +999,82 @@ static const struct intel_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr2_h .num_entries = ARRAY_SIZE(_rkl_combo_phy_ddi_translations_dp_hbr2_hbr3), }; +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_dp_rbr_hbr[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x32, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x71, 0x2F, 0x00, 0x10 } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7D, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x4C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x73, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x2F, 0x00, 0x10 } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x6C, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_dp_rbr_hbr = { + .entries = _adls_combo_phy_ddi_translations_dp_rbr_hbr, + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_dp_rbr_hbr), +}; + +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x63, 0x30, 0x00, 0x0F } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x47, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x63, 0x37, 0x00, 0x08 } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x31, 0x00, 0x0E } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x61, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7B, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_dp_hbr2_hbr3 = { + .entries = _adls_combo_phy_ddi_translations_dp_hbr2_hbr3, + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_dp_hbr2_hbr3), +}; + +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_edp_hbr2[] = { + /* NT mV Trans mV db */ + { .cnl = { 0x9, 0x70, 0x3C, 0x00, 0x03 } }, /* 200 200 0.0 */ + { .cnl = { 0x9, 0x6D, 0x3A, 0x00, 0x05 } }, /* 200 250 1.9 */ + { .cnl = { 0x9, 0x7F, 0x36, 0x00, 0x09 } }, /* 200 300 3.5 */ + { .cnl = { 0x4, 0x59, 0x32, 0x00, 0x0D } }, /* 200 350 4.9 */ + { .cnl = { 0x2, 0x77, 0x3A, 0x00, 0x05 } }, /* 250 250 0.0 */ + { .cnl = { 0x2, 0x7F, 0x38, 0x00, 0x07 } }, /* 250 300 1.6 */ + { .cnl = { 0x4, 0x5A, 0x36, 0x00, 0x09 } }, /* 250 350 2.9 */ + { .cnl = { 0x4, 0x5E, 0x3D, 0x00, 0x04 } }, /* 300 300 0.0 */ + { .cnl = { 0x4, 0x65, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ + { .cnl = { 0x4, 0x6F, 0x3A, 0x00, 0x05 } }, /* 350 350 0.0 */ +}; + +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_edp_hbr2 = { + .entries = _adls_combo_phy_ddi_translations_edp_hbr2, + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_edp_hbr2), +}; + +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_edp_hbr3[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x5E, 0x34, 0x00, 0x0B } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x69, 0x32, 0x00, 0x0D } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x74, 0x31, 0x00, 0x0E } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2E, 0x00, 0x11 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x5C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x7F, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x33, 0x00, 0x0C } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x7F, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x3C, 0x00, 0x03 } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_edp_hbr3 = { + .entries = _adls_combo_phy_ddi_translations_edp_hbr3, + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_edp_hbr3), +}; + bool is_hobl_buf_trans(const struct intel_ddi_buf_trans *table) { return table == &tgl_combo_phy_ddi_translations_edp_hbr2_hobl; @@ -1520,6 +1596,48 @@ rkl_get_combo_buf_trans(struct intel_encoder *encoder, return rkl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } +static const struct intel_ddi_buf_trans * +adls_get_combo_buf_trans_dp(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) +{ + if (crtc_state->port_clock > 270000) + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_dp_hbr2_hbr3, n_entries); + else + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr, n_entries); +} + +static const struct intel_ddi_buf_trans * +adls_get_combo_buf_trans_edp(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + + if (crtc_state->port_clock > 540000) + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_edp_hbr3, n_entries); + else if (i915->vbt.edp.hobl && !intel_dp->hobl_failed) + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, n_entries); + else if (i915->vbt.edp.low_vswing) + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_edp_hbr2, n_entries); + else + return adls_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); +} + +static const struct intel_ddi_buf_trans * +adls_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 intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) + return adls_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); + else + return adls_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); +} + static const struct intel_ddi_buf_trans * tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, @@ -1570,7 +1688,9 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) struct drm_i915_private *i915 = to_i915(encoder->base.dev); enum phy phy = intel_port_to_phy(i915, encoder->port); - if (IS_ROCKETLAKE(i915)) { + if (IS_ALDERLAKE_S(i915)) { + encoder->get_buf_trans = adls_get_combo_buf_trans; + } else if (IS_ROCKETLAKE(i915)) { encoder->get_buf_trans = rkl_get_combo_buf_trans; } else if (IS_DG1(i915)) { encoder->get_buf_trans = dg1_get_combo_buf_trans; -- 2.26.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
* [Intel-gfx] [PATCH v2 17/17] drm/i915: Add the missing adls vswing tables 2021-04-21 16:48 [Intel-gfx] [PATCH 17/17] drm/i915: Add the missing adls vswing tables Ville Syrjala @ 2021-05-04 10:16 ` Ville Syrjala 0 siblings, 0 replies; 39+ messages in thread From: Ville Syrjala @ 2021-05-04 10:16 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> adls is supposed to use special buf trans tables. Add what's missing. v2: Drop the RBR/HBR table since it's the same as for tgl Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- .../drm/i915/display/intel_ddi_buf_trans.c | 103 +++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c index d38bf04cf23c..189a93b8277e 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c @@ -999,6 +999,63 @@ static const struct intel_ddi_buf_trans rkl_combo_phy_ddi_translations_dp_hbr2_h .num_entries = ARRAY_SIZE(_rkl_combo_phy_ddi_translations_dp_hbr2_hbr3), }; +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_dp_hbr2_hbr3[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x35, 0x3F, 0x00, 0x00 } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x4F, 0x37, 0x00, 0x08 } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x63, 0x30, 0x00, 0x0F } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2B, 0x00, 0x14 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x47, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x63, 0x37, 0x00, 0x08 } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x31, 0x00, 0x0E } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x61, 0x3C, 0x00, 0x03 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7B, 0x35, 0x00, 0x0A } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_dp_hbr2_hbr3 = { + .entries = _adls_combo_phy_ddi_translations_dp_hbr2_hbr3, + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_dp_hbr2_hbr3), +}; + +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_edp_hbr2[] = { + /* NT mV Trans mV db */ + { .cnl = { 0x9, 0x70, 0x3C, 0x00, 0x03 } }, /* 200 200 0.0 */ + { .cnl = { 0x9, 0x6D, 0x3A, 0x00, 0x05 } }, /* 200 250 1.9 */ + { .cnl = { 0x9, 0x7F, 0x36, 0x00, 0x09 } }, /* 200 300 3.5 */ + { .cnl = { 0x4, 0x59, 0x32, 0x00, 0x0D } }, /* 200 350 4.9 */ + { .cnl = { 0x2, 0x77, 0x3A, 0x00, 0x05 } }, /* 250 250 0.0 */ + { .cnl = { 0x2, 0x7F, 0x38, 0x00, 0x07 } }, /* 250 300 1.6 */ + { .cnl = { 0x4, 0x5A, 0x36, 0x00, 0x09 } }, /* 250 350 2.9 */ + { .cnl = { 0x4, 0x5E, 0x3D, 0x00, 0x04 } }, /* 300 300 0.0 */ + { .cnl = { 0x4, 0x65, 0x38, 0x00, 0x07 } }, /* 300 350 1.3 */ + { .cnl = { 0x4, 0x6F, 0x3A, 0x00, 0x05 } }, /* 350 350 0.0 */ +}; + +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_edp_hbr2 = { + .entries = _adls_combo_phy_ddi_translations_edp_hbr2, + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_edp_hbr2), +}; + +static const union intel_ddi_buf_trans_entry _adls_combo_phy_ddi_translations_edp_hbr3[] = { + /* NT mV Trans mV db */ + { .cnl = { 0xA, 0x5E, 0x34, 0x00, 0x0B } }, /* 350 350 0.0 */ + { .cnl = { 0xA, 0x69, 0x32, 0x00, 0x0D } }, /* 350 500 3.1 */ + { .cnl = { 0xC, 0x74, 0x31, 0x00, 0x0E } }, /* 350 700 6.0 */ + { .cnl = { 0x6, 0x7F, 0x2E, 0x00, 0x11 } }, /* 350 900 8.2 */ + { .cnl = { 0xA, 0x5C, 0x3F, 0x00, 0x00 } }, /* 500 500 0.0 */ + { .cnl = { 0xC, 0x7F, 0x34, 0x00, 0x0B } }, /* 500 700 2.9 */ + { .cnl = { 0x6, 0x7F, 0x33, 0x00, 0x0C } }, /* 500 900 5.1 */ + { .cnl = { 0xC, 0x7F, 0x3F, 0x00, 0x00 } }, /* 650 700 0.6 */ + { .cnl = { 0x6, 0x7F, 0x3C, 0x00, 0x03 } }, /* 600 900 3.5 */ + { .cnl = { 0x6, 0x7F, 0x3F, 0x00, 0x00 } }, /* 900 900 0.0 */ +}; + +static const struct intel_ddi_buf_trans adls_combo_phy_ddi_translations_edp_hbr3 = { + .entries = _adls_combo_phy_ddi_translations_edp_hbr3, + .num_entries = ARRAY_SIZE(_adls_combo_phy_ddi_translations_edp_hbr3), +}; + bool is_hobl_buf_trans(const struct intel_ddi_buf_trans *table) { return table == &tgl_combo_phy_ddi_translations_edp_hbr2_hobl; @@ -1524,6 +1581,48 @@ rkl_get_combo_buf_trans(struct intel_encoder *encoder, return rkl_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); } +static const struct intel_ddi_buf_trans * +adls_get_combo_buf_trans_dp(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) +{ + if (crtc_state->port_clock > 270000) + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_dp_hbr2_hbr3, n_entries); + else + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_dp_hbr, n_entries); +} + +static const struct intel_ddi_buf_trans * +adls_get_combo_buf_trans_edp(struct intel_encoder *encoder, + const struct intel_crtc_state *crtc_state, + int *n_entries) +{ + struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_dp *intel_dp = enc_to_intel_dp(encoder); + + if (crtc_state->port_clock > 540000) + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_edp_hbr3, n_entries); + else if (i915->vbt.edp.hobl && !intel_dp->hobl_failed) + return intel_get_buf_trans(&tgl_combo_phy_ddi_translations_edp_hbr2_hobl, n_entries); + else if (i915->vbt.edp.low_vswing) + return intel_get_buf_trans(&adls_combo_phy_ddi_translations_edp_hbr2, n_entries); + else + return adls_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); +} + +static const struct intel_ddi_buf_trans * +adls_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 intel_get_buf_trans(&icl_combo_phy_ddi_translations_hdmi, n_entries); + else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) + return adls_get_combo_buf_trans_edp(encoder, crtc_state, n_entries); + else + return adls_get_combo_buf_trans_dp(encoder, crtc_state, n_entries); +} + static const struct intel_ddi_buf_trans * tgl_get_dkl_buf_trans_dp(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, @@ -1574,7 +1673,9 @@ void intel_ddi_buf_trans_init(struct intel_encoder *encoder) struct drm_i915_private *i915 = to_i915(encoder->base.dev); enum phy phy = intel_port_to_phy(i915, encoder->port); - if (IS_ROCKETLAKE(i915)) { + if (IS_ALDERLAKE_S(i915)) { + encoder->get_buf_trans = adls_get_combo_buf_trans; + } else if (IS_ROCKETLAKE(i915)) { encoder->get_buf_trans = rkl_get_combo_buf_trans; } else if (IS_DG1(i915)) { encoder->get_buf_trans = dg1_get_combo_buf_trans; -- 2.26.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 39+ messages in thread
end of thread, other threads:[~2021-06-24 17:05 UTC | newest] Thread overview: 39+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-06-08 7:35 [Intel-gfx] [PATCH v2 00/17] drm/i915: DDI buf trans cleaup and fixes Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 01/17] drm/i915: s/intel/hsw/ for hsw/bdw/skl buf trans Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 02/17] drm/i915: Introduce hsw_get_buf_trans() Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 03/17] drm/i915: Wrap the platform specific buf trans structs into a union Ville Syrjala 2021-06-18 12:04 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 04/17] drm/i915: Rename dkl phy buf trans tables Ville Syrjala 2021-06-18 12:04 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 05/17] drm/i915: Wrap the buf trans tables into a struct Ville Syrjala 2021-06-18 12:05 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 06/17] drm/i915: Introduce intel_get_buf_trans() Ville Syrjala 2021-06-18 12:08 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 07/17] drm/i915; Return the whole buf_trans struct from get_buf_trans() Ville Syrjala 2021-06-18 12:11 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 08/17] drm/i915: Store the HDMI default entry in the bug trans struct Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 09/17] drm/i915: Introduce encoder->get_buf_trans() Ville Syrjala 2021-06-18 12:19 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 10/17] drm/i915: Clean up hsw/bdw/skl/kbl buf trans funcs Ville Syrjala 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 11/17] drm/i915: Introduce rkl_get_combo_buf_trans() Ville Syrjala 2021-06-18 12:22 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 12/17] drm/i915: Fix dg1 buf trans tables Ville Syrjala 2021-06-18 12:28 ` Jani Nikula 2021-06-08 7:35 ` [Intel-gfx] [PATCH v2 13/17] drm/i915: Deduplicate icl DP HBR2 vs. eDP HBR3 table Ville Syrjala 2021-06-18 12:30 ` Jani Nikula 2021-06-23 12:55 ` Ville Syrjälä 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 14/17] drm/i915: Fix ehl edp hbr2 vswing table Ville Syrjala 2021-06-23 14:02 ` Jani Nikula 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 15/17] drm/i915: Clean up jsl/ehl buf trans functions Ville Syrjala 2021-06-23 14:13 ` Jani Nikula 2021-06-24 17:05 ` Ville Syrjälä 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 16/17] drm/i915: Nuke buf_trans hdmi functions Ville Syrjala 2021-06-23 14:14 ` Jani Nikula 2021-06-08 7:36 ` [Intel-gfx] [PATCH v2 17/17] drm/i915: Add the missing adls vswing tables Ville Syrjala 2021-06-23 14:36 ` Jani Nikula 2021-06-08 8:46 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: DDI buf trans cleaup and fixes (rev4) Patchwork 2021-06-08 8:47 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-06-08 9:15 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-06-08 9:15 ` [Intel-gfx] ✗ Fi.CI.BUILD: warning " Patchwork 2021-06-08 13:33 ` [Intel-gfx] ✓ Fi.CI.IGT: success " Patchwork -- strict thread matches above, loose matches on Subject: below -- 2021-04-21 16:48 [Intel-gfx] [PATCH 17/17] drm/i915: Add the missing adls vswing tables Ville Syrjala 2021-05-04 10:16 ` [Intel-gfx] [PATCH v2 " Ville Syrjala
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox