Quoting Lucas De Marchi (2023-10-18 19:28:31-03:00)
>As done with the hw readout, properly abstract the C10/C20 phy details
>inside intel_cx0_phy.c.
>
>Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
Reviewed-by: Gustavo Sousa <gustavo.sousa@xxxxxxxxx>
>---
> drivers/gpu/drm/i915/display/intel_cx0_phy.c | 20 ++++++++++++++++----
> drivers/gpu/drm/i915/display/intel_cx0_phy.h | 6 ++----
> drivers/gpu/drm/i915/display/intel_ddi.c | 7 +------
> drivers/gpu/drm/i915/display/intel_dpll.c | 7 +------
> 4 files changed, 20 insertions(+), 20 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.c b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
>index 252492ec6111..8ffa52464516 100644
>--- a/drivers/gpu/drm/i915/display/intel_cx0_phy.c
>+++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.c
>@@ -2378,8 +2378,8 @@ static void intel_c20_pll_program(struct drm_i915_private *i915,
> BIT(0), cntx ? 0 : 1, MB_WRITE_COMMITTED);
> }
>
>-int intel_c10pll_calc_port_clock(struct intel_encoder *encoder,
>- const struct intel_c10pll_state *pll_state)
>+static int intel_c10pll_calc_port_clock(struct intel_encoder *encoder,
>+ const struct intel_c10pll_state *pll_state)
> {
> unsigned int frac_quot = 0, frac_rem = 0, frac_den = 1;
> unsigned int multiplier, tx_clk_div, hdmi_div, refclk = 38400;
>@@ -2405,8 +2405,8 @@ int intel_c10pll_calc_port_clock(struct intel_encoder *encoder,
> return tmpclk;
> }
>
>-int intel_c20pll_calc_port_clock(struct intel_encoder *encoder,
>- const struct intel_c20pll_state *pll_state)
>+static int intel_c20pll_calc_port_clock(struct intel_encoder *encoder,
>+ const struct intel_c20pll_state *pll_state)
> {
> unsigned int frac, frac_en, frac_quot, frac_rem, frac_den;
> unsigned int multiplier, refclk = 38400;
>@@ -3065,3 +3065,15 @@ void intel_cx0pll_readout_hw_state(struct intel_encoder *encoder,
> else
> intel_c20pll_readout_hw_state(encoder, &pll_state->c20);
> }
>+
>+int intel_cx0pll_calc_port_clock(struct intel_encoder *encoder,
>+ const struct intel_cx0pll_state *pll_state)
>+{
>+ struct drm_i915_private *i915 = to_i915(encoder->base.dev);
>+ enum phy phy = intel_port_to_phy(i915, encoder->port);
>+
>+ if (intel_is_c10phy(i915, phy))
>+ return intel_c10pll_calc_port_clock(encoder, &pll_state->c10);
>+
>+ return intel_c20pll_calc_port_clock(encoder, &pll_state->c20);
>+}
>diff --git a/drivers/gpu/drm/i915/display/intel_cx0_phy.h b/drivers/gpu/drm/i915/display/intel_cx0_phy.h
>index ff7ccb7855aa..222aed16e739 100644
>--- a/drivers/gpu/drm/i915/display/intel_cx0_phy.h
>+++ b/drivers/gpu/drm/i915/display/intel_cx0_phy.h
>@@ -33,17 +33,15 @@ intel_mtl_port_pll_type(struct intel_encoder *encoder,
> int intel_cx0pll_calc_state(struct intel_crtc_state *crtc_state, struct intel_encoder *encoder);
> void intel_cx0pll_readout_hw_state(struct intel_encoder *encoder,
> struct intel_cx0pll_state *pll_state);
>+int intel_cx0pll_calc_port_clock(struct intel_encoder *encoder,
>+ const struct intel_cx0pll_state *pll_state);
>
> void intel_c10pll_dump_hw_state(struct drm_i915_private *dev_priv,
> const struct intel_c10pll_state *hw_state);
>-int intel_c10pll_calc_port_clock(struct intel_encoder *encoder,
>- const struct intel_c10pll_state *pll_state);
> void intel_c10pll_state_verify(struct intel_atomic_state *state,
> struct intel_crtc *crtc);
> void intel_c20pll_dump_hw_state(struct drm_i915_private *i915,
> const struct intel_c20pll_state *hw_state);
>-int intel_c20pll_calc_port_clock(struct intel_encoder *encoder,
>- const struct intel_c20pll_state *pll_state);
> void intel_cx0_phy_set_signal_levels(struct intel_encoder *encoder,
> const struct intel_crtc_state *crtc_state);
> int intel_cx0_phy_check_hdmi_link_rate(struct intel_hdmi *hdmi, int clock);
>diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
>index 80a8ab7874db..c4dc1f71da4b 100644
>--- a/drivers/gpu/drm/i915/display/intel_ddi.c
>+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
>@@ -3854,18 +3854,13 @@ void intel_ddi_get_clock(struct intel_encoder *encoder,
> static void mtl_ddi_get_config(struct intel_encoder *encoder,
> struct intel_crtc_state *crtc_state)
> {
>- struct drm_i915_private *i915 = to_i915(encoder->base.dev);
>- enum phy phy = intel_port_to_phy(i915, encoder->port);
> struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
>
> if (intel_tc_port_in_tbt_alt_mode(dig_port)) {
> crtc_state->port_clock = intel_mtl_tbt_calc_port_clock(encoder);
>- } else if (intel_is_c10phy(i915, phy)) {
>- intel_cx0pll_readout_hw_state(encoder, &crtc_state->cx0pll_state);
>- crtc_state->port_clock = intel_c10pll_calc_port_clock(encoder, &crtc_state->cx0pll_state.c10);
> } else {
> intel_cx0pll_readout_hw_state(encoder, &crtc_state->cx0pll_state);
>- crtc_state->port_clock = intel_c20pll_calc_port_clock(encoder, &crtc_state->cx0pll_state.c20);
>+ crtc_state->port_clock = intel_cx0pll_calc_port_clock(encoder, &crtc_state->cx0pll_state);
> }
>
> intel_ddi_get_config(encoder, crtc_state);
>diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c b/drivers/gpu/drm/i915/display/intel_dpll.c
>index d41c1dc9f66c..509b862f9e60 100644
>--- a/drivers/gpu/drm/i915/display/intel_dpll.c
>+++ b/drivers/gpu/drm/i915/display/intel_dpll.c
>@@ -1003,12 +1003,10 @@ static int dg2_crtc_compute_clock(struct intel_atomic_state *state,
> static int mtl_crtc_compute_clock(struct intel_atomic_state *state,
> struct intel_crtc *crtc)
> {
>- struct drm_i915_private *i915 = to_i915(state->base.dev);
> struct intel_crtc_state *crtc_state =
> intel_atomic_get_new_crtc_state(state, crtc);
> struct intel_encoder *encoder =
> intel_get_crtc_new_encoder(state, crtc_state);
>- enum phy phy = intel_port_to_phy(i915, encoder->port);
> int ret;
>
> ret = intel_cx0pll_calc_state(crtc_state, encoder);
>@@ -1016,10 +1014,7 @@ static int mtl_crtc_compute_clock(struct intel_atomic_state *state,
> return ret;
>
> /* TODO: Do the readback via intel_compute_shared_dplls() */
>- if (intel_is_c10phy(i915, phy))
>- crtc_state->port_clock = intel_c10pll_calc_port_clock(encoder, &crtc_state->cx0pll_state.c10);
>- else
>- crtc_state->port_clock = intel_c20pll_calc_port_clock(encoder, &crtc_state->cx0pll_state.c20);
>+ crtc_state->port_clock = intel_cx0pll_calc_port_clock(encoder, &crtc_state->cx0pll_state);
>
> crtc_state->hw.adjusted_mode.crtc_clock = intel_crtc_dotclock(crtc_state);
>
>--
>2.40.1
>
