On Tue, Apr 30, 2024 at 01:10:02PM +0300, Jani Nikula wrote:
> Avoid the implicit dev_priv local variable use, and pass dev_priv
> explicitly to the EDP_PSR_PERF_CNT register macro.
>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_psr.c | 2 +-
> drivers/gpu/drm/i915/display/intel_psr_regs.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> index 1a52a69e1906..162dd07c243f 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -287,7 +287,7 @@ static i915_reg_t psr_perf_cnt_reg(struct drm_i915_private *dev_priv,
> enum transcoder cpu_transcoder)
> {
> if (DISPLAY_VER(dev_priv) >= 8)
> - return EDP_PSR_PERF_CNT(cpu_transcoder);
> + return EDP_PSR_PERF_CNT(dev_priv, cpu_transcoder);
> else
> return HSW_SRD_PERF_CNT;
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
> index 4f3e58076a48..ef7f32c98d55 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
> +++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
> @@ -126,7 +126,7 @@
> #define HSW_SRD_PERF_CNT _MMIO(0x64844)
> #define _SRD_PERF_CNT_A 0x60844
> #define _SRD_PERF_CNT_EDP 0x6f844
> -#define EDP_PSR_PERF_CNT(tran) _MMIO_TRANS2(dev_priv, tran, _SRD_PERF_CNT_A)
> +#define EDP_PSR_PERF_CNT(dev_priv, tran) _MMIO_TRANS2(dev_priv, tran, _SRD_PERF_CNT_A)
> #define EDP_PSR_PERF_CNT_MASK REG_GENMASK(23, 0)
>
> /* PSR_MASK on SKL+ */
> --
> 2.39.2
>
