From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 07/14] drm/i915/dpio: s/port/ch/
Date: Mon, 22 Apr 2024 12:59:37 +0300 [thread overview]
Message-ID: <874jbtvhti.fsf@intel.com> (raw)
In-Reply-To: <20240422083457.23815-8-ville.syrjala@linux.intel.com>
On Mon, 22 Apr 2024, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Stop calling the DPIO PHY channel "port". Just say "ch", which
> is already used in a bunch of places.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dpio_phy.c | 44 +++++++--------
> drivers/gpu/drm/i915/display/intel_dpll.c | 54 +++++++++----------
> 2 files changed, 49 insertions(+), 49 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dpio_phy.c b/drivers/gpu/drm/i915/display/intel_dpio_phy.c
> index 6cbee88e608f..e4a04c9b5b19 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpio_phy.c
> +++ b/drivers/gpu/drm/i915/display/intel_dpio_phy.c
> @@ -1069,23 +1069,23 @@ void vlv_set_phy_signal_level(struct intel_encoder *encoder,
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> - enum dpio_channel port = vlv_dig_port_to_channel(dig_port);
> + enum dpio_channel ch = vlv_dig_port_to_channel(dig_port);
> enum dpio_phy phy = vlv_pipe_to_phy(crtc->pipe);
>
> vlv_dpio_get(dev_priv);
>
> - vlv_dpio_write(dev_priv, phy, VLV_TX_DW5(port), 0x00000000);
> - vlv_dpio_write(dev_priv, phy, VLV_TX_DW4(port), demph_reg_value);
> - vlv_dpio_write(dev_priv, phy, VLV_TX_DW2(port),
> + vlv_dpio_write(dev_priv, phy, VLV_TX_DW5(ch), 0x00000000);
> + vlv_dpio_write(dev_priv, phy, VLV_TX_DW4(ch), demph_reg_value);
> + vlv_dpio_write(dev_priv, phy, VLV_TX_DW2(ch),
> uniqtranscale_reg_value);
> - vlv_dpio_write(dev_priv, phy, VLV_TX_DW3(port), 0x0C782040);
> + vlv_dpio_write(dev_priv, phy, VLV_TX_DW3(ch), 0x0C782040);
>
> if (tx3_demph)
> - vlv_dpio_write(dev_priv, phy, VLV_TX3_DW4(port), tx3_demph);
> + vlv_dpio_write(dev_priv, phy, VLV_TX3_DW4(ch), tx3_demph);
>
> - vlv_dpio_write(dev_priv, phy, VLV_PCS_DW11(port), 0x00030000);
> - vlv_dpio_write(dev_priv, phy, VLV_PCS_DW9(port), preemph_reg_value);
> - vlv_dpio_write(dev_priv, phy, VLV_TX_DW5(port), DPIO_TX_OCALINIT_EN);
> + vlv_dpio_write(dev_priv, phy, VLV_PCS_DW11(ch), 0x00030000);
> + vlv_dpio_write(dev_priv, phy, VLV_PCS_DW9(ch), preemph_reg_value);
> + vlv_dpio_write(dev_priv, phy, VLV_TX_DW5(ch), DPIO_TX_OCALINIT_EN);
>
> vlv_dpio_put(dev_priv);
> }
> @@ -1096,25 +1096,25 @@ void vlv_phy_pre_pll_enable(struct intel_encoder *encoder,
> struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> - enum dpio_channel port = vlv_dig_port_to_channel(dig_port);
> + enum dpio_channel ch = vlv_dig_port_to_channel(dig_port);
> enum dpio_phy phy = vlv_pipe_to_phy(crtc->pipe);
>
> /* Program Tx lane resets to default */
> vlv_dpio_get(dev_priv);
>
> - vlv_dpio_write(dev_priv, phy, VLV_PCS_DW0(port),
> + vlv_dpio_write(dev_priv, phy, VLV_PCS_DW0(ch),
> DPIO_PCS_TX_LANE2_RESET |
> DPIO_PCS_TX_LANE1_RESET);
> - vlv_dpio_write(dev_priv, phy, VLV_PCS_DW1(port),
> + vlv_dpio_write(dev_priv, phy, VLV_PCS_DW1(ch),
> DPIO_PCS_CLK_CRI_RXEB_EIOS_EN |
> DPIO_PCS_CLK_CRI_RXDIGFILTSG_EN |
> (1<<DPIO_PCS_CLK_DATAWIDTH_SHIFT) |
> DPIO_PCS_CLK_SOFT_RESET);
>
> /* Fix up inter-pair skew failure */
> - vlv_dpio_write(dev_priv, phy, VLV_PCS_DW12(port), 0x00750f00);
> - vlv_dpio_write(dev_priv, phy, VLV_TX_DW11(port), 0x00001500);
> - vlv_dpio_write(dev_priv, phy, VLV_TX_DW14(port), 0x40400000);
> + vlv_dpio_write(dev_priv, phy, VLV_PCS_DW12(ch), 0x00750f00);
> + vlv_dpio_write(dev_priv, phy, VLV_TX_DW11(ch), 0x00001500);
> + vlv_dpio_write(dev_priv, phy, VLV_TX_DW14(ch), 0x40400000);
>
> vlv_dpio_put(dev_priv);
> }
> @@ -1126,7 +1126,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder,
> struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> - enum dpio_channel port = vlv_dig_port_to_channel(dig_port);
> + enum dpio_channel ch = vlv_dig_port_to_channel(dig_port);
> enum pipe pipe = crtc->pipe;
> enum dpio_phy phy = vlv_pipe_to_phy(pipe);
> u32 val;
> @@ -1140,11 +1140,11 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder,
> else
> val &= ~(1<<21);
> val |= 0x001000c4;
> - vlv_dpio_write(dev_priv, phy, VLV_PCS_DW8(port), val);
> + vlv_dpio_write(dev_priv, phy, VLV_PCS_DW8(ch), val);
>
> /* Program lane clock */
> - vlv_dpio_write(dev_priv, phy, VLV_PCS_DW14(port), 0x00760018);
> - vlv_dpio_write(dev_priv, phy, VLV_PCS_DW23(port), 0x00400888);
> + vlv_dpio_write(dev_priv, phy, VLV_PCS_DW14(ch), 0x00760018);
> + vlv_dpio_write(dev_priv, phy, VLV_PCS_DW23(ch), 0x00400888);
>
> vlv_dpio_put(dev_priv);
> }
> @@ -1155,11 +1155,11 @@ void vlv_phy_reset_lanes(struct intel_encoder *encoder,
> struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
> - enum dpio_channel port = vlv_dig_port_to_channel(dig_port);
> + enum dpio_channel ch = vlv_dig_port_to_channel(dig_port);
> enum dpio_phy phy = vlv_pipe_to_phy(crtc->pipe);
>
> vlv_dpio_get(dev_priv);
> - vlv_dpio_write(dev_priv, phy, VLV_PCS_DW0(port), 0x00000000);
> - vlv_dpio_write(dev_priv, phy, VLV_PCS_DW1(port), 0x00e00060);
> + vlv_dpio_write(dev_priv, phy, VLV_PCS_DW0(ch), 0x00000000);
> + vlv_dpio_write(dev_priv, phy, VLV_PCS_DW1(ch), 0x00e00060);
> vlv_dpio_put(dev_priv);
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_dpll.c b/drivers/gpu/drm/i915/display/intel_dpll.c
> index 0a738b491c40..743cc466ee39 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpll.c
> +++ b/drivers/gpu/drm/i915/display/intel_dpll.c
> @@ -539,7 +539,7 @@ void chv_crtc_clock_get(struct intel_crtc_state *crtc_state)
> {
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> - enum dpio_channel port = vlv_pipe_to_channel(crtc->pipe);
> + enum dpio_channel ch = vlv_pipe_to_channel(crtc->pipe);
> enum dpio_phy phy = vlv_pipe_to_phy(crtc->pipe);
> const struct i9xx_dpll_hw_state *hw_state = &crtc_state->dpll_hw_state.i9xx;
> struct dpll clock;
> @@ -551,11 +551,11 @@ void chv_crtc_clock_get(struct intel_crtc_state *crtc_state)
> return;
>
> vlv_dpio_get(dev_priv);
> - cmn_dw13 = vlv_dpio_read(dev_priv, phy, CHV_CMN_DW13(port));
> - pll_dw0 = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW0(port));
> - pll_dw1 = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW1(port));
> - pll_dw2 = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW2(port));
> - pll_dw3 = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW3(port));
> + cmn_dw13 = vlv_dpio_read(dev_priv, phy, CHV_CMN_DW13(ch));
> + pll_dw0 = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW0(ch));
> + pll_dw1 = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW1(ch));
> + pll_dw2 = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW2(ch));
> + pll_dw3 = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW3(ch));
> vlv_dpio_put(dev_priv);
>
> clock.m1 = (pll_dw1 & 0x7) == DPIO_CHV_M1_DIV_BY_2 ? 2 : 0;
> @@ -2027,7 +2027,7 @@ static void chv_prepare_pll(const struct intel_crtc_state *crtc_state)
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> const struct dpll *clock = &crtc_state->dpll;
> enum pipe pipe = crtc->pipe;
> - enum dpio_channel port = vlv_pipe_to_channel(pipe);
> + enum dpio_channel ch = vlv_pipe_to_channel(pipe);
> enum dpio_phy phy = vlv_pipe_to_phy(crtc->pipe);
> u32 tmp, loopfilter, tribuf_calcntr;
> u32 m2_frac;
> @@ -2038,41 +2038,41 @@ static void chv_prepare_pll(const struct intel_crtc_state *crtc_state)
> vlv_dpio_get(dev_priv);
>
> /* p1 and p2 divider */
> - vlv_dpio_write(dev_priv, phy, CHV_CMN_DW13(port),
> + vlv_dpio_write(dev_priv, phy, CHV_CMN_DW13(ch),
> 5 << DPIO_CHV_S1_DIV_SHIFT |
> clock->p1 << DPIO_CHV_P1_DIV_SHIFT |
> clock->p2 << DPIO_CHV_P2_DIV_SHIFT |
> 1 << DPIO_CHV_K_DIV_SHIFT);
>
> /* Feedback post-divider - m2 */
> - vlv_dpio_write(dev_priv, phy, CHV_PLL_DW0(port),
> + vlv_dpio_write(dev_priv, phy, CHV_PLL_DW0(ch),
> clock->m2 >> 22);
>
> /* Feedback refclk divider - n and m1 */
> - vlv_dpio_write(dev_priv, phy, CHV_PLL_DW1(port),
> + vlv_dpio_write(dev_priv, phy, CHV_PLL_DW1(ch),
> DPIO_CHV_M1_DIV_BY_2 |
> 1 << DPIO_CHV_N_DIV_SHIFT);
>
> /* M2 fraction division */
> - vlv_dpio_write(dev_priv, phy, CHV_PLL_DW2(port),
> + vlv_dpio_write(dev_priv, phy, CHV_PLL_DW2(ch),
> m2_frac);
>
> /* M2 fraction division enable */
> - tmp = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW3(port));
> + tmp = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW3(ch));
> tmp &= ~(DPIO_CHV_FEEDFWD_GAIN_MASK | DPIO_CHV_FRAC_DIV_EN);
> tmp |= (2 << DPIO_CHV_FEEDFWD_GAIN_SHIFT);
> if (m2_frac)
> tmp |= DPIO_CHV_FRAC_DIV_EN;
> - vlv_dpio_write(dev_priv, phy, CHV_PLL_DW3(port), tmp);
> + vlv_dpio_write(dev_priv, phy, CHV_PLL_DW3(ch), tmp);
>
> /* Program digital lock detect threshold */
> - tmp = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW9(port));
> + tmp = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW9(ch));
> tmp &= ~(DPIO_CHV_INT_LOCK_THRESHOLD_MASK |
> DPIO_CHV_INT_LOCK_THRESHOLD_SEL_COARSE);
> tmp |= (0x5 << DPIO_CHV_INT_LOCK_THRESHOLD_SHIFT);
> if (!m2_frac)
> tmp |= DPIO_CHV_INT_LOCK_THRESHOLD_SEL_COARSE;
> - vlv_dpio_write(dev_priv, phy, CHV_PLL_DW9(port), tmp);
> + vlv_dpio_write(dev_priv, phy, CHV_PLL_DW9(ch), tmp);
>
> /* Loop filter */
> if (clock->vco == 5400000) {
> @@ -2097,17 +2097,17 @@ static void chv_prepare_pll(const struct intel_crtc_state *crtc_state)
> loopfilter |= (0x3 << DPIO_CHV_GAIN_CTRL_SHIFT);
> tribuf_calcntr = 0;
> }
> - vlv_dpio_write(dev_priv, phy, CHV_PLL_DW6(port), loopfilter);
> + vlv_dpio_write(dev_priv, phy, CHV_PLL_DW6(ch), loopfilter);
>
> - tmp = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW8(port));
> + tmp = vlv_dpio_read(dev_priv, phy, CHV_PLL_DW8(ch));
> tmp &= ~DPIO_CHV_TDC_TARGET_CNT_MASK;
> tmp |= (tribuf_calcntr << DPIO_CHV_TDC_TARGET_CNT_SHIFT);
> - vlv_dpio_write(dev_priv, phy, CHV_PLL_DW8(port), tmp);
> + vlv_dpio_write(dev_priv, phy, CHV_PLL_DW8(ch), tmp);
>
> /* AFC Recal */
> - vlv_dpio_write(dev_priv, phy, CHV_CMN_DW14(port),
> - vlv_dpio_read(dev_priv, phy, CHV_CMN_DW14(port)) |
> - DPIO_AFC_RECAL);
> + vlv_dpio_write(dev_priv, phy, CHV_CMN_DW14(ch),
> + vlv_dpio_read(dev_priv, phy, CHV_CMN_DW14(ch)) |
> + DPIO_AFC_RECAL);
>
> vlv_dpio_put(dev_priv);
> }
> @@ -2118,16 +2118,16 @@ static void _chv_enable_pll(const struct intel_crtc_state *crtc_state)
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> const struct i9xx_dpll_hw_state *hw_state = &crtc_state->dpll_hw_state.i9xx;
> enum pipe pipe = crtc->pipe;
> - enum dpio_channel port = vlv_pipe_to_channel(pipe);
> + enum dpio_channel ch = vlv_pipe_to_channel(pipe);
> enum dpio_phy phy = vlv_pipe_to_phy(crtc->pipe);
> u32 tmp;
>
> vlv_dpio_get(dev_priv);
>
> /* Enable back the 10bit clock to display controller */
> - tmp = vlv_dpio_read(dev_priv, phy, CHV_CMN_DW14(port));
> + tmp = vlv_dpio_read(dev_priv, phy, CHV_CMN_DW14(ch));
> tmp |= DPIO_DCLKP_EN;
> - vlv_dpio_write(dev_priv, phy, CHV_CMN_DW14(port), tmp);
> + vlv_dpio_write(dev_priv, phy, CHV_CMN_DW14(ch), tmp);
>
> vlv_dpio_put(dev_priv);
>
> @@ -2246,7 +2246,7 @@ void vlv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)
>
> void chv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)
> {
> - enum dpio_channel port = vlv_pipe_to_channel(pipe);
> + enum dpio_channel ch = vlv_pipe_to_channel(pipe);
> enum dpio_phy phy = vlv_pipe_to_phy(pipe);
> u32 val;
>
> @@ -2264,9 +2264,9 @@ void chv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)
> vlv_dpio_get(dev_priv);
>
> /* Disable 10bit clock to display controller */
> - val = vlv_dpio_read(dev_priv, phy, CHV_CMN_DW14(port));
> + val = vlv_dpio_read(dev_priv, phy, CHV_CMN_DW14(ch));
> val &= ~DPIO_DCLKP_EN;
> - vlv_dpio_write(dev_priv, phy, CHV_CMN_DW14(port), val);
> + vlv_dpio_write(dev_priv, phy, CHV_CMN_DW14(ch), val);
>
> vlv_dpio_put(dev_priv);
> }
--
Jani Nikula, Intel
next prev parent reply other threads:[~2024-04-22 9:59 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-22 8:34 [PATCH 00/14] drm/i915: VLV/CHV DPIO register cleanup Ville Syrjala
2024-04-22 8:34 ` [PATCH 01/14] drm/i915/dpio: Remove pointless VLV_PCS01_DW8 read Ville Syrjala
2024-04-22 8:58 ` Jani Nikula
2024-04-22 8:34 ` [PATCH 02/14] drm/i915/dpio: s/VLV_REF_DW13/VLV_REF_DW11/ Ville Syrjala
2024-04-22 9:01 ` Jani Nikula
2024-04-22 8:34 ` [PATCH 03/14] drm/i915/dpio: s/VLV_PLL_DW9_BCAST/VLV_PCS_DW17_BCAST/ Ville Syrjala
2024-04-22 9:02 ` Jani Nikula
2024-04-22 8:34 ` [PATCH 04/14] drm/i915/dpio: Fix VLV DPIO PLL register dword numbering Ville Syrjala
2024-04-22 9:41 ` Jani Nikula
2024-04-22 8:34 ` [PATCH 05/14] drm/i915/dpio: Remove pointless variables from vlv/chv DPLL code Ville Syrjala
2024-04-22 9:54 ` Jani Nikula
2024-04-22 8:34 ` [PATCH 06/14] drm/i915/dpio: Rename some variables Ville Syrjala
2024-04-22 9:56 ` Jani Nikula
2024-04-22 8:34 ` [PATCH 07/14] drm/i915/dpio: s/port/ch/ Ville Syrjala
2024-04-22 9:59 ` Jani Nikula [this message]
2024-04-22 8:34 ` [PATCH 08/14] drm/i915/dpio: s/pipe/ch/ Ville Syrjala
2024-04-22 10:02 ` Jani Nikula
2024-04-22 8:34 ` [PATCH 09/14] drm/i915/dpio: Derive the phy from the port rather than pipe in encoder hooks Ville Syrjala
2024-04-22 10:10 ` Jani Nikula
2024-04-23 8:46 ` Ville Syrjälä
2024-04-23 9:20 ` Jani Nikula
2024-04-22 8:34 ` [PATCH 10/14] drm/i915/dpio: Give VLV DPIO group register a clearer name Ville Syrjala
2024-04-22 10:12 ` Jani Nikula
2024-04-22 8:34 ` [PATCH 11/14] drm/i915/dpio: Rename a few CHV DPIO PHY registers Ville Syrjala
2024-04-22 10:16 ` Jani Nikula
2024-04-22 8:34 ` [PATCH 12/14] drm/i915/dpio: Clean up VLV/CHV DPIO PHY register defines Ville Syrjala
2024-04-23 9:18 ` Jani Nikula
2024-04-22 8:34 ` [PATCH 13/14] drm/i915/dpio: Clean up the vlv/chv PHY register bits Ville Syrjala
2024-04-22 12:46 ` Jani Nikula
2024-04-23 7:58 ` Ville Syrjälä
2024-04-22 8:34 ` [PATCH 14/14] drm/i915/dpio: Extract vlv_dpio_phy_regs.h Ville Syrjala
2024-04-22 12:50 ` Jani Nikula
2024-04-22 10:01 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: VLV/CHV DPIO register cleanup Patchwork
2024-04-22 10:08 ` ✓ Fi.CI.BAT: success " Patchwork
2024-04-26 10:19 ` Jani Nikula
2024-04-30 11:43 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: VLV/CHV DPIO register cleanup (rev2) Patchwork
2024-04-30 11:43 ` ✗ Fi.CI.SPARSE: " Patchwork
2024-04-30 11:49 ` ✓ Fi.CI.BAT: success " Patchwork
2024-04-30 15:31 ` ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=874jbtvhti.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.