drm/i915/pps: pass display to PPS register macros
Subsystems (3)
PATCH 1/1 drm/i915/pps: pass display to PPS register macros
Pass struct intel_display pointer to PPS register macros intead of implicitly relying on the dev_priv local variable.
Signed-off-by Jani Nikula <[email protected]>
---
Mostly see how this feels. Might be better to wait for [1] to land so we could more easily pass display pointer everywhere.
[1] https://lore.kernel.org/r/[email protected]
--- .../drm/i915/display/intel_display_power.c | 2 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 4 +-- drivers/gpu/drm/i915/display/intel_lvds.c | 32 +++++++++++-------- drivers/gpu/drm/i915/display/intel_pps.c | 32 ++++++++++--------- drivers/gpu/drm/i915/display/intel_pps_regs.h | 16 +++++----- 5 files changed, 46 insertions(+), 40 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +1 -1
@@ -1213,7 +1213,7 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv)intel_de_read (dev_priv,WRPLL_CTL (1 )) &WRPLL_PLL_ENABLE , "WRPLL2 enabled\n");I915_STATE_WARN (dev_priv, -intel_de_read (dev_priv,PP_STATUS (0 )) &PP_ON , +intel_de_read (dev_priv,PP_STATUS (&dev_priv->display,0 )) &PP_ON ,"Panel power on\n" ); I915_STATE_WARN(dev_priv, intel_de_read(dev_priv, BLC_PWM_CPU_CTL2) & BLM_PWM_ENABLE,
drivers/gpu/drm/i915/display/intel_dsi_vbt.c +2 -2
@@ -353,14 +353,14 @@ static void icl_native_gpio_set_value(struct drm_i915_private *dev_priv,case MIPI_AVDD_EN_2 : index = gpio ==MIPI_AVDD_EN_1 ?0 :1 ; -intel_de_rmw (dev_priv,PP_CONTROL (index),PANEL_POWER_ON , +intel_de_rmw (dev_priv,PP_CONTROL (&dev_priv->display, index),PANEL_POWER_ON , value ?PANEL_POWER_ON :0 );break ;case MIPI_BKLT_EN_1 :case MIPI_BKLT_EN_2 : index = gpio ==MIPI_BKLT_EN_1 ?0 :1 ; -intel_de_rmw (dev_priv,PP_CONTROL (index),EDP_BLC_ENABLE , +intel_de_rmw (dev_priv,PP_CONTROL (&dev_priv->display, index),EDP_BLC_ENABLE , value ?EDP_BLC_ENABLE :0 );break ;case MIPI_AVEE_EN_1 :
drivers/gpu/drm/i915/display/intel_lvds.c +18 -14
@@ -159,20 +159,21 @@ static void intel_lvds_get_config(struct intel_encoder *encoder,static void intel_lvds_pps_get_hw_state (struct drm_i915_private *dev_priv,struct intel_lvds_pps *pps) { +struct intel_display *display = &dev_priv->display;u32 val; - pps->powerdown_on_reset =intel_de_read (dev_priv,PP_CONTROL (0 )) &PANEL_POWER_RESET ; + pps->powerdown_on_reset =intel_de_read (dev_priv,PP_CONTROL (display,0 )) &PANEL_POWER_RESET ; - val =intel_de_read (dev_priv,PP_ON_DELAYS (0 )); + val =intel_de_read (dev_priv,PP_ON_DELAYS (display,0 )); pps->port =REG_FIELD_GET (PANEL_PORT_SELECT_MASK , val); 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 (display,0 )); pps->t3 =REG_FIELD_GET (PANEL_POWER_DOWN_DELAY_MASK , val); pps->tx =REG_FIELD_GET (PANEL_LIGHT_OFF_DELAY_MASK , val); - val =intel_de_read (dev_priv,PP_DIVISOR (0 )); + val =intel_de_read (dev_priv,PP_DIVISOR (display,0 )); pps->divider =REG_FIELD_GET (PP_REFERENCE_DIVIDER_MASK , val); val =REG_FIELD_GET (PANEL_POWER_CYCLE_DELAY_MASK , val);/*
@@ -207,25 +208,26 @@ static void intel_lvds_pps_get_hw_state(struct drm_i915_private *dev_priv,static void intel_lvds_pps_init_hw (struct drm_i915_private *dev_priv,struct intel_lvds_pps *pps) { +struct intel_display *display = &dev_priv->display;u32 val; - val =intel_de_read (dev_priv,PP_CONTROL (0 )); + val =intel_de_read (dev_priv,PP_CONTROL (display,0 ));drm_WARN_ON (&dev_priv->drm, (val &PANEL_UNLOCK_MASK ) !=PANEL_UNLOCK_REGS );if (pps->powerdown_on_reset) val |=PANEL_POWER_RESET ; -intel_de_write (dev_priv,PP_CONTROL (0 ), val); +intel_de_write (dev_priv,PP_CONTROL (display,0 ), val); -intel_de_write (dev_priv,PP_ON_DELAYS (0 ), +intel_de_write (dev_priv,PP_ON_DELAYS (display,0 ),REG_FIELD_PREP (PANEL_PORT_SELECT_MASK , pps->port) |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 (display,0 ),REG_FIELD_PREP (PANEL_POWER_DOWN_DELAY_MASK , pps->t3) |REG_FIELD_PREP (PANEL_LIGHT_OFF_DELAY_MASK , pps->tx)); -intel_de_write (dev_priv,PP_DIVISOR (0 ), +intel_de_write (dev_priv,PP_DIVISOR (display,0 ),REG_FIELD_PREP (PP_REFERENCE_DIVIDER_MASK , pps->divider) |REG_FIELD_PREP (PANEL_POWER_CYCLE_DELAY_MASK ,DIV_ROUND_UP (pps->t4,1000 ) +1 )); }
@@ -318,13 +320,14 @@ static void intel_enable_lvds(struct intel_atomic_state *state, {struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display = &dev_priv->display;intel_de_rmw (dev_priv, lvds_encoder->reg,0 ,LVDS_PORT_EN ); -intel_de_rmw (dev_priv,PP_CONTROL (0 ),0 ,PANEL_POWER_ON ); +intel_de_rmw (dev_priv,PP_CONTROL (display,0 ),0 ,PANEL_POWER_ON );intel_de_posting_read (dev_priv, lvds_encoder->reg); -if (intel_de_wait_for_set (dev_priv,PP_STATUS (0 ),PP_ON ,5000 )) +if (intel_de_wait_for_set (dev_priv,PP_STATUS (display,0 ),PP_ON ,5000 ))drm_err (&dev_priv->drm,"timed out waiting for panel to power on\n" );
@@ -338,9 +341,10 @@ static void intel_disable_lvds(struct intel_atomic_state *state, {struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display = &dev_priv->display; -intel_de_rmw (dev_priv,PP_CONTROL (0 ),PANEL_POWER_ON ,0 ); -if (intel_de_wait_for_clear (dev_priv,PP_STATUS (0 ),PP_ON ,1000 )) +intel_de_rmw (dev_priv,PP_CONTROL (display,0 ),PANEL_POWER_ON ,0 ); +if (intel_de_wait_for_clear (dev_priv,PP_STATUS (display,0 ),PP_ON ,1000 ))drm_err (&dev_priv->drm,"timed out waiting for panel to power off\n" );
@@ -379,7 +383,7 @@ static void intel_lvds_shutdown(struct intel_encoder *encoder) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -if (intel_de_wait_for_clear (dev_priv,PP_STATUS (0 ),PP_CYCLE_DELAY_ACTIVE ,5000 )) +if (intel_de_wait_for_clear (dev_priv,PP_STATUS (&dev_priv->display,0 ),PP_CYCLE_DELAY_ACTIVE ,5000 ))drm_err (&dev_priv->drm,"timed out waiting for panel power cycle delay\n" ); }
drivers/gpu/drm/i915/display/intel_pps.c +17 -15
@@ -272,12 +272,12 @@ typedef bool (*pps_check)(struct drm_i915_private *dev_priv, int pps_idx);static bool pps_has_pp_on (struct drm_i915_private *dev_priv,int pps_idx) { -return intel_de_read (dev_priv,PP_STATUS (pps_idx)) &PP_ON ; +return intel_de_read (dev_priv,PP_STATUS (&dev_priv->display, pps_idx)) &PP_ON ; }static bool pps_has_vdd_on (struct drm_i915_private *dev_priv,int pps_idx) { -return intel_de_read (dev_priv,PP_CONTROL (pps_idx)) &EDP_FORCE_VDD ; +return intel_de_read (dev_priv,PP_CONTROL (&dev_priv->display, pps_idx)) &EDP_FORCE_VDD ; }static bool pps_any (struct drm_i915_private *dev_priv,int pps_idx)
@@ -292,7 +292,7 @@ vlv_initial_pps_pipe(struct drm_i915_private *dev_priv,enum pipe pipe;for (pipe =PIPE_A ; pipe <=PIPE_B ; pipe++) { -u32 port_sel =intel_de_read (dev_priv,PP_ON_DELAYS (pipe)) & +u32 port_sel =intel_de_read (dev_priv,PP_ON_DELAYS (&dev_priv->display, pipe)) &PANEL_PORT_SELECT_MASK ;if (port_sel !=PANEL_PORT_SELECT_VLV (port))
@@ -480,6 +480,7 @@ static void intel_pps_get_registers(struct intel_dp *intel_dp, struct pps_registers *regs) {struct drm_i915_private *dev_priv =dp_to_i915 (intel_dp); +struct intel_display *display = &dev_priv->display;int pps_idx;memset (regs,0 ,sizeof (*regs));
@@ -491,17 +492,17 @@ static void intel_pps_get_registers(struct intel_dp *intel_dp,else pps_idx = intel_dp->pps.pps_idx; - regs->pp_ctrl =PP_CONTROL (pps_idx); - regs->pp_stat =PP_STATUS (pps_idx); - regs->pp_on =PP_ON_DELAYS (pps_idx); - regs->pp_off =PP_OFF_DELAYS (pps_idx); + regs->pp_ctrl =PP_CONTROL (display, pps_idx); + regs->pp_stat =PP_STATUS (display, pps_idx); + regs->pp_on =PP_ON_DELAYS (display, pps_idx); + regs->pp_off =PP_OFF_DELAYS (display, pps_idx);/* Cycle delay moved from PP_DIVISOR to PP_CONTROL */ if (IS_GEMINILAKE (dev_priv) ||IS_BROXTON (dev_priv) ||INTEL_PCH_TYPE (dev_priv) >=PCH_CNP ) regs->pp_div =INVALID_MMIO_REG ;else - regs->pp_div =PP_DIVISOR (pps_idx); + regs->pp_div =PP_DIVISOR (display, pps_idx); } static i915_reg_t
@@ -1111,7 +1112,7 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev);enum pipe pipe = intel_dp->pps.pps_pipe; -i915_reg_t pp_on_reg =PP_ON_DELAYS (pipe); +i915_reg_t pp_on_reg =PP_ON_DELAYS (&dev_priv->display, pipe);drm_WARN_ON (&dev_priv->drm, intel_dp->pps.active_pipe !=INVALID_PIPE );
@@ -1656,7 +1657,7 @@ void intel_pps_unlock_regs_wa(struct drm_i915_private *dev_priv) pps_num =intel_num_pps (dev_priv);for (pps_idx =0 ; pps_idx < pps_num; pps_idx++) -intel_de_rmw (dev_priv,PP_CONTROL (pps_idx), +intel_de_rmw (dev_priv,PP_CONTROL (&dev_priv->display, pps_idx),PANEL_UNLOCK_MASK ,PANEL_UNLOCK_REGS ); }
@@ -1703,6 +1704,7 @@ void intel_pps_connector_debugfs_add(struct intel_connector *connector)void assert_pps_unlocked (struct drm_i915_private *dev_priv,enum pipe pipe) { +struct intel_display *display = &dev_priv->display;i915_reg_t pp_reg;u32 val;enum pipe panel_pipe =INVALID_PIPE ;
@@ -1714,8 +1716,8 @@ void assert_pps_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe)if (HAS_PCH_SPLIT (dev_priv)) {u32 port_sel; - pp_reg =PP_CONTROL (0 ); - port_sel =intel_de_read (dev_priv,PP_ON_DELAYS (0 )) &PANEL_PORT_SELECT_MASK ; + pp_reg =PP_CONTROL (display,0 ); + port_sel =intel_de_read (dev_priv,PP_ON_DELAYS (display,0 )) &PANEL_PORT_SELECT_MASK ;switch (port_sel) {case PANEL_PORT_SELECT_LVDS :
@@ -1736,13 +1738,13 @@ void assert_pps_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe) } }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {/* presumably write lock depends on pipe, not port select */ - pp_reg =PP_CONTROL (pipe); + pp_reg =PP_CONTROL (display, pipe); panel_pipe = pipe; }else {u32 port_sel; - pp_reg =PP_CONTROL (0 ); - port_sel =intel_de_read (dev_priv,PP_ON_DELAYS (0 )) &PANEL_PORT_SELECT_MASK ; + pp_reg =PP_CONTROL (display,0 ); + port_sel =intel_de_read (dev_priv,PP_ON_DELAYS (display,0 )) &PANEL_PORT_SELECT_MASK ;drm_WARN_ON (&dev_priv->drm, port_sel !=PANEL_PORT_SELECT_LVDS );
drivers/gpu/drm/i915/display/intel_pps_regs.h +8 -8
@@ -13,12 +13,12 @@#define VLV_PPS_BASE (VLV_DISPLAY_BASE + PPS_BASE)#define PCH_PPS_BASE 0xC7200 -#define _MMIO_PPS (pps_idx, reg) _MMIO(dev_priv->display.pps.mmio_base - \ - PPS_BASE + (reg) + \ - (pps_idx) * 0x100) +#define _MMIO_PPS (display, pps_idx, reg) _MMIO((display)->pps.mmio_base - \ + PPS_BASE + (reg) + \ + (pps_idx) * 0x100)#define _PP_STATUS 0x61200 -#define PP_STATUS (pps_idx) _MMIO_PPS(pps_idx, _PP_STATUS) +#define PP_STATUS (display, pps_idx) _MMIO_PPS(display, pps_idx, _PP_STATUS)#define PP_ON REG_BIT(31)/* * Indicates that all dependencies of the panel are on:
@@ -45,7 +45,7 @@#define PP_SEQUENCE_STATE_RESET REG_FIELD_PREP(PP_SEQUENCE_STATE_MASK, 0xf)#define _PP_CONTROL 0x61204 -#define PP_CONTROL (pps_idx) _MMIO_PPS(pps_idx, _PP_CONTROL) +#define PP_CONTROL (display, pps_idx) _MMIO_PPS(display, pps_idx, _PP_CONTROL)#define PANEL_UNLOCK_MASK REG_GENMASK(31, 16)#define PANEL_UNLOCK_REGS REG_FIELD_PREP(PANEL_UNLOCK_MASK, 0xabcd)#define BXT_POWER_CYCLE_DELAY_MASK REG_GENMASK(8, 4)
@@ -55,7 +55,7 @@#define PANEL_POWER_ON REG_BIT(0)#define _PP_ON_DELAYS 0x61208 -#define PP_ON_DELAYS (pps_idx) _MMIO_PPS(pps_idx, _PP_ON_DELAYS) +#define PP_ON_DELAYS (display, pps_idx) _MMIO_PPS(display, pps_idx, _PP_ON_DELAYS)#define PANEL_PORT_SELECT_MASK REG_GENMASK(31, 30)#define PANEL_PORT_SELECT_LVDS REG_FIELD_PREP(PANEL_PORT_SELECT_MASK, 0)#define PANEL_PORT_SELECT_DPA REG_FIELD_PREP(PANEL_PORT_SELECT_MASK, 1)
@@ -66,12 +66,12 @@#define PANEL_LIGHT_ON_DELAY_MASK REG_GENMASK(12, 0)#define _PP_OFF_DELAYS 0x6120C -#define PP_OFF_DELAYS (pps_idx) _MMIO_PPS(pps_idx, _PP_OFF_DELAYS) +#define PP_OFF_DELAYS (display, pps_idx) _MMIO_PPS(display, 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)#define _PP_DIVISOR 0x61210 -#define PP_DIVISOR (pps_idx) _MMIO_PPS(pps_idx, _PP_DIVISOR) +#define PP_DIVISOR (display, pps_idx) _MMIO_PPS(display, pps_idx, _PP_DIVISOR)#define PP_REFERENCE_DIVIDER_MASK REG_GENMASK(31, 8)#define PANEL_POWER_CYCLE_DELAY_MASK REG_GENMASK(4, 0)
Signature · 1 line
2.39.2
Quoted 4 lines · Jani Nikula
Pass struct
intel_displaypointer to PPS register macros intead of implicitly relying on thedev_privlocal variable.Signed-off-by Jani Nikula <[email protected]>
Whoops, accidentally sent the same patch twice, with slightly different commit messages.
Signature · 1 line
Jani Nikula, Intel