leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/display: Remove port and phy from voltage swing functions

Browse Source 
This information can be get directly from intel_encoder so no need
of those parameters.

Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200708205512.21625-2-jose.souza@intel.com
This commit is contained in:
José Roberto de Souza
2020-07-08 13:55:09 -07:00
parent a8143150fa
commit f0e86e0520
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/gpu/drm/i915/display/intel_ddi.c
View File

@@ -815,8 +815,7 @@ static int skl_buf_trans_num_entries(enum port port, int n_entries)
} }
static const struct ddi_buf_trans * static const struct ddi_buf_trans *
intel_ddi_get_buf_trans_dp(struct intel_encoder *encoder, intel_ddi_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries)
enum port port, int *n_entries)
{ {
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
@@ -825,12 +824,12 @@ intel_ddi_get_buf_trans_dp(struct intel_encoder *encoder,
IS_COMETLAKE(dev_priv)) { IS_COMETLAKE(dev_priv)) {
const struct ddi_buf_trans *ddi_translations = const struct ddi_buf_trans *ddi_translations =
kbl_get_buf_trans_dp(encoder, n_entries); kbl_get_buf_trans_dp(encoder, n_entries);
*n_entries = skl_buf_trans_num_entries(port, *n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries);
return ddi_translations; return ddi_translations;
} else if (IS_SKYLAKE(dev_priv)) { } else if (IS_SKYLAKE(dev_priv)) {
const struct ddi_buf_trans *ddi_translations = const struct ddi_buf_trans *ddi_translations =
skl_get_buf_trans_dp(encoder, n_entries); skl_get_buf_trans_dp(encoder, n_entries);
*n_entries = skl_buf_trans_num_entries(port, *n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries);
return ddi_translations; return ddi_translations;
} else if (IS_BROADWELL(dev_priv)) { } else if (IS_BROADWELL(dev_priv)) {
*n_entries = ARRAY_SIZE(bdw_ddi_translations_dp); *n_entries = ARRAY_SIZE(bdw_ddi_translations_dp);
@@ -845,15 +844,14 @@ intel_ddi_get_buf_trans_dp(struct intel_encoder *encoder,
} }
static const struct ddi_buf_trans * static const struct ddi_buf_trans *
intel_ddi_get_buf_trans_edp(struct intel_encoder *encoder, intel_ddi_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries)
enum port port, int *n_entries)
{ {
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
if (IS_GEN9_BC(dev_priv)) { if (IS_GEN9_BC(dev_priv)) {
const struct ddi_buf_trans *ddi_translations = const struct ddi_buf_trans *ddi_translations =
skl_get_buf_trans_edp(encoder, n_entries); skl_get_buf_trans_edp(encoder, n_entries);
*n_entries = skl_buf_trans_num_entries(port, *n_entries); *n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries);
return ddi_translations; return ddi_translations;
} else if (IS_BROADWELL(dev_priv)) { } else if (IS_BROADWELL(dev_priv)) {
return bdw_get_buf_trans_edp(encoder, n_entries); return bdw_get_buf_trans_edp(encoder, n_entries);
@@ -1152,10 +1150,10 @@ static void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder,
ddi_translations = intel_ddi_get_buf_trans_fdi(dev_priv, ddi_translations = intel_ddi_get_buf_trans_fdi(dev_priv,
&n_entries); &n_entries);
else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP)) else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP))
ddi_translations = intel_ddi_get_buf_trans_edp(encoder, port, ddi_translations = intel_ddi_get_buf_trans_edp(encoder,
&n_entries); &n_entries);
else else
ddi_translations = intel_ddi_get_buf_trans_dp(encoder, port, ddi_translations = intel_ddi_get_buf_trans_dp(encoder,
&n_entries); &n_entries);
/* If we're boosting the current, set bit 31 of trans1 */ /* If we're boosting the current, set bit 31 of trans1 */
@@ -2106,7 +2104,6 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder,
{ {
struct intel_digital_port *dig_port = enc_to_dig_port(encoder); struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
enum port port = encoder->port;
u8 iboost; u8 iboost;
if (type == INTEL_OUTPUT_HDMI) if (type == INTEL_OUTPUT_HDMI)
@@ -2122,11 +2119,9 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder,
ddi_translations = intel_ddi_get_buf_trans_hdmi(encoder, &n_entries); ddi_translations = intel_ddi_get_buf_trans_hdmi(encoder, &n_entries);
else if (type == INTEL_OUTPUT_EDP) else if (type == INTEL_OUTPUT_EDP)
ddi_translations = intel_ddi_get_buf_trans_edp(encoder, ddi_translations = intel_ddi_get_buf_trans_edp(encoder,
port,
&n_entries); &n_entries);
else else
ddi_translations = intel_ddi_get_buf_trans_dp(encoder, ddi_translations = intel_ddi_get_buf_trans_dp(encoder,
port,
&n_entries); &n_entries);
if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations)) if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations))
@@ -2143,9 +2138,9 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder,
return; return;
} }
_skl_ddi_set_iboost(dev_priv, port, iboost); _skl_ddi_set_iboost(dev_priv, encoder->port, iboost);
if (port == PORT_A && dig_port->max_lanes == 4) if (encoder->port == PORT_A && dig_port->max_lanes == 4)
_skl_ddi_set_iboost(dev_priv, PORT_E, iboost); _skl_ddi_set_iboost(dev_priv, PORT_E, iboost);
} }
@@ -2213,9 +2208,9 @@ static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp)
bxt_get_buf_trans_dp(encoder, &n_entries); bxt_get_buf_trans_dp(encoder, &n_entries);
} else { } else {
if (encoder->type == INTEL_OUTPUT_EDP) if (encoder->type == INTEL_OUTPUT_EDP)
intel_ddi_get_buf_trans_edp(encoder, port, &n_entries); intel_ddi_get_buf_trans_edp(encoder, &n_entries);
else else
intel_ddi_get_buf_trans_dp(encoder, port, &n_entries); intel_ddi_get_buf_trans_dp(encoder, &n_entries);
} }
if (drm_WARN_ON(&dev_priv->drm, n_entries < 1)) if (drm_WARN_ON(&dev_priv->drm, n_entries < 1))
@@ -2370,10 +2365,10 @@ static void cnl_ddi_vswing_sequence(struct intel_encoder *encoder,
} }
static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder, static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder,
u32 level, enum phy phy, int type, u32 level, int type, int rate)
int rate)
{ {
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
const struct cnl_ddi_buf_trans *ddi_translations = NULL; const struct cnl_ddi_buf_trans *ddi_translations = NULL;
u32 n_entries, val; u32 n_entries, val;
int ln; int ln;
@@ -2497,7 +2492,7 @@ static void icl_combo_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
intel_de_write(dev_priv, ICL_PORT_TX_DW5_GRP(phy), val); intel_de_write(dev_priv, ICL_PORT_TX_DW5_GRP(phy), val);
/* 5. Program swing and de-emphasis */ /* 5. Program swing and de-emphasis */
icl_ddi_combo_vswing_program(encoder, level, phy, type, rate); icl_ddi_combo_vswing_program(encoder, level, type, rate);
/* 6. Set training enable to trigger update */ /* 6. Set training enable to trigger update */
val = intel_de_read(dev_priv, ICL_PORT_TX_DW5_LN0(phy)); val = intel_de_read(dev_priv, ICL_PORT_TX_DW5_LN0(phy));