[PATCH 29/65] drm/i915: pass dev_priv explicitly to PIPE_FRMCOUNT_G4X

[Rodrigo Vivi]

On Tue, Jun 04, 2024 at 06:25:47PM +0300, Jani Nikula wrote:
> Avoid the implicit dev_priv local variable use, and pass dev_priv
> explicitly to the PIPE_FRMCOUNT_G4X register macro.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_vblank.c | 2 +-
>  drivers/gpu/drm/i915/gvt/display.c          | 2 +-
>  drivers/gpu/drm/i915/i915_reg.h             | 2 +-
>  drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 8 ++++----
>  4 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_vblank.c b/drivers/gpu/drm/i915/display/intel_vblank.c
> index c6e68c0604b3..4f3b80cd1674 100644
> --- a/drivers/gpu/drm/i915/display/intel_vblank.c
> +++ b/drivers/gpu/drm/i915/display/intel_vblank.c
> @@ -125,7 +125,7 @@ u32 g4x_get_vblank_counter(struct drm_crtc *crtc)
>  	if (!vblank->max_vblank_count)
>  		return 0;
>  
> -	return intel_de_read(dev_priv, PIPE_FRMCOUNT_G4X(pipe));
> +	return intel_de_read(dev_priv, PIPE_FRMCOUNT_G4X(dev_priv, pipe));
>  }
>  
>  static u32 intel_crtc_scanlines_since_frame_timestamp(struct intel_crtc *crtc)
> diff --git a/drivers/gpu/drm/i915/gvt/display.c b/drivers/gpu/drm/i915/gvt/display.c
> index ad21b8f65d6b..3681dca165c6 100644
> --- a/drivers/gpu/drm/i915/gvt/display.c
> +++ b/drivers/gpu/drm/i915/gvt/display.c
> @@ -647,7 +647,7 @@ static void emulate_vblank_on_pipe(struct intel_vgpu *vgpu, int pipe)
>  	}
>  
>  	if (pipe_is_enabled(vgpu, pipe)) {
> -		vgpu_vreg_t(vgpu, PIPE_FRMCOUNT_G4X(pipe))++;
> +		vgpu_vreg_t(vgpu, PIPE_FRMCOUNT_G4X(dev_priv, pipe))++;
>  		intel_vgpu_trigger_virtual_event(vgpu, vblank_event[pipe]);
>  	}
>  }
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 05e0013813f8..d62da57afda7 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -2257,7 +2257,7 @@
>  /* GM45+ just has to be different */
>  #define _PIPEA_FRMCOUNT_G4X	0x70040
>  #define _PIPEA_FLIPCOUNT_G4X	0x70044
> -#define PIPE_FRMCOUNT_G4X(pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FRMCOUNT_G4X)
> +#define PIPE_FRMCOUNT_G4X(dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FRMCOUNT_G4X)
>  #define PIPE_FLIPCOUNT_G4X(pipe) _MMIO_PIPE2(dev_priv, pipe, _PIPEA_FLIPCOUNT_G4X)
>  
>  /* CHV pipe B blender */
> diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
> index 00ee588fab39..2e027f3ee750 100644
> --- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
> +++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
> @@ -142,10 +142,10 @@ static int iterate_generic_mmio(struct intel_gvt_mmio_table_iter *iter)
>  	MMIO_D(PIPE_FLIPCOUNT_G4X(PIPE_B));
>  	MMIO_D(PIPE_FLIPCOUNT_G4X(PIPE_C));
>  	MMIO_D(PIPE_FLIPCOUNT_G4X(_PIPE_EDP));
> -	MMIO_D(PIPE_FRMCOUNT_G4X(PIPE_A));
> -	MMIO_D(PIPE_FRMCOUNT_G4X(PIPE_B));
> -	MMIO_D(PIPE_FRMCOUNT_G4X(PIPE_C));
> -	MMIO_D(PIPE_FRMCOUNT_G4X(_PIPE_EDP));
> +	MMIO_D(PIPE_FRMCOUNT_G4X(dev_priv, PIPE_A));
> +	MMIO_D(PIPE_FRMCOUNT_G4X(dev_priv, PIPE_B));
> +	MMIO_D(PIPE_FRMCOUNT_G4X(dev_priv, PIPE_C));
> +	MMIO_D(PIPE_FRMCOUNT_G4X(dev_priv, _PIPE_EDP));
>  	MMIO_D(CURCNTR(dev_priv, PIPE_A));
>  	MMIO_D(CURCNTR(dev_priv, PIPE_B));
>  	MMIO_D(CURCNTR(dev_priv, PIPE_C));
> -- 
> 2.39.2
>