drm/i915: pass dev_priv explicitly to TRANS_PSR_IMR

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

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/09e9c11ffb669dac901c2416462a8f3dabc86020.1714471597.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_irq.c b/drivers/gpu/drm/i915/display/intel_display_irq.c
index c337e059754115d3b9e7be2d8658533cbc28409b..a9bcf249e9252328c4cd5061b40cbfecdd15eedc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_irq.c
+++ b/drivers/gpu/drm/i915/display/intel_display_irq.c
@@ -1455,7 +1455,9 @@ void gen11_display_irq_reset(struct drm_i915_private *dev_priv)
                        if (!intel_display_power_is_enabled(dev_priv, domain))
                                continue;
 
-                       intel_uncore_write(uncore, TRANS_PSR_IMR(trans), 0xffffffff);
+                       intel_uncore_write(uncore,
+                                          TRANS_PSR_IMR(dev_priv, trans),
+                                          0xffffffff);
                        intel_uncore_write(uncore, TRANS_PSR_IIR(trans), 0xffffffff);
                }
        } else {

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 57414a1375b1ba8969d064bd9dcd76d71b254753..12b541e8bbf9c689e3b870a6aededec6b96f148d 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -305,7 +305,7 @@ static i915_reg_t psr_imr_reg(struct drm_i915_private *dev_priv,
                              enum transcoder cpu_transcoder)
 {
        if (DISPLAY_VER(dev_priv) >= 12)
-               return TRANS_PSR_IMR(cpu_transcoder);
+               return TRANS_PSR_IMR(dev_priv, cpu_transcoder);
        else
                return EDP_PSR_IMR;
 }

diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
index d815f08aac2c8c768c60e4e723a7cf21b8162758..40dc6ee7ec1d94c653445346734616b84895ed51 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
@@ -66,7 +66,7 @@
 #define EDP_PSR_IIR                            _MMIO(0x64838)
 #define _PSR_IMR_A                             0x60814
 #define _PSR_IIR_A                             0x60818
-#define TRANS_PSR_IMR(tran)                    _MMIO_TRANS2(dev_priv, tran, _PSR_IMR_A)
+#define TRANS_PSR_IMR(dev_priv, tran)                  _MMIO_TRANS2(dev_priv, tran, _PSR_IMR_A)
 #define TRANS_PSR_IIR(tran)                    _MMIO_TRANS2(dev_priv, tran, _PSR_IIR_A)
 #define   _EDP_PSR_TRANS_SHIFT(trans)          ((trans) == TRANSCODER_EDP ? \
                                                 0 : ((trans) - TRANSCODER_A + 1) * 8)