Commit 340b515c authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Relocate intel_crtc_dotclock() 



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.

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220907091057.11572-2-ville.syrjala@linux.intel.com
parent 78c67d5f

drivers/gpu/drm/i915/display/intel_ddi.c

+0 −22
Original line number Diff line number Diff line
@@ -324,28 +324,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 */

drivers/gpu/drm/i915/display/intel_display.c

+22 −0
Original line number Diff line number Diff line
@@ -4494,6 +4494,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)