On Tue, Jun 04, 2024 at 06:26:22PM +0300, Jani Nikula wrote:
> Avoid the implicit dev_priv local variable use, and pass dev_priv
> explicitly to the TRANS_SET_CONTEXT_LATENCY register macro.
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 6 ++++--
> drivers/gpu/drm/i915/i915_reg.h | 2 +-
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 62f8300c73a5..c608329dac42 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -2703,7 +2703,8 @@ static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_sta
> * TRANS_SET_CONTEXT_LATENCY to configure the pipe vblank start.
> */
> if (DISPLAY_VER(dev_priv) >= 13) {
> - intel_de_write(dev_priv, TRANS_SET_CONTEXT_LATENCY(cpu_transcoder),
> + intel_de_write(dev_priv,
> + TRANS_SET_CONTEXT_LATENCY(dev_priv, cpu_transcoder),
> crtc_vblank_start - crtc_vdisplay);
>
> /*
> @@ -2860,7 +2861,8 @@ static void intel_get_transcoder_timings(struct intel_crtc *crtc,
> if (DISPLAY_VER(dev_priv) >= 13 && !transcoder_is_dsi(cpu_transcoder))
> adjusted_mode->crtc_vblank_start =
> adjusted_mode->crtc_vdisplay +
> - intel_de_read(dev_priv, TRANS_SET_CONTEXT_LATENCY(cpu_transcoder));
> + intel_de_read(dev_priv,
> + TRANS_SET_CONTEXT_LATENCY(dev_priv, cpu_transcoder));
> }
>
> static void intel_bigjoiner_adjust_pipe_src(struct intel_crtc_state *crtc_state)
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 3fcebccb9f3c..8a1414ae72cb 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -4236,7 +4236,7 @@ enum skl_power_gate {
> #define _TRANS_B_SET_CONTEXT_LATENCY 0x6107C
> #define _TRANS_C_SET_CONTEXT_LATENCY 0x6207C
> #define _TRANS_D_SET_CONTEXT_LATENCY 0x6307C
> -#define TRANS_SET_CONTEXT_LATENCY(tran) _MMIO_TRANS2(dev_priv, tran, _TRANS_A_SET_CONTEXT_LATENCY)
> +#define TRANS_SET_CONTEXT_LATENCY(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _TRANS_A_SET_CONTEXT_LATENCY)
> #define TRANS_SET_CONTEXT_LATENCY_MASK REG_GENMASK(15, 0)
> #define TRANS_SET_CONTEXT_LATENCY_VALUE(x) REG_FIELD_PREP(TRANS_SET_CONTEXT_LATENCY_MASK, (x))
>
> --
> 2.39.2
>
