| Message ID | 20200929233449.32323-7-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Plumb crtc state to link training code | expand |
On Wed, Sep 30, 2020 at 02:34:44AM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Make the mess inside the buf trans funcs a bit more manageable by > splitting along the lines of output type. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 31 ++++++++++++++++++------ > 1 file changed, 23 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 4c3416d89f30..e3c6d4942b68 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -1079,19 +1079,34 @@ icl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate, > } > > static const struct icl_mg_phy_ddi_buf_trans * > -icl_get_mg_buf_trans(struct intel_encoder *encoder, int type, int rate, > - int *n_entries) > +icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, int type, int rate, > + int *n_entries) > { > - if (type == INTEL_OUTPUT_HDMI) { > - *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hdmi); > - return icl_mg_phy_ddi_translations_hdmi; > - } else if (rate > 270000) { > + *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hdmi); > + return icl_mg_phy_ddi_translations_hdmi; > +} > + > +static const struct icl_mg_phy_ddi_buf_trans * > +icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, int type, int rate, > + int *n_entries) > +{ > + if (rate > 270000) { > *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hbr2_hbr3); > return icl_mg_phy_ddi_translations_hbr2_hbr3; > + } else { > + *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_rbr_hbr); > + return icl_mg_phy_ddi_translations_rbr_hbr; > } > +} > > - *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_rbr_hbr); > - return icl_mg_phy_ddi_translations_rbr_hbr; > +static const struct icl_mg_phy_ddi_buf_trans * > +icl_get_mg_buf_trans(struct intel_encoder *encoder, int type, int rate, > + int *n_entries) > +{ > + if (type == INTEL_OUTPUT_HDMI) > + return icl_get_mg_buf_trans_hdmi(encoder, type, rate, n_entries); > + else > + return icl_get_mg_buf_trans_dp(encoder, type, rate, n_entries); > } > > static const struct cnl_ddi_buf_trans * > -- > 2.26.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 4c3416d89f30..e3c6d4942b68 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -1079,19 +1079,34 @@ icl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate, } static const struct icl_mg_phy_ddi_buf_trans * -icl_get_mg_buf_trans(struct intel_encoder *encoder, int type, int rate, - int *n_entries) +icl_get_mg_buf_trans_hdmi(struct intel_encoder *encoder, int type, int rate, + int *n_entries) { - if (type == INTEL_OUTPUT_HDMI) { - *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hdmi); - return icl_mg_phy_ddi_translations_hdmi; - } else if (rate > 270000) { + *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hdmi); + return icl_mg_phy_ddi_translations_hdmi; +} + +static const struct icl_mg_phy_ddi_buf_trans * +icl_get_mg_buf_trans_dp(struct intel_encoder *encoder, int type, int rate, + int *n_entries) +{ + if (rate > 270000) { *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hbr2_hbr3); return icl_mg_phy_ddi_translations_hbr2_hbr3; + } else { + *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_rbr_hbr); + return icl_mg_phy_ddi_translations_rbr_hbr; } +} - *n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_rbr_hbr); - return icl_mg_phy_ddi_translations_rbr_hbr; +static const struct icl_mg_phy_ddi_buf_trans * +icl_get_mg_buf_trans(struct intel_encoder *encoder, int type, int rate, + int *n_entries) +{ + if (type == INTEL_OUTPUT_HDMI) + return icl_get_mg_buf_trans_hdmi(encoder, type, rate, n_entries); + else + return icl_get_mg_buf_trans_dp(encoder, type, rate, n_entries); } static const struct cnl_ddi_buf_trans *