drm/i915: pass dev_priv explicitly to PP_OFF_DELAYS

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

Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/122e143ff6a1c1016534dae0ba28fde0b15e3e76.1716806471.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
index b7b4d78ec06a0baa865c2218d93dea112fde4dfe..3adfe93794ef4bda04c2aa6680937ddf1ede7a68 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lvds.c
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c
@@ -169,7 +169,7 @@ static void intel_lvds_pps_get_hw_state(struct drm_i915_private *dev_priv,
        pps->t1_t2 = REG_FIELD_GET(PANEL_POWER_UP_DELAY_MASK, val);
        pps->t5 = REG_FIELD_GET(PANEL_LIGHT_ON_DELAY_MASK, val);
 
-       val = intel_de_read(dev_priv, PP_OFF_DELAYS(0));
+       val = intel_de_read(dev_priv, PP_OFF_DELAYS(dev_priv, 0));
        pps->t3 = REG_FIELD_GET(PANEL_POWER_DOWN_DELAY_MASK, val);
        pps->tx = REG_FIELD_GET(PANEL_LIGHT_OFF_DELAY_MASK, val);
 
@@ -222,7 +222,7 @@ static void intel_lvds_pps_init_hw(struct drm_i915_private *dev_priv,
                       REG_FIELD_PREP(PANEL_POWER_UP_DELAY_MASK, pps->t1_t2) |
                       REG_FIELD_PREP(PANEL_LIGHT_ON_DELAY_MASK, pps->t5));
 
-       intel_de_write(dev_priv, PP_OFF_DELAYS(0),
+       intel_de_write(dev_priv, PP_OFF_DELAYS(dev_priv, 0),
                       REG_FIELD_PREP(PANEL_POWER_DOWN_DELAY_MASK, pps->t3) |
                       REG_FIELD_PREP(PANEL_LIGHT_OFF_DELAY_MASK, pps->tx));
 

diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
index 803a1e353c06068e368c89f2c97d0252f2b3cc28..2cc6d5f209e640f9963b78d9069d3e9a8ebf2750 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_pps.c
+++ b/drivers/gpu/drm/i915/display/intel_pps.c
@@ -494,7 +494,7 @@ static void intel_pps_get_registers(struct intel_dp *intel_dp,
        regs->pp_ctrl = PP_CONTROL(dev_priv, pps_idx);
        regs->pp_stat = PP_STATUS(dev_priv, pps_idx);
        regs->pp_on = PP_ON_DELAYS(dev_priv, pps_idx);
-       regs->pp_off = PP_OFF_DELAYS(pps_idx);
+       regs->pp_off = PP_OFF_DELAYS(dev_priv, pps_idx);
 
        /* Cycle delay moved from PP_DIVISOR to PP_CONTROL */
        if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv) ||

diff --git a/drivers/gpu/drm/i915/display/intel_pps_regs.h b/drivers/gpu/drm/i915/display/intel_pps_regs.h
index 8a6acefba7fe04a13925bb84959c8c04d9301b0a..b1ccc54410ceafc9759bae201a414be8749148a7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_pps_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_pps_regs.h
@@ -66,7 +66,7 @@
 #define  PANEL_LIGHT_ON_DELAY_MASK     REG_GENMASK(12, 0)
 
 #define _PP_OFF_DELAYS                 0x6120C
-#define PP_OFF_DELAYS(pps_idx)         _MMIO_PPS(dev_priv, pps_idx, _PP_OFF_DELAYS)
+#define PP_OFF_DELAYS(dev_priv, pps_idx)       _MMIO_PPS(dev_priv, pps_idx, _PP_OFF_DELAYS)
 #define  PANEL_POWER_DOWN_DELAY_MASK   REG_GENMASK(28, 16)
 #define  PANEL_LIGHT_OFF_DELAY_MASK    REG_GENMASK(12, 0)