On Wed, May 08, 2024 at 06:47:48PM +0300, Jani Nikula wrote: > Avoid the implicit dev_priv local variable use, and pass dev_priv > explicitly to the TRANS_VRR_VMAX register macro. > > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Rodrigo Vivi <[email protected]> > --- > drivers/gpu/drm/i915/display/intel_vrr.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_vrr.c > b/drivers/gpu/drm/i915/display/intel_vrr.c > index b1136aee775f..d9024ccf6098 100644 > --- a/drivers/gpu/drm/i915/display/intel_vrr.c > +++ b/drivers/gpu/drm/i915/display/intel_vrr.c > @@ -219,7 +219,8 @@ void intel_vrr_set_transcoder_timings(const struct > intel_crtc_state *crtc_state) > } > > intel_de_write(dev_priv, TRANS_VRR_VMIN(cpu_transcoder), > crtc_state->vrr.vmin - 1); > - intel_de_write(dev_priv, TRANS_VRR_VMAX(cpu_transcoder), > crtc_state->vrr.vmax - 1); > + intel_de_write(dev_priv, TRANS_VRR_VMAX(dev_priv, cpu_transcoder), > + crtc_state->vrr.vmax - 1); > intel_de_write(dev_priv, TRANS_VRR_CTL(dev_priv, cpu_transcoder), > trans_vrr_ctl(crtc_state)); > intel_de_write(dev_priv, TRANS_VRR_FLIPLINE(cpu_transcoder), > crtc_state->vrr.flipline - 1); > @@ -309,7 +310,8 @@ void intel_vrr_get_config(struct intel_crtc_state > *crtc_state) > > if (trans_vrr_ctl & VRR_CTL_FLIP_LINE_EN) { > crtc_state->vrr.flipline = intel_de_read(dev_priv, > TRANS_VRR_FLIPLINE(cpu_transcoder)) + 1; > - crtc_state->vrr.vmax = intel_de_read(dev_priv, > TRANS_VRR_VMAX(cpu_transcoder)) + 1; > + crtc_state->vrr.vmax = intel_de_read(dev_priv, > + TRANS_VRR_VMAX(dev_priv, > cpu_transcoder)) + 1; > crtc_state->vrr.vmin = intel_de_read(dev_priv, > TRANS_VRR_VMIN(cpu_transcoder)) + 1; > } > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index a178e9f6804c..693b4e562d46 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -1247,7 +1247,7 @@ > #define _TRANS_VRR_VMAX_B 0x61424 > #define _TRANS_VRR_VMAX_C 0x62424 > #define _TRANS_VRR_VMAX_D 0x63424 > -#define TRANS_VRR_VMAX(trans) _MMIO_TRANS2(dev_priv, trans, > _TRANS_VRR_VMAX_A) > +#define TRANS_VRR_VMAX(dev_priv, trans) _MMIO_TRANS2(dev_priv, > trans, _TRANS_VRR_VMAX_A) > #define VRR_VMAX_MASK REG_GENMASK(19, 0) > > #define _TRANS_VRR_VMIN_A 0x60434 > -- > 2.39.2 >
