drm/i915: pass dev_priv explicitly to EDP_PSR_STATUS

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

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

diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
index 6a6d7de901bc1f611ef9295280828d774351b82b..4f3e58076a489bc75d61d5770aa8ac6d05fb2500 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
@@ -101,7 +101,7 @@
 #define HSW_SRD_STATUS                         _MMIO(0x64840)
 #define _SRD_STATUS_A                          0x60840
 #define _SRD_STATUS_EDP                                0x6f840
-#define EDP_PSR_STATUS(tran)                   _MMIO_TRANS2(dev_priv, tran, _SRD_STATUS_A)
+#define EDP_PSR_STATUS(dev_priv, tran)                 _MMIO_TRANS2(dev_priv, tran, _SRD_STATUS_A)
 #define   EDP_PSR_STATUS_STATE_MASK            REG_GENMASK(31, 29)
 #define   EDP_PSR_STATUS_STATE_IDLE            REG_FIELD_PREP(EDP_PSR_STATUS_STATE_MASK, 0)
 #define   EDP_PSR_STATUS_STATE_SRDONACK                REG_FIELD_PREP(EDP_PSR_STATUS_STATE_MASK, 1)