drm/i915: pass dev_priv explicitly to EDP_PSR_AUX_DATA

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

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4e3dc15b170c2b64168e46ebf1802d63df34b4a2.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 daeb1b65a2e553ca76847693a310ef82cbd5a17d..5fe9feddc0e09b7c65566deb8b6225fc4c8b4c58 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -332,7 +332,7 @@ static i915_reg_t psr_aux_data_reg(struct drm_i915_private *dev_priv,
                                   enum transcoder cpu_transcoder, int i)
 {
        if (DISPLAY_VER(dev_priv) >= 8)
-               return EDP_PSR_AUX_DATA(cpu_transcoder, i);
+               return EDP_PSR_AUX_DATA(dev_priv, cpu_transcoder, i);
        else
                return HSW_SRD_AUX_DATA(i);
 }

diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
index a4f785bcf605599285e08ed196d5a4f0321703e3..6a6d7de901bc1f611ef9295280828d774351b82b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
@@ -96,7 +96,7 @@
 #define HSW_SRD_AUX_DATA(i)                    _MMIO(0x64814 + (i) * 4) /* 5 registers */
 #define _SRD_AUX_DATA_A                                0x60814
 #define _SRD_AUX_DATA_EDP                      0x6f814
-#define EDP_PSR_AUX_DATA(tran, i)              _MMIO_TRANS2(dev_priv, tran, _SRD_AUX_DATA_A + (i) * 4) /* 5 registers */
+#define EDP_PSR_AUX_DATA(dev_priv, tran, i)            _MMIO_TRANS2(dev_priv, tran, _SRD_AUX_DATA_A + (i) * 4) /* 5 registers */
 
 #define HSW_SRD_STATUS                         _MMIO(0x64840)
 #define _SRD_STATUS_A                          0x60840