drm/i915: pass dev_priv explicitly to EDP_PSR_DEBUG

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

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/187dd49632d46e67705bd258ed7f9eabdeb108b2.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 162dd07c243fbec49c4954971a5c762bfa419f06..fa1fd04d3b4ae569b410ff5725f0ed12de492319 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -278,7 +278,7 @@ static i915_reg_t psr_debug_reg(struct drm_i915_private *dev_priv,
                                enum transcoder cpu_transcoder)
 {
        if (DISPLAY_VER(dev_priv) >= 8)
-               return EDP_PSR_DEBUG(cpu_transcoder);
+               return EDP_PSR_DEBUG(dev_priv, cpu_transcoder);
        else
                return HSW_SRD_DEBUG;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
index ef7f32c98d553e19dcd39749ef35d22e5106f683..a74705aedbb59aba5e547e2746976b5985a5be93 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
@@ -133,7 +133,7 @@
 #define HSW_SRD_DEBUG                          _MMIO(0x64860)
 #define _SRD_DEBUG_A                           0x60860
 #define _SRD_DEBUG_EDP                         0x6f860
-#define EDP_PSR_DEBUG(tran)                    _MMIO_TRANS2(dev_priv, tran, _SRD_DEBUG_A)
+#define EDP_PSR_DEBUG(dev_priv, tran)                  _MMIO_TRANS2(dev_priv, tran, _SRD_DEBUG_A)
 #define   EDP_PSR_DEBUG_MASK_MAX_SLEEP         REG_BIT(28)
 #define   EDP_PSR_DEBUG_MASK_LPSP              REG_BIT(27)
 #define   EDP_PSR_DEBUG_MASK_MEMUP             REG_BIT(26)