On Fri, 7 Jun 2024 18:25:38 +0300
Jani Nikula <jani.nikula@xxxxxxxxx> wrote:
> Do not rely on having dev_priv local variable, pass it to the macro.
>
> Cc: Zhenyu Wang <zhenyuw@xxxxxxxxxxxxxxx>
> Cc: Zhi Wang <zhi.wang.linux@xxxxxxxxx>
> Cc: intel-gvt-dev@xxxxxxxxxxxxxxxxxxxxx
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> 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@xxxxxxxxxx>
