drm/i915: pass dev_priv explicitly to EDP_PSR_AUX_CTL

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

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/66ec1f81be49c87cd9613ba052ce6fd50362d0e0.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 0b1f7e62470e839358814bba2f451997cc14e89d..daeb1b65a2e553ca76847693a310ef82cbd5a17d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -323,7 +323,7 @@ static i915_reg_t psr_aux_ctl_reg(struct drm_i915_private *dev_priv,
                                  enum transcoder cpu_transcoder)
 {
        if (DISPLAY_VER(dev_priv) >= 8)
-               return EDP_PSR_AUX_CTL(cpu_transcoder);
+               return EDP_PSR_AUX_CTL(dev_priv, cpu_transcoder);
        else
                return HSW_SRD_AUX_CTL;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
index 5fd4f875ade098e0b967355f6df4985adb366199..a4f785bcf605599285e08ed196d5a4f0321703e3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
@@ -86,7 +86,7 @@
 #define HSW_SRD_AUX_CTL                                _MMIO(0x64810)
 #define _SRD_AUX_CTL_A                         0x60810
 #define _SRD_AUX_CTL_EDP                       0x6f810
-#define EDP_PSR_AUX_CTL(tran)                  _MMIO_TRANS2(dev_priv, tran, _SRD_AUX_CTL_A)
+#define EDP_PSR_AUX_CTL(dev_priv, tran)                        _MMIO_TRANS2(dev_priv, tran, _SRD_AUX_CTL_A)
 #define   EDP_PSR_AUX_CTL_TIME_OUT_MASK                DP_AUX_CH_CTL_TIME_OUT_MASK
 #define   EDP_PSR_AUX_CTL_MESSAGE_SIZE_MASK    DP_AUX_CH_CTL_MESSAGE_SIZE_MASK
 #define   EDP_PSR_AUX_CTL_PRECHARGE_2US_MASK   DP_AUX_CH_CTL_PRECHARGE_2US_MASK