drm/i915: pass dev_priv explicitly to EDP_PSR_PERF_CNT

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

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

diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
index 4f3e58076a489bc75d61d5770aa8ac6d05fb2500..ef7f32c98d553e19dcd39749ef35d22e5106f683 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
@@ -126,7 +126,7 @@
 #define HSW_SRD_PERF_CNT               _MMIO(0x64844)
 #define _SRD_PERF_CNT_A                        0x60844
 #define _SRD_PERF_CNT_EDP              0x6f844
-#define EDP_PSR_PERF_CNT(tran)         _MMIO_TRANS2(dev_priv, tran, _SRD_PERF_CNT_A)
+#define EDP_PSR_PERF_CNT(dev_priv, tran)               _MMIO_TRANS2(dev_priv, tran, _SRD_PERF_CNT_A)
 #define   EDP_PSR_PERF_CNT_MASK                REG_GENMASK(23, 0)
 
 /* PSR_MASK on SKL+ */