On Tue, Jun 04, 2024 at 06:26:18PM +0300, Jani Nikula wrote:
> Avoid the implicit dev_priv local variable use, and pass dev_priv
> explicitly to the TRANS_DDI_FUNC_CTL2 register macro.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/icl_dsi.c | 6 ++++--
> drivers/gpu/drm/i915/display/intel_ddi.c | 9 ++++++---
> drivers/gpu/drm/i915/display/intel_display_irq.c | 3 ++-
> drivers/gpu/drm/i915/i915_reg.h | 2 +-
> 4 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
> index acc80d439352..ae8f6617aa70 100644
> --- a/drivers/gpu/drm/i915/display/icl_dsi.c
> +++ b/drivers/gpu/drm/i915/display/icl_dsi.c
> @@ -784,7 +784,8 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,
> if (intel_dsi->dual_link) {
> for_each_dsi_port(port, intel_dsi->ports) {
> dsi_trans = dsi_port_to_transcoder(port);
> - intel_de_rmw(dev_priv, TRANS_DDI_FUNC_CTL2(dsi_trans),
> + intel_de_rmw(dev_priv,
> + TRANS_DDI_FUNC_CTL2(dev_priv, dsi_trans),
> 0, PORT_SYNC_MODE_ENABLE);
> }
>
> @@ -1344,7 +1345,8 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)
> if (intel_dsi->dual_link) {
> for_each_dsi_port(port, intel_dsi->ports) {
> dsi_trans = dsi_port_to_transcoder(port);
> - intel_de_rmw(dev_priv, TRANS_DDI_FUNC_CTL2(dsi_trans),
> + intel_de_rmw(dev_priv,
> + TRANS_DDI_FUNC_CTL2(dev_priv, dsi_trans),
> PORT_SYNC_MODE_ENABLE, 0);
> }
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
> index c5571be3c66e..515996c49f5a 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -603,7 +603,8 @@ void intel_ddi_enable_transcoder_func(struct intel_encoder *encoder,
> }
>
> intel_de_write(dev_priv,
> - TRANS_DDI_FUNC_CTL2(cpu_transcoder), ctl2);
> + TRANS_DDI_FUNC_CTL2(dev_priv, cpu_transcoder),
> + ctl2);
> }
>
> intel_de_write(dev_priv, TRANS_DDI_FUNC_CTL(dev_priv, cpu_transcoder),
> @@ -640,7 +641,8 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state
>
> if (DISPLAY_VER(dev_priv) >= 11)
> intel_de_write(dev_priv,
> - TRANS_DDI_FUNC_CTL2(cpu_transcoder), 0);
> + TRANS_DDI_FUNC_CTL2(dev_priv, cpu_transcoder),
> + 0);
>
> ctl = intel_de_read(dev_priv,
> TRANS_DDI_FUNC_CTL(dev_priv, cpu_transcoder));
> @@ -3757,7 +3759,8 @@ static enum transcoder bdw_transcoder_master_readout(struct drm_i915_private *de
> u32 master_select;
>
> if (DISPLAY_VER(dev_priv) >= 11) {
> - u32 ctl2 = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL2(cpu_transcoder));
> + u32 ctl2 = intel_de_read(dev_priv,
> + TRANS_DDI_FUNC_CTL2(dev_priv, cpu_transcoder));
>
> if ((ctl2 & PORT_SYNC_MODE_ENABLE) == 0)
> return INVALID_TRANSCODER;
> diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
> index 036f77c2702d..bf55c9064b76 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
> @@ -913,7 +913,8 @@ static void gen11_dsi_te_interrupt_handler(struct drm_i915_private *dev_priv,
> * Incase of dual link, TE comes from DSI_1
> * this is to check if dual link is enabled
> */
> - val = intel_uncore_read(&dev_priv->uncore, TRANS_DDI_FUNC_CTL2(TRANSCODER_DSI_0));
> + val = intel_uncore_read(&dev_priv->uncore,
> + TRANS_DDI_FUNC_CTL2(dev_priv, TRANSCODER_DSI_0));
> val &= PORT_SYNC_MODE_ENABLE;
>
> /*
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 14f4060dd573..f330953e71cf 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -4009,7 +4009,7 @@ enum skl_power_gate {
> #define _TRANS_DDI_FUNC_CTL2_EDP 0x6f404
> #define _TRANS_DDI_FUNC_CTL2_DSI0 0x6b404
> #define _TRANS_DDI_FUNC_CTL2_DSI1 0x6bc04
> -#define TRANS_DDI_FUNC_CTL2(tran) _MMIO_TRANS2(dev_priv, tran, _TRANS_DDI_FUNC_CTL2_A)
> +#define TRANS_DDI_FUNC_CTL2(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _TRANS_DDI_FUNC_CTL2_A)
> #define PORT_SYNC_MODE_ENABLE REG_BIT(4)
> #define PORT_SYNC_MODE_MASTER_SELECT_MASK REG_GENMASK(2, 0)
> #define PORT_SYNC_MODE_MASTER_SELECT(x) REG_FIELD_PREP(PORT_SYNC_MODE_MASTER_SELECT_MASK, (x))
> --
> 2.39.2
>
