On Mon, Sep 27, 2021 at 09:24:52PM +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Since intel_ddi_level() now looks that buf_trans table there's
> no point in having intel_ddi_hdmi_num_entries() around. Just
> roll the necessary bits of locic into
> intel_ddi_hdmi_level()/intel_ddi_level().
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c | 17 +++++-----------
> .../drm/i915/display/intel_ddi_buf_trans.c | 20 -------------------
> .../drm/i915/display/intel_ddi_buf_trans.h | 4 ----
> 3 files changed, 5 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 0fd67d2487ad..05124bf4abac 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -74,20 +74,13 @@ static const u8 index_to_dp_signal_levels[] = {
> };
>
> static int intel_ddi_hdmi_level(struct intel_encoder *encoder,
> - const struct intel_crtc_state *crtc_state)
> + const struct intel_ddi_buf_trans *trans)
> {
> - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> - int n_entries, level, default_entry;
> + int level;
>
> - n_entries = intel_ddi_hdmi_num_entries(encoder, crtc_state, &default_entry);
> - if (n_entries == 0)
> - return 0;
> level = intel_bios_hdmi_level_shift(encoder);
> if (level < 0)
> - level = default_entry;
> -
> - if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries))
> - level = n_entries - 1;
> + level = trans->hdmi_default_entry;
>
> return level;
> }
> @@ -132,7 +125,7 @@ static void hsw_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder,
> const struct intel_crtc_state *crtc_state)
> {
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> - int level = intel_ddi_hdmi_level(encoder, crtc_state);
> + int level = intel_ddi_level(encoder, crtc_state);
> u32 iboost_bit = 0;
> int n_entries;
> enum port port = encoder->port;
> @@ -1356,7 +1349,7 @@ int intel_ddi_level(struct intel_encoder *encoder,
> return 0;
>
> if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
> - level = intel_ddi_hdmi_level(encoder, crtc_state);
> + level = intel_ddi_hdmi_level(encoder, trans);
> else
> level = intel_ddi_dp_level(enc_to_intel_dp(encoder));
>
> 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 449daba7afb3..a2d39131ea53 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
> @@ -1617,26 +1617,6 @@ dg2_get_snps_buf_trans(struct intel_encoder *encoder,
> return intel_get_buf_trans(&dg2_snps_trans, n_entries);
> }
>
> -int intel_ddi_hdmi_num_entries(struct intel_encoder *encoder,
> - const struct intel_crtc_state *crtc_state,
> - int *default_entry)
> -{
> - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> - const struct intel_ddi_buf_trans *trans;
> - int n_entries;
> -
> - trans = encoder->get_buf_trans(encoder, crtc_state, &n_entries);
> -
> - if (drm_WARN_ON(&dev_priv->drm, !trans)) {
> - *default_entry = 0;
> - return 0;
> - }
> -
> - *default_entry = trans->hdmi_default_entry;
> -
> - return n_entries;
> -}
> -
> void intel_ddi_buf_trans_init(struct intel_encoder *encoder)
> {
> struct drm_i915_private *i915 = to_i915(encoder->base.dev);
> 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 94d338287f61..6cdb8e9073c7 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h
> +++ b/drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h
> @@ -68,10 +68,6 @@ struct intel_ddi_buf_trans {
>
> 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);
> -
> void intel_ddi_buf_trans_init(struct intel_encoder *encoder);
>
> #endif
> --
> 2.32.0
>
