On Wed, May 08, 2024 at 06:47:55PM +0300, Jani Nikula wrote:
> Avoid the implicit dev_priv local variable use, and pass dev_priv
> explicitly to the TRANS_PUSH register macro.
Reviewed-by: Rodrigo Vivi
>
> Signed-off-by: Jani Nikula
> ---
> drivers/gpu/drm/i915/display/intel_vrr.c | 9 +
> drivers/gpu/drm/i915/i915_reg.h | 2 +-
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c
> b/drivers/gpu/drm/i915/display/intel_vrr.c
> index e7709b06b92c..5031b7ac8007 100644
> --- a/drivers/gpu/drm/i915/display/intel_vrr.c
> +++ b/drivers/gpu/drm/i915/display/intel_vrr.c
> @@ -237,7 +237,7 @@ void intel_vrr_send_push(const struct intel_crtc_state
> *crtc_state)
> if (!crtc_state->vrr.enable)
> return;
>
> - intel_de_write(dev_priv, TRANS_PUSH(cpu_transcoder),
> + intel_de_write(dev_priv, TRANS_PUSH(dev_priv, cpu_transcoder),
> TRANS_PUSH_EN | TRANS_PUSH_SEND);
> }
>
> @@ -250,7 +250,7 @@ bool intel_vrr_is_push_sent(const struct intel_crtc_state
> *crtc_state)
> if (!crtc_state->vrr.enable)
> return false;
>
> - return intel_de_read(dev_priv, TRANS_PUSH(cpu_transcoder)) &
> TRANS_PUSH_SEND;
> + return intel_de_read(dev_priv, TRANS_PUSH(dev_priv, cpu_transcoder)) &
> TRANS_PUSH_SEND;
> }
>
> void intel_vrr_enable(const struct intel_crtc_state *crtc_state)
> @@ -261,7 +261,8 @@ void intel_vrr_enable(const struct intel_crtc_state
> *crtc_state)
> if (!crtc_state->vrr.enable)
> return;
>
> - intel_de_write(dev_priv, TRANS_PUSH(cpu_transcoder), TRANS_PUSH_EN);
> + intel_de_write(dev_priv, TRANS_PUSH(dev_priv, cpu_transcoder),
> +TRANS_PUSH_EN);
>
> if (HAS_AS_SDP(dev_priv))
> intel_de_write(dev_priv, TRANS_VRR_VSYNC(cpu_transcoder),
> @@ -286,7 +287,7 @@ void intel_vrr_disable(const struct intel_crtc_state
> *old_crtc_state)
> intel_de_wait_for_clear(dev_priv,
> TRANS_VRR_STATUS(dev_priv, cpu_transcoder),
> VRR_STATUS_VRR_EN_LIVE, 1000);
> - intel_de_write(dev_priv, TRANS_PUSH(cpu_transcoder), 0);
> + intel_de_write(dev_priv, TRANS_PUSH(dev_priv, cpu_transcoder), 0);
>
> if (HAS_AS_SDP(dev_priv))
> intel_de_write(dev_priv, TRANS_VRR_VSYNC(cpu_transcoder), 0);
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 18c8ef911579..9d443365b85a 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -1317,7 +1317,7 @@
> #define _TRANS_PUSH_B0x61A70
> #define _TRANS_PUSH_C0x62A70
> #define _TRANS_PUSH_D0x63A70
> -#define TRANS_PUSH(trans)_MMIO_TRANS2(dev_priv, trans,
> _TRANS_PUSH_A)
> +#define TRANS_PUSH(dev_priv, trans) _MMIO_TRANS2(dev_priv, trans,
> _TRANS_PUSH_A)
> #define TRANS_PUSH_EN REG_BIT(31)
> #define TRANS_PUSH_SENDREG_BIT(30)
>
> --
> 2.39.2
>
