On Tue, Apr 30, 2024 at 01:09:57PM +0300, Jani Nikula wrote:
> Avoid the implicit dev_priv local variable use, and pass dev_priv
> explicitly to the TRANS_PSR_IMR register macro.
>
> Signed-off-by: Jani Nikula <jani.nik...@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.v...@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display_irq.c | 4 +++-
> drivers/gpu/drm/i915/display/intel_psr.c | 2 +-
> drivers/gpu/drm/i915/display/intel_psr_regs.h | 2 +-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c
> b/drivers/gpu/drm/i915/display/intel_display_irq.c
> index c337e0597541..a9bcf249e925 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_irq.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
> @@ -1455,7 +1455,9 @@ void gen11_display_irq_reset(struct drm_i915_private
> *dev_priv)
> if (!intel_display_power_is_enabled(dev_priv, domain))
> continue;
>
> - intel_uncore_write(uncore, TRANS_PSR_IMR(trans),
> 0xffffffff);
> + intel_uncore_write(uncore,
> + TRANS_PSR_IMR(dev_priv, trans),
> + 0xffffffff);
> intel_uncore_write(uncore, TRANS_PSR_IIR(trans),
> 0xffffffff);
> }
> } else {
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> b/drivers/gpu/drm/i915/display/intel_psr.c
> index 57414a1375b1..12b541e8bbf9 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -305,7 +305,7 @@ static i915_reg_t psr_imr_reg(struct drm_i915_private
> *dev_priv,
> enum transcoder cpu_transcoder)
> {
> if (DISPLAY_VER(dev_priv) >= 12)
> - return TRANS_PSR_IMR(cpu_transcoder);
> + return TRANS_PSR_IMR(dev_priv, cpu_transcoder);
> else
> return EDP_PSR_IMR;
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h
> b/drivers/gpu/drm/i915/display/intel_psr_regs.h
> index d815f08aac2c..40dc6ee7ec1d 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
> +++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
> @@ -66,7 +66,7 @@
> #define EDP_PSR_IIR _MMIO(0x64838)
> #define _PSR_IMR_A 0x60814
> #define _PSR_IIR_A 0x60818
> -#define TRANS_PSR_IMR(tran) _MMIO_TRANS2(dev_priv, tran,
> _PSR_IMR_A)
> +#define TRANS_PSR_IMR(dev_priv, tran)
> _MMIO_TRANS2(dev_priv, tran, _PSR_IMR_A)
> #define TRANS_PSR_IIR(tran) _MMIO_TRANS2(dev_priv, tran,
> _PSR_IIR_A)
> #define _EDP_PSR_TRANS_SHIFT(trans) ((trans) ==
> TRANSCODER_EDP ? \
> 0 : ((trans) - TRANSCODER_A +
> 1) * 8)
> --
> 2.39.2
>
