drm/i915: pass dev_priv explicitly to EDP_PSR_CTL

Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the EDP_PSR_CTL register macro.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/198858bc3925c02c0975670e3ebb5ce2084ac658.1714471597.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 1cbd8c6714b1337ce70ee50046c4a23101fb2002..57414a1375b1ba8969d064bd9dcd76d71b254753 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -269,7 +269,7 @@ static i915_reg_t psr_ctl_reg(struct drm_i915_private *dev_priv,
                              enum transcoder cpu_transcoder)
 {
        if (DISPLAY_VER(dev_priv) >= 8)
-               return EDP_PSR_CTL(cpu_transcoder);
+               return EDP_PSR_CTL(dev_priv, cpu_transcoder);
        else
                return HSW_SRD_CTL;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
index 0e0c71ea9fe3fa2f5f9a1ea91bde94e64f9ce06c..d815f08aac2c8c768c60e4e723a7cf21b8162758 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
@@ -23,7 +23,7 @@
 #define HSW_SRD_CTL                            _MMIO(0x64800)
 #define _SRD_CTL_A                             0x60800
 #define _SRD_CTL_EDP                           0x6f800
-#define EDP_PSR_CTL(tran)                      _MMIO_TRANS2(dev_priv, tran, _SRD_CTL_A)
+#define EDP_PSR_CTL(dev_priv, tran)                    _MMIO_TRANS2(dev_priv, tran, _SRD_CTL_A)
 #define   EDP_PSR_ENABLE                       REG_BIT(31)
 #define   BDW_PSR_SINGLE_FRAME                 REG_BIT(30)
 #define   EDP_PSR_RESTORE_PSR_ACTIVE_CTX_MASK  REG_BIT(29) /* SW can't modify */