[PATCH v2 4/6] drm/i915/gvt: do not use implict dev_priv in DSPSURF_TO_PIPE()

[Zhi Wang]

On Fri,  7 Jun 2024 18:25:38 +0300
Jani Nikula <jani.nikula at intel.com> wrote:

> Do not rely on having dev_priv local variable, pass it to the macro.
> 
> Cc: Zhenyu Wang <zhenyuw at linux.intel.com>
> Cc: Zhi Wang <zhi.wang.linux at gmail.com>
> Cc: intel-gvt-dev at lists.freedesktop.org
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>  drivers/gpu/drm/i915/gvt/handlers.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gvt/handlers.c
> b/drivers/gpu/drm/i915/gvt/handlers.c index
> f79dd6cfc75b..0f09344d3c20 100644 ---
> a/drivers/gpu/drm/i915/gvt/handlers.c +++
> b/drivers/gpu/drm/i915/gvt/handlers.c @@ -1009,14 +1009,14 @@ static
> int south_chicken2_mmio_write(struct intel_vgpu *vgpu, return 0;
>  }
>  
> -#define DSPSURF_TO_PIPE(offset) \
> +#define DSPSURF_TO_PIPE(dev_priv, offset) \
>  	calc_index(offset, DSPSURF(dev_priv, PIPE_A),
> DSPSURF(dev_priv, PIPE_B), DSPSURF(dev_priv, PIPE_C)) 
>  static int pri_surf_mmio_write(struct intel_vgpu *vgpu, unsigned int
> offset, void *p_data, unsigned int bytes)
>  {
>  	struct drm_i915_private *dev_priv = vgpu->gvt->gt->i915;
> -	u32 pipe = DSPSURF_TO_PIPE(offset);
> +	u32 pipe = DSPSURF_TO_PIPE(dev_priv, offset);
>  	int event = SKL_FLIP_EVENT(pipe, PLANE_PRIMARY);
>  
>  	write_vreg(vgpu, offset, p_data, bytes);

Reviewed-by: Zhi Wang <zhiwang at kernel.org>