On Fri, 17 Jun 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> intel_crtc_dotclock() is a bit misplaced. In lieu of a better
> place let's just move it next to its friends in intel_display.c.
With hopes we'll find a better place than intel_display.c for this and
its friends in the future,
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_ddi.c | 22 --------------------
> drivers/gpu/drm/i915/display/intel_display.c | 22 ++++++++++++++++++++
> 2 files changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 272e1bf6006b..51bf26dcb209 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -323,28 +323,6 @@ static int icl_calc_tbt_pll_link(struct drm_i915_private *dev_priv,
> }
> }
>
> -int intel_crtc_dotclock(const struct intel_crtc_state *pipe_config)
> -{
> - int dotclock;
> -
> - if (intel_crtc_has_dp_encoder(pipe_config))
> - dotclock = intel_dotclock_calculate(pipe_config->port_clock,
> - &pipe_config->dp_m_n);
> - else if (pipe_config->has_hdmi_sink && pipe_config->pipe_bpp > 24)
> - dotclock = pipe_config->port_clock * 24 / pipe_config->pipe_bpp;
> - else
> - dotclock = pipe_config->port_clock;
> -
> - if (pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> - !intel_crtc_has_dp_encoder(pipe_config))
> - dotclock *= 2;
> -
> - if (pipe_config->pixel_multiplier)
> - dotclock /= pipe_config->pixel_multiplier;
> -
> - return dotclock;
> -}
> -
> static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)
> {
> /* CRT dotclock is determined via other means */
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 90bd26431e31..b24784c4522d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -4569,6 +4569,28 @@ int intel_dotclock_calculate(int link_freq,
> return div_u64(mul_u32_u32(m_n->link_m, link_freq), m_n->link_n);
> }
>
> +int intel_crtc_dotclock(const struct intel_crtc_state *pipe_config)
> +{
> + int dotclock;
> +
> + if (intel_crtc_has_dp_encoder(pipe_config))
> + dotclock = intel_dotclock_calculate(pipe_config->port_clock,
> + &pipe_config->dp_m_n);
> + else if (pipe_config->has_hdmi_sink && pipe_config->pipe_bpp > 24)
> + dotclock = pipe_config->port_clock * 24 / pipe_config->pipe_bpp;
> + else
> + dotclock = pipe_config->port_clock;
> +
> + if (pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
> + !intel_crtc_has_dp_encoder(pipe_config))
> + dotclock *= 2;
> +
> + if (pipe_config->pixel_multiplier)
> + dotclock /= pipe_config->pixel_multiplier;
> +
> + return dotclock;
> +}
> +
> /* Returns the currently programmed mode of the given encoder. */
> struct drm_display_mode *
> intel_encoder_current_mode(struct intel_encoder *encoder)
--
Jani Nikula, Intel Open Source Graphics Center
