On Fri, 7 Jun 2024 18:25:35 +0300
Jani Nikula <jani.nikula@xxxxxxxxx> wrote:
Reviewed-by: Zhi Wang <zhiwang@xxxxxxxxxx>
> All callers of calc_index() pass 0 for the end parameter. Remove it.
>
> 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 | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gvt/handlers.c
> b/drivers/gpu/drm/i915/gvt/handlers.c index
> b3b5fdbee64f..a2e9d24d646e 100644 ---
> a/drivers/gpu/drm/i915/gvt/handlers.c +++
> b/drivers/gpu/drm/i915/gvt/handlers.c @@ -882,12 +882,11 @@ static
> int check_fdi_rx_train_status(struct intel_vgpu *vgpu, #define
> INVALID_INDEX (~0U)
> static unsigned int calc_index(unsigned int offset, unsigned int
> start,
> - unsigned int next, unsigned int end, i915_reg_t i915_end)
> + unsigned int next, i915_reg_t _end)
> {
> + u32 end = i915_mmio_reg_offset(_end);
> unsigned int range = next - start;
>
> - if (!end)
> - end = i915_mmio_reg_offset(i915_end);
> if (offset < start || offset > end)
> return INVALID_INDEX;
> offset -= start;
> @@ -895,13 +894,13 @@ static unsigned int calc_index(unsigned int
> offset, unsigned int start, }
>
> #define FDI_RX_CTL_TO_PIPE(offset) \
> - calc_index(offset, _FDI_RXA_CTL, _FDI_RXB_CTL, 0,
> FDI_RX_CTL(PIPE_C))
> + calc_index(offset, _FDI_RXA_CTL, _FDI_RXB_CTL,
> FDI_RX_CTL(PIPE_C))
> #define FDI_TX_CTL_TO_PIPE(offset) \
> - calc_index(offset, _FDI_TXA_CTL, _FDI_TXB_CTL, 0,
> FDI_TX_CTL(PIPE_C))
> + calc_index(offset, _FDI_TXA_CTL, _FDI_TXB_CTL,
> FDI_TX_CTL(PIPE_C))
> #define FDI_RX_IMR_TO_PIPE(offset) \
> - calc_index(offset, _FDI_RXA_IMR, _FDI_RXB_IMR, 0,
> FDI_RX_IMR(PIPE_C))
> + calc_index(offset, _FDI_RXA_IMR, _FDI_RXB_IMR,
> FDI_RX_IMR(PIPE_C))
> static int update_fdi_rx_iir_status(struct intel_vgpu *vgpu,
> unsigned int offset, void *p_data, unsigned int
> bytes) @@ -945,7 +944,7 @@ static int update_fdi_rx_iir_status(struct
> intel_vgpu *vgpu, }
>
> #define DP_TP_CTL_TO_PORT(offset) \
> - calc_index(offset, _DP_TP_CTL_A, _DP_TP_CTL_B, 0,
> DP_TP_CTL(PORT_E))
> + calc_index(offset, _DP_TP_CTL_A, _DP_TP_CTL_B,
> DP_TP_CTL(PORT_E))
> static int dp_tp_ctl_mmio_write(struct intel_vgpu *vgpu, unsigned
> int offset, void *p_data, unsigned int bytes)
> @@ -1009,7 +1008,7 @@ static int south_chicken2_mmio_write(struct
> intel_vgpu *vgpu, }
>
> #define DSPSURF_TO_PIPE(offset) \
> - calc_index(offset, _DSPASURF, _DSPBSURF, 0,
> DSPSURF(dev_priv, PIPE_C))
> + calc_index(offset, _DSPASURF, _DSPBSURF, DSPSURF(dev_priv,
> PIPE_C))
> static int pri_surf_mmio_write(struct intel_vgpu *vgpu, unsigned int
> offset, void *p_data, unsigned int bytes)
> @@ -1032,7 +1031,7 @@ static int pri_surf_mmio_write(struct
> intel_vgpu *vgpu, unsigned int offset, }
>
> #define SPRSURF_TO_PIPE(offset) \
> - calc_index(offset, _SPRA_SURF, _SPRB_SURF, 0,
> SPRSURF(PIPE_C))
> + calc_index(offset, _SPRA_SURF, _SPRB_SURF, SPRSURF(PIPE_C))
>
> static int spr_surf_mmio_write(struct intel_vgpu *vgpu, unsigned int
> offset, void *p_data, unsigned int bytes)
