Skip to content

Commit

Permalink
drm/i915: Clean up jsl/ehl buf trans functions
Browse files Browse the repository at this point in the history 
The jsl/ehl buf trans functions are needlessly conplicated.
Simplify them.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
  • Loading branch information
@vsyrjala @intel-lab-lkp
vsyrjala authored and intel-lab-lkp committed Apr 21, 2021
1 parent 1e2dd63 commit 58af8cd
Showing 1 changed file with 20 additions and 67 deletions.
87 changes: 20 additions & 67 deletions drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1338,106 +1338,59 @@ 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 *
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 *
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 *
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 *
Expand Down

0 comments on commit 58af8cd

Please sign in to comment.