drm/i915/display: bunch of struct intel_display conversions
Re: [PATCH 03/11] drm/i915/dpio: convert to struct intel_display
In reply to Jani NikulaQuoted 4 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch DPIO PHY code over to it.Signed-off-by Jani Nikula <[email protected]>
Quoted 618 lines
--- .../i915/display/intel_display_power_well.c | 19 ++- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 158 +++++++++--------- drivers/gpu/drm/i915/display/intel_dpio_phy.h | 22 +-- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 6 +- 4 files changed, 106 insertions(+), 99 deletions(-)drivers/gpu/drm/i915/display/intel_display_power_well.c +13
-6@@ -919,38 +919,45 @@ static void hsw_power_well_sync_hw(struct drm_i915_private *dev_priv,static void bxt_dpio_cmn_power_well_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -bxt_dpio_phy_init (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +struct intel_display *display = &dev_priv->display; + +bxt_dpio_phy_init (display,i915_power_well_instance (power_well)->bxt.phy); }static void bxt_dpio_cmn_power_well_disable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -bxt_dpio_phy_uninit (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +struct intel_display *display = &dev_priv->display; + +bxt_dpio_phy_uninit (display,i915_power_well_instance (power_well)->bxt.phy); }static bool bxt_dpio_cmn_power_well_enabled (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -return bxt_dpio_phy_is_enabled (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +struct intel_display *display = &dev_priv->display; + +return bxt_dpio_phy_is_enabled (display,i915_power_well_instance (power_well)->bxt.phy); }static void bxt_verify_dpio_phy_power_wells (struct drm_i915_private *dev_priv) { +struct intel_display *display = &dev_priv->display;struct i915_power_well *power_well; power_well =lookup_power_well (dev_priv,BXT_DISP_PW_DPIO_CMN_A );if (intel_power_well_refcount (power_well) >0 ) -bxt_dpio_phy_verify_state (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +bxt_dpio_phy_verify_state (display,i915_power_well_instance (power_well)->bxt.phy); power_well =lookup_power_well (dev_priv,VLV_DISP_PW_DPIO_CMN_BC );if (intel_power_well_refcount (power_well) >0 ) -bxt_dpio_phy_verify_state (dev_priv,i915_power_well_instance (power_well)->bxt.phy); +bxt_dpio_phy_verify_state (display,i915_power_well_instance (power_well)->bxt.phy);if (IS_GEMINILAKE (dev_priv)) { power_well =lookup_power_well (dev_priv,GLK_DISP_PW_DPIO_CMN_C );if (intel_power_well_refcount (power_well) >0 ) -bxt_dpio_phy_verify_state (dev_priv, +bxt_dpio_phy_verify_state (display,i915_power_well_instance (power_well)->bxt.phy); } }drivers/gpu/drm/i915/display/intel_dpio_phy.c +78
-80@@ -219,8 +219,10 @@ static const struct bxt_dpio_phy_info glk_dpio_phy_info[] = { };static const struct bxt_dpio_phy_info * -bxt_get_phy_list (struct drm_i915_private *dev_priv,int *count) +bxt_get_phy_list (struct intel_display *display,int *count) { +struct drm_i915_private *dev_priv =to_i915 (display->drm); +if (IS_GEMINILAKE (dev_priv)) { *count =ARRAY_SIZE (glk_dpio_phy_info);return glk_dpio_phy_info;@@ -231,22 +233,22 @@ bxt_get_phy_list(struct drm_i915_private *dev_priv, int *count) }static const struct bxt_dpio_phy_info * -bxt_get_phy_info (struct drm_i915_private *dev_priv,enum dpio_phy phy) +bxt_get_phy_info (struct intel_display *display,enum dpio_phy phy) {int count;const struct bxt_dpio_phy_info *phy_list = -bxt_get_phy_list (dev_priv, &count); +bxt_get_phy_list (display, &count);return &phy_list[phy]; } -void bxt_port_to_phy_channel (struct drm_i915_private *dev_priv,enum port port, +void bxt_port_to_phy_channel (struct intel_display *display,enum port port,enum dpio_phy *phy,enum dpio_channel *ch) {const struct bxt_dpio_phy_info *phy_info, *phys;int i, count; - phys =bxt_get_phy_list (dev_priv, &count); + phys =bxt_get_phy_list (display, &count);for (i =0 ; i < count; i++) { phy_info = &phys[i];@@ -265,7 +267,7 @@ void bxt_port_to_phy_channel(struct drm_i915_private *dev_priv, enum port port, } } -drm_WARN (&dev_priv->drm,1 ,"PHY not found for PORT %c" , +drm_WARN (display->drm,1 ,"PHY not found for PORT %c" ,port_name (port)); *phy =DPIO_PHY0 ; *ch =DPIO_CH0 ;@@ -275,16 +277,16 @@ void bxt_port_to_phy_channel(struct drm_i915_private *dev_priv, enum port port,* Like intel_de_rmw() but reads from a single per-lane register and * writes to the group register to write the same value to all the lanes. */ -static u32 bxt_dpio_phy_rmw_grp (struct drm_i915_private *i915, +static u32 bxt_dpio_phy_rmw_grp (struct intel_display *display,i915_reg_t reg_single,i915_reg_t reg_group,u32 clear,u32 set) {u32 old, val; - old =intel_de_read (i915, reg_single); + old =intel_de_read (display, reg_single); val = (old & ~clear) | set; -intel_de_write (i915, reg_group, val); +intel_de_write (display, reg_group, val);return old; }@@ -292,30 +294,30 @@ static u32 bxt_dpio_phy_rmw_grp(struct drm_i915_private *i915,void bxt_dpio_phy_set_signal_levels (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);const struct intel_ddi_buf_trans *trans;enum dpio_channel ch;enum dpio_phy phy;int lane, n_entries; trans = encoder->get_buf_trans (encoder, crtc_state, &n_entries); -if (drm_WARN_ON_ONCE (&dev_priv->drm, !trans)) +if (drm_WARN_ON_ONCE (display->drm, !trans))return ; -bxt_port_to_phy_channel (dev_priv, encoder->port, &phy, &ch); +bxt_port_to_phy_channel (display, encoder->port, &phy, &ch);/* * While we write to the group register to program all lanes at once we * can read only lane registers and we pick lanes 0/1 for that. */ -bxt_dpio_phy_rmw_grp (dev_priv,BXT_PORT_PCS_DW10_LN01 (phy, ch), +bxt_dpio_phy_rmw_grp (display,BXT_PORT_PCS_DW10_LN01 (phy, ch),BXT_PORT_PCS_DW10_GRP (phy, ch),TX2_SWING_CALC_INIT |TX1_SWING_CALC_INIT ,0 );for (lane =0 ; lane < crtc_state->lane_count; lane++) {int level =intel_ddi_level (encoder, crtc_state, lane); -intel_de_rmw (dev_priv,BXT_PORT_TX_DW2_LN (phy, ch, lane), +intel_de_rmw (display,BXT_PORT_TX_DW2_LN (phy, ch, lane),MARGIN_000_MASK |UNIQ_TRANS_SCALE_MASK ,MARGIN_000 (trans->entries[level].bxt.margin) |UNIQ_TRANS_SCALE (trans->entries[level].bxt.scale));@@ -325,50 +327,50 @@ void bxt_dpio_phy_set_signal_levels(struct intel_encoder *encoder,int level =intel_ddi_level (encoder, crtc_state, lane);u32 val; -intel_de_rmw (dev_priv,BXT_PORT_TX_DW3_LN (phy, ch, lane), +intel_de_rmw (display,BXT_PORT_TX_DW3_LN (phy, ch, lane),SCALE_DCOMP_METHOD , trans->entries[level].bxt.enable ?SCALE_DCOMP_METHOD :0 ); - val =intel_de_read (dev_priv,BXT_PORT_TX_DW3_LN (phy, ch, lane)); + val =intel_de_read (display,BXT_PORT_TX_DW3_LN (phy, ch, lane));if ((val &UNIQUE_TRANGE_EN_METHOD ) && !(val &SCALE_DCOMP_METHOD )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"Disabled scaling while ouniqetrangenmethod was set" ); }for (lane =0 ; lane < crtc_state->lane_count; lane++) {int level =intel_ddi_level (encoder, crtc_state, lane); -intel_de_rmw (dev_priv,BXT_PORT_TX_DW4_LN (phy, ch, lane), +intel_de_rmw (display,BXT_PORT_TX_DW4_LN (phy, ch, lane),DE_EMPHASIS_MASK ,DE_EMPHASIS (trans->entries[level].bxt.deemphasis)); } -bxt_dpio_phy_rmw_grp (dev_priv,BXT_PORT_PCS_DW10_LN01 (phy, ch), +bxt_dpio_phy_rmw_grp (display,BXT_PORT_PCS_DW10_LN01 (phy, ch),BXT_PORT_PCS_DW10_GRP (phy, ch),0 ,TX2_SWING_CALC_INIT |TX1_SWING_CALC_INIT ); } -bool bxt_dpio_phy_is_enabled (struct drm_i915_private *dev_priv, +bool bxt_dpio_phy_is_enabled (struct intel_display *display,enum dpio_phy phy) {const struct bxt_dpio_phy_info *phy_info; - phy_info =bxt_get_phy_info (dev_priv, phy); + phy_info =bxt_get_phy_info (display, phy); -if (!(intel_de_read (dev_priv,BXT_P_CR_GT_DISP_PWRON ) & phy_info->pwron_mask)) +if (!(intel_de_read (display,BXT_P_CR_GT_DISP_PWRON ) & phy_info->pwron_mask))return false; -if ((intel_de_read (dev_priv,BXT_PORT_CL1CM_DW0 (phy)) & +if ((intel_de_read (display,BXT_PORT_CL1CM_DW0 (phy)) & (PHY_POWER_GOOD |PHY_RESERVED )) !=PHY_POWER_GOOD ) { -drm_dbg (&dev_priv->drm, +drm_dbg (display->drm,"DDI PHY %d powered, but power hasn't settled\n" , phy);return false; } -if (!(intel_de_read (dev_priv,BXT_PHY_CTL_FAMILY (phy)) &COMMON_RESET_DIS )) { -drm_dbg (&dev_priv->drm, +if (!(intel_de_read (display,BXT_PHY_CTL_FAMILY (phy)) &COMMON_RESET_DIS )) { +drm_dbg (display->drm,"DDI PHY %d powered, but still in reset\n" , phy);return false;@@ -377,47 +379,44 @@ bool bxt_dpio_phy_is_enabled(struct drm_i915_private *dev_priv,return true; } -static u32 bxt_get_grc (struct drm_i915_private *dev_priv,enum dpio_phy phy) +static u32 bxt_get_grc (struct intel_display *display,enum dpio_phy phy) { -u32 val =intel_de_read (dev_priv,BXT_PORT_REF_DW6 (phy)); +u32 val =intel_de_read (display,BXT_PORT_REF_DW6 (phy));return REG_FIELD_GET (GRC_CODE_MASK , val); } -static void bxt_phy_wait_grc_done (struct drm_i915_private *dev_priv, +static void bxt_phy_wait_grc_done (struct intel_display *display,enum dpio_phy phy) { -if (intel_de_wait_for_set (dev_priv,BXT_PORT_REF_DW3 (phy), -GRC_DONE ,10 )) -drm_err (&dev_priv->drm,"timeout waiting for PHY%d GRC\n" , - phy); +if (intel_de_wait_for_set (display,BXT_PORT_REF_DW3 (phy),GRC_DONE ,10 )) +drm_err (display->drm,"timeout waiting for PHY%d GRC\n" , phy); } -static void _bxt_dpio_phy_init (struct drm_i915_private *dev_priv, -enum dpio_phy phy) +static void _bxt_dpio_phy_init (struct intel_display *display,enum dpio_phy phy) {const struct bxt_dpio_phy_info *phy_info;u32 val; - phy_info =bxt_get_phy_info (dev_priv, phy); + phy_info =bxt_get_phy_info (display, phy); -if (bxt_dpio_phy_is_enabled (dev_priv, phy)) { +if (bxt_dpio_phy_is_enabled (display, phy)) {/* Still read out the GRC value for state verification */ if (phy_info->rcomp_phy !=-1 ) - dev_priv->display.state.bxt_phy_grc =bxt_get_grc (dev_priv, phy); + display->state.bxt_phy_grc =bxt_get_grc (display, phy); -if (bxt_dpio_phy_verify_state (dev_priv, phy)) { -drm_dbg (&dev_priv->drm,"DDI PHY %d already enabled, " +if (bxt_dpio_phy_verify_state (display, phy)) { +drm_dbg (display->drm,"DDI PHY %d already enabled, " "won't reprogram it\n" , phy);return ; } -drm_dbg (&dev_priv->drm, +drm_dbg (display->drm,"DDI PHY %d enabled with invalid state, " "force reprogramming it\n" , phy); } -intel_de_rmw (dev_priv,BXT_P_CR_GT_DISP_PWRON ,0 , phy_info->pwron_mask); +intel_de_rmw (display,BXT_P_CR_GT_DISP_PWRON ,0 , phy_info->pwron_mask);/* * The PHY registers start out inaccessible and respond to reads with @@ -427,92 +426,91 @@ static void _bxt_dpio_phy_init(struct drm_i915_private *dev_priv,* The flag should get set in 100us according to the HW team, but * use 1ms due to occasional timeouts observed with that. */ -if (intel_de_wait_fw (dev_priv,BXT_PORT_CL1CM_DW0 (phy), +if (intel_de_wait_fw (display,BXT_PORT_CL1CM_DW0 (phy),PHY_RESERVED |PHY_POWER_GOOD ,PHY_POWER_GOOD ,1 )) -drm_err (&dev_priv->drm,"timeout during PHY%d power on\n" , +drm_err (display->drm,"timeout during PHY%d power on\n" , phy);/* Program PLL Rcomp code offset */ -intel_de_rmw (dev_priv,BXT_PORT_CL1CM_DW9 (phy), +intel_de_rmw (display,BXT_PORT_CL1CM_DW9 (phy),IREF0RC_OFFSET_MASK ,IREF0RC_OFFSET (0xE4 )); -intel_de_rmw (dev_priv,BXT_PORT_CL1CM_DW10 (phy), +intel_de_rmw (display,BXT_PORT_CL1CM_DW10 (phy),IREF1RC_OFFSET_MASK ,IREF1RC_OFFSET (0xE4 ));/* Program power gating */ -intel_de_rmw (dev_priv,BXT_PORT_CL1CM_DW28 (phy),0 , +intel_de_rmw (display,BXT_PORT_CL1CM_DW28 (phy),0 ,OCL1_POWER_DOWN_EN |DW28_OLDO_DYN_PWR_DOWN_EN |SUS_CLK_CONFIG );if (phy_info->dual_channel) -intel_de_rmw (dev_priv,BXT_PORT_CL2CM_DW6 (phy),0 , +intel_de_rmw (display,BXT_PORT_CL2CM_DW6 (phy),0 ,DW6_OLDO_DYN_PWR_DOWN_EN );if (phy_info->rcomp_phy !=-1 ) {u32 grc_code; -bxt_phy_wait_grc_done (dev_priv, phy_info->rcomp_phy); +bxt_phy_wait_grc_done (display, phy_info->rcomp_phy);/* * PHY0 isn't connected to an RCOMP resistor so copy over * the corresponding calibrated value from PHY1, and disable * the automatic calibration on PHY0. */ - val =bxt_get_grc (dev_priv, phy_info->rcomp_phy); - dev_priv->display.state.bxt_phy_grc = val; + val =bxt_get_grc (display, phy_info->rcomp_phy); + display->state.bxt_phy_grc = val; grc_code =GRC_CODE_FAST (val) |GRC_CODE_SLOW (val) |GRC_CODE_NOM (val); -intel_de_write (dev_priv,BXT_PORT_REF_DW6 (phy), grc_code); -intel_de_rmw (dev_priv,BXT_PORT_REF_DW8 (phy), +intel_de_write (display,BXT_PORT_REF_DW6 (phy), grc_code); +intel_de_rmw (display,BXT_PORT_REF_DW8 (phy),0 ,GRC_DIS |GRC_RDY_OVRD ); }if (phy_info->reset_delay)udelay (phy_info->reset_delay); -intel_de_rmw (dev_priv,BXT_PHY_CTL_FAMILY (phy),0 ,COMMON_RESET_DIS ); +intel_de_rmw (display,BXT_PHY_CTL_FAMILY (phy),0 ,COMMON_RESET_DIS ); } -void bxt_dpio_phy_uninit (struct drm_i915_private *dev_priv,enum dpio_phy phy) +void bxt_dpio_phy_uninit (struct intel_display *display,enum dpio_phy phy) {const struct bxt_dpio_phy_info *phy_info; - phy_info =bxt_get_phy_info (dev_priv, phy); + phy_info =bxt_get_phy_info (display, phy); -intel_de_rmw (dev_priv,BXT_PHY_CTL_FAMILY (phy),COMMON_RESET_DIS ,0 ); +intel_de_rmw (display,BXT_PHY_CTL_FAMILY (phy),COMMON_RESET_DIS ,0 ); -intel_de_rmw (dev_priv,BXT_P_CR_GT_DISP_PWRON , phy_info->pwron_mask,0 ); +intel_de_rmw (display,BXT_P_CR_GT_DISP_PWRON , phy_info->pwron_mask,0 ); } -void bxt_dpio_phy_init (struct drm_i915_private *dev_priv,enum dpio_phy phy) +void bxt_dpio_phy_init (struct intel_display *display,enum dpio_phy phy) { -const struct bxt_dpio_phy_info *phy_info = -bxt_get_phy_info (dev_priv, phy); +const struct bxt_dpio_phy_info *phy_info =bxt_get_phy_info (display, phy);enum dpio_phy rcomp_phy = phy_info->rcomp_phy;bool was_enabled; -lockdep_assert_held (&dev_priv->display.power.domains.lock); +lockdep_assert_held (&display->power.domains.lock); was_enabled = true;if (rcomp_phy !=-1 ) - was_enabled =bxt_dpio_phy_is_enabled (dev_priv, rcomp_phy); + was_enabled =bxt_dpio_phy_is_enabled (display, rcomp_phy);/* * We need to copy the GRC calibration value from rcomp_phy, * so make sure it's powered up. */ if (!was_enabled) -_bxt_dpio_phy_init (dev_priv, rcomp_phy); +_bxt_dpio_phy_init (display, rcomp_phy); -_bxt_dpio_phy_init (dev_priv, phy); +_bxt_dpio_phy_init (display, phy);if (!was_enabled) -bxt_dpio_phy_uninit (dev_priv, rcomp_phy); +bxt_dpio_phy_uninit (display, rcomp_phy); } static bool __printf(6, 7) -__phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy, +__phy_reg_verify_state(struct intel_display *display, enum dpio_phy phy, i915_reg_t reg, u32 mask, u32 expected, const char *reg_fmt, ...) {@@ -520,7 +518,7 @@ __phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy,va_list args;u32 val; - val =intel_de_read (dev_priv, reg); + val =intel_de_read (display, reg);if ((val & mask) == expected)return true;@@ -528,7 +526,7 @@ __phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy, vaf.fmt = reg_fmt; vaf.va = &args; -drm_dbg (&dev_priv->drm,"DDI PHY %d reg %pV [%08x] state mismatch: " +drm_dbg (display->drm,"DDI PHY %d reg %pV [%08x] state mismatch: " "current %08x, expected %08x (mask %08x)\n" , phy, &vaf, reg.reg, val, (val & ~mask) | expected, mask);@@ -538,20 +536,20 @@ __phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy,return false; } -bool bxt_dpio_phy_verify_state (struct drm_i915_private *dev_priv, +bool bxt_dpio_phy_verify_state (struct intel_display *display,enum dpio_phy phy) {const struct bxt_dpio_phy_info *phy_info;u32 mask;bool ok; - phy_info =bxt_get_phy_info (dev_priv, phy); + phy_info =bxt_get_phy_info (display, phy);#define _CHK (reg, mask, exp, fmt, ...) \ - __phy_reg_verify_state(dev_priv, phy, reg, mask, exp, fmt, \ + __phy_reg_verify_state(display, phy, reg, mask, exp, fmt, \ ## __VA_ARGS__) -if (!bxt_dpio_phy_is_enabled (dev_priv, phy)) +if (!bxt_dpio_phy_is_enabled (display, phy))return false; ok = true;@@ -575,7 +573,7 @@ bool bxt_dpio_phy_verify_state(struct drm_i915_private *dev_priv, "BXT_PORT_CL2CM_DW6(%d)", phy);if (phy_info->rcomp_phy !=-1 ) { -u32 grc_code = dev_priv->display.state.bxt_phy_grc; +u32 grc_code = display->state.bxt_phy_grc; grc_code =GRC_CODE_FAST (grc_code) | GRC_CODE_SLOW(grc_code) |@@ -614,20 +612,20 @@ bxt_dpio_phy_calc_lane_lat_optim_mask(u8 lane_count)void bxt_dpio_phy_set_lane_optim_mask (struct intel_encoder *encoder,u8 lane_lat_optim_mask) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane; -bxt_port_to_phy_channel (dev_priv, port, &phy, &ch); +bxt_port_to_phy_channel (display, port, &phy, &ch);for (lane =0 ; lane <4 ; lane++) {/* * Note that on CHV this flag is called UPAR, but has * the same function. */ -intel_de_rmw (dev_priv,BXT_PORT_TX_DW14_LN (phy, ch, lane), +intel_de_rmw (display,BXT_PORT_TX_DW14_LN (phy, ch, lane),LATENCY_OPTIM , lane_lat_optim_mask &BIT (lane) ?LATENCY_OPTIM :0 ); }@@ -636,18 +634,18 @@ void bxt_dpio_phy_set_lane_optim_mask(struct intel_encoder *encoder,u8 bxt_dpio_phy_get_lane_lat_optim_mask (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);enum port port = encoder->port;enum dpio_phy phy;enum dpio_channel ch;int lane;u8 mask; -bxt_port_to_phy_channel (dev_priv, port, &phy, &ch); +bxt_port_to_phy_channel (display, port, &phy, &ch); mask =0 ;for (lane =0 ; lane <4 ; lane++) { -u32 val =intel_de_read (dev_priv, +u32 val =intel_de_read (display,BXT_PORT_TX_DW14_LN (phy, ch, lane));if (val &LATENCY_OPTIM )drivers/gpu/drm/i915/display/intel_dpio_phy.h +11
-11@@ -10,9 +10,9 @@enum pipe ;enum port ; -struct drm_i915_private ;struct intel_crtc_state ;struct intel_digital_port ; +struct intel_display ;struct intel_encoder ;enum dpio_channel {@@ -27,15 +27,15 @@ enum dpio_phy { };#ifdef I915 -void bxt_port_to_phy_channel (struct drm_i915_private *dev_priv,enum port port, +void bxt_port_to_phy_channel (struct intel_display *display,enum port port,enum dpio_phy *phy,enum dpio_channel *ch);void bxt_dpio_phy_set_signal_levels (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state); -void bxt_dpio_phy_init (struct drm_i915_private *dev_priv,enum dpio_phy phy); -void bxt_dpio_phy_uninit (struct drm_i915_private *dev_priv,enum dpio_phy phy); -bool bxt_dpio_phy_is_enabled (struct drm_i915_private *dev_priv, +void bxt_dpio_phy_init (struct intel_display *display,enum dpio_phy phy); +void bxt_dpio_phy_uninit (struct intel_display *display,enum dpio_phy phy); +bool bxt_dpio_phy_is_enabled (struct intel_display *display,enum dpio_phy phy); -bool bxt_dpio_phy_verify_state (struct drm_i915_private *dev_priv, +bool bxt_dpio_phy_verify_state (struct intel_display *display,enum dpio_phy phy);u8 bxt_dpio_phy_calc_lane_lat_optim_mask (u8 lane_count); void bxt_dpio_phy_set_lane_optim_mask(struct intel_encoder *encoder,@@ -73,7 +73,7 @@ void vlv_phy_pre_encoder_enable(struct intel_encoder *encoder,void vlv_phy_reset_lanes (struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state);#else -static inline void bxt_port_to_phy_channel (struct drm_i915_private *dev_priv,enum port port, +static inline void bxt_port_to_phy_channel (struct intel_display *display,enum port port,enum dpio_phy *phy,enum dpio_channel *ch) { }@@ -81,18 +81,18 @@ static inline void bxt_dpio_phy_set_signal_levels(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { } -static inline void bxt_dpio_phy_init (struct drm_i915_private *dev_priv,enum dpio_phy phy) +static inline void bxt_dpio_phy_init (struct intel_display *display,enum dpio_phy phy) { } -static inline void bxt_dpio_phy_uninit (struct drm_i915_private *dev_priv,enum dpio_phy phy) +static inline void bxt_dpio_phy_uninit (struct intel_display *display,enum dpio_phy phy) { } -static inline bool bxt_dpio_phy_is_enabled (struct drm_i915_private *dev_priv, +static inline bool bxt_dpio_phy_is_enabled (struct intel_display *display,enum dpio_phy phy) {return false; } -static inline bool bxt_dpio_phy_verify_state (struct drm_i915_private *dev_priv, +static inline bool bxt_dpio_phy_verify_state (struct intel_display *display,enum dpio_phy phy) {return true;drivers/gpu/drm/i915/display/intel_dpll_mgr.c +4
-2@@ -2035,13 +2035,14 @@ static void bxt_ddi_pll_enable(struct drm_i915_private *i915,struct intel_shared_dpll *pll, const struct intel_dpll_hw_state *dpll_hw_state) { + struct intel_display *display = &i915->display;const struct bxt_dpll_hw_state *hw_state = &dpll_hw_state->bxt;enum port port = (enum port )pll->info->id;/* 1:1 port->PLL mapping */ enum dpio_phy phy;enum dpio_channel ch;u32 temp; -bxt_port_to_phy_channel (i915, port, &phy, &ch); +bxt_port_to_phy_channel (display, port, &phy, &ch);/* Non-SSC reference */ intel_de_rmw (i915,BXT_PORT_PLL_ENABLE (port),0 ,PORT_PLL_REF_SEL );@@ -2157,6 +2158,7 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *i915,struct intel_shared_dpll *pll, struct intel_dpll_hw_state *dpll_hw_state) { + struct intel_display *display = &i915->display;struct bxt_dpll_hw_state *hw_state = &dpll_hw_state->bxt;enum port port = (enum port )pll->info->id;/* 1:1 port->PLL mapping */ intel_wakeref_t wakeref;@@ -2165,7 +2167,7 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *i915,u32 val;bool ret; -bxt_port_to_phy_channel (i915, port, &phy, &ch); +bxt_port_to_phy_channel (display, port, &phy, &ch); wakeref =intel_display_power_get_if_enabled (i915,POWER_DOMAIN_DISPLAY_CORE );Signature · 1 line
2.39.5
Re: [PATCH 04/11] drm/i915/hdcp: further conversion to struct intel_display
In reply to Jani NikulaQuoted 4 lines · Jani Nikula
There are some unconverted stragglers left in the HDCP API still using struct
drm_i915_private. Convert to structintel_display.Signed-off-by Jani Nikula <[email protected]>
Quoted 262 lines
--- .../drm/i915/display/intel_display_driver.c | 7 +++-- drivers/gpu/drm/i915/display/intel_dp.c | 3 +- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 5 ++-- drivers/gpu/drm/i915/display/intel_hdcp.c | 30 ++++++++----------- drivers/gpu/drm/i915/display/intel_hdcp.h | 10 +++---- drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- drivers/gpu/drm/xe/display/xe_display.c | 4 ++- 7 files changed, 30 insertions(+), 32 deletions(-)drivers/gpu/drm/i915/display/intel_display_driver.c +4
-3@@ -485,7 +485,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)return 0 ; err_hdcp: -intel_hdcp_component_fini (i915); +intel_hdcp_component_fini (display); err_mode_config:intel_mode_config_cleanup (i915);@@ -495,6 +495,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)/* part #3: call after gem init */ int intel_display_driver_probe (struct drm_i915_private *i915) { +struct intel_display *display = &i915->display;int ret;if (!HAS_DISPLAY (i915))@@ -505,7 +506,7 @@ int intel_display_driver_probe(struct drm_i915_private *i915)* the BIOS fb takeover and whatever else magic ggtt reservations * happen during gem/ggtt init. */ -intel_hdcp_component_init (i915); +intel_hdcp_component_init (display);/* * Force all active planes to recompute their states. So that on @@ -600,7 +601,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915)/* flush any delayed tasks or pending work */ flush_workqueue (i915->unordered_wq); -intel_hdcp_component_fini (i915); +intel_hdcp_component_fini (display);intel_mode_config_cleanup (i915);drivers/gpu/drm/i915/display/intel_dp.c +2
-1@@ -6415,6 +6415,7 @@ bool intel_dp_init_connector(struct intel_digital_port *dig_port, struct intel_connector *intel_connector) { + struct intel_display *display = to_intel_display(dig_port);struct drm_connector *connector = &intel_connector->base;struct intel_dp *intel_dp = &dig_port->dp;struct intel_encoder *intel_encoder = &dig_port->base;@@ -6504,7 +6505,7 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,intel_dp_add_properties (intel_dp, connector); -if (is_hdcp_supported (dev_priv, port) && !intel_dp_is_edp (intel_dp)) { +if (is_hdcp_supported (display, port) && !intel_dp_is_edp (intel_dp)) {int ret =intel_dp_hdcp_init (dig_port, intel_connector);if (ret) drm_dbg_kms(&dev_priv->drm,drivers/gpu/drm/i915/display/intel_dp_hdcp.c +2
-3@@ -873,13 +873,12 @@ static const struct intel_hdcp_shim intel_dp_mst_hdcp_shim = {int intel_dp_hdcp_init (struct intel_digital_port *dig_port,struct intel_connector *intel_connector) { -struct drm_device *dev = intel_connector->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_display *display =to_intel_display (dig_port);struct intel_encoder *intel_encoder = &dig_port->base;enum port port = intel_encoder->port;struct intel_dp *intel_dp = &dig_port->dp; -if (!is_hdcp_supported (dev_priv, port)) +if (!is_hdcp_supported (display, port))return 0 ;if (intel_connector->mst_port)drivers/gpu/drm/i915/display/intel_hdcp.c +13
-17@@ -1192,10 +1192,10 @@ static void intel_hdcp_prop_work(struct work_struct *work)drm_connector_put (&connector->base); } -bool is_hdcp_supported (struct drm_i915_private *i915,enum port port) +bool is_hdcp_supported (struct intel_display *display,enum port port) { -return DISPLAY_RUNTIME_INFO (i915)->has_hdcp && - (DISPLAY_VER (i915) >=12 || port <PORT_E ); +return DISPLAY_RUNTIME_INFO (display)->has_hdcp && + (DISPLAY_VER (display) >=12 || port <PORT_E ); } static int@@ -2301,9 +2301,9 @@ static int initialize_hdcp_port_data(struct intel_connector *connector,return 0 ; } -static bool is_hdcp2_supported (struct drm_i915_private *i915) +static bool is_hdcp2_supported (struct intel_display *display) { -struct intel_display *display =to_intel_display (&i915->drm); +struct drm_i915_private *i915 =to_i915 (display->drm);if (intel_hdcp_gsc_cs_required (display))return true;@@ -2317,12 +2317,11 @@ static bool is_hdcp2_supported(struct drm_i915_private *i915) IS_COMETLAKE(i915)); } -void intel_hdcp_component_init (struct drm_i915_private *i915) +void intel_hdcp_component_init (struct intel_display *display) { -struct intel_display *display =to_intel_display (&i915->drm);int ret; -if (!is_hdcp2_supported (i915)) +if (!is_hdcp2_supported (display))return ;mutex_lock (&display->hdcp.hdcp_mutex);@@ -2367,19 +2366,18 @@ int intel_hdcp_init(struct intel_connector *connector,struct intel_digital_port *dig_port, const struct intel_hdcp_shim *shim) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct intel_hdcp *hdcp = &connector->hdcp;int ret;if (!shim)return -EINVAL ; -if (is_hdcp2_supported (i915)) +if (is_hdcp2_supported (display))intel_hdcp2_init (connector, dig_port, shim); - ret = -drm_connector_attach_content_protection_property (&connector->base, - hdcp->hdcp2_supported); + ret =drm_connector_attach_content_protection_property (&connector->base, + hdcp->hdcp2_supported);if (ret) { hdcp->hdcp2_supported = false;kfree (dig_port->hdcp_port_data.streams);@@ -2432,7 +2430,7 @@ static int _intel_hdcp_enable(struct intel_atomic_state *state, hdcp->stream_transcoder =INVALID_TRANSCODER ; } -if (DISPLAY_VER (i915) >=12 ) +if (DISPLAY_VER (display) >=12 ) dig_port->hdcp_port_data.hdcp_transcoder =intel_get_hdcp_transcoder (hdcp->cpu_transcoder);@@ -2583,10 +2581,8 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,_intel_hdcp_enable (state, encoder, crtc_state, conn_state); } -void intel_hdcp_component_fini (struct drm_i915_private *i915) +void intel_hdcp_component_fini (struct intel_display *display) { -struct intel_display *display =to_intel_display (&i915->drm); -mutex_lock (&display->hdcp.hdcp_mutex);if (!display->hdcp.comp_added) {mutex_unlock (&display->hdcp.hdcp_mutex);drivers/gpu/drm/i915/display/intel_hdcp.h +5
-5@@ -12,13 +12,13 @@struct drm_connector ;struct drm_connector_state ; -struct drm_i915_private ;struct intel_atomic_state ;struct intel_connector ;struct intel_crtc_state ; +struct intel_digital_port ; +struct intel_display ;struct intel_encoder ;struct intel_hdcp_shim ; -struct intel_digital_port ;enum port ;enum transcoder ;@@ -37,14 +37,14 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state); -bool is_hdcp_supported (struct drm_i915_private *i915,enum port port); +bool is_hdcp_supported (struct intel_display *display,enum port port);bool intel_hdcp_get_capability (struct intel_connector *connector);bool intel_hdcp2_get_capability (struct intel_connector *connector);void intel_hdcp_get_remote_capability (struct intel_connector *connector,bool *hdcp_capable,bool *hdcp2_capable); -void intel_hdcp_component_init (struct drm_i915_private *i915); -void intel_hdcp_component_fini (struct drm_i915_private *i915); +void intel_hdcp_component_init (struct intel_display *display); +void intel_hdcp_component_fini (struct intel_display *display);void intel_hdcp_cleanup (struct intel_connector *connector);void intel_hdcp_handle_cp_irq (struct intel_connector *connector);drivers/gpu/drm/i915/display/intel_hdmi.c +1
-2@@ -3025,7 +3025,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,struct intel_hdmi *intel_hdmi = &dig_port->hdmi;struct intel_encoder *intel_encoder = &dig_port->base;struct drm_device *dev = intel_encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum port port = intel_encoder->port;struct cec_connector_info conn_info;u8 ddc_pin;@@ -3075,7 +3074,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *dig_port,intel_connector_attach_encoder (intel_connector, intel_encoder); intel_hdmi->attached_connector = intel_connector; -if (is_hdcp_supported (dev_priv, port)) { +if (is_hdcp_supported (display, port)) {int ret =intel_hdcp_init (intel_connector, dig_port, &intel_hdmi_hdcp_shim);if (ret)drivers/gpu/drm/xe/display/xe_display.c +3
-1@@ -202,12 +202,14 @@ int xe_display_init(struct xe_device *xe)void xe_display_fini (struct xe_device *xe) { +struct intel_display *display = &xe->display; +if (!xe->info.probe_display)return ;intel_hpd_poll_fini (xe); -intel_hdcp_component_fini (xe); +intel_hdcp_component_fini (display);intel_audio_deinit (xe); }Signature · 1 line
2.39.5
Re: [PATCH 05/11] drm/i915/dp/hdcp: convert to struct intel_display
In reply to Jani NikulaQuoted 4 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch DP HDCP code over to it.Signed-off-by Jani Nikula <[email protected]>
Quoted 369 lines
--- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 88 ++++++++++---------- 1 file changed, 45 insertions(+), 43 deletions(-)drivers/gpu/drm/i915/display/intel_dp_hdcp.c +45
-43@@ -58,7 +58,7 @@ staticint intel_dp_hdcp_write_an_aksv (struct intel_digital_port *dig_port,u8 *an) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);u8 aksv[DRM_HDCP_KSV_LEN ] = {};ssize_t dpcd_ret;@@ -66,7 +66,7 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *dig_port, dpcd_ret =drm_dp_dpcd_write (&dig_port->dp.aux,DP_AUX_HDCP_AN , an,DRM_HDCP_AN_LEN );if (dpcd_ret !=DRM_HDCP_AN_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Failed to write An over DP/AUX (%zd)\n" , dpcd_ret);return dpcd_ret >=0 ? -EIO : dpcd_ret;@@ -82,7 +82,7 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *dig_port, dpcd_ret =drm_dp_dpcd_write (&dig_port->dp.aux,DP_AUX_HDCP_AKSV , aksv,DRM_HDCP_KSV_LEN );if (dpcd_ret !=DRM_HDCP_KSV_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Failed to write Aksv over DP/AUX (%zd)\n" , dpcd_ret);return dpcd_ret >=0 ? -EIO : dpcd_ret;@@ -93,13 +93,13 @@ int intel_dp_hdcp_write_an_aksv(struct intel_digital_port *dig_port,static int intel_dp_hdcp_read_bksv (struct intel_digital_port *dig_port,u8 *bksv) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BKSV , bksv,DRM_HDCP_KSV_LEN );if (ret !=DRM_HDCP_KSV_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read Bksv from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -109,7 +109,7 @@ static int intel_dp_hdcp_read_bksv(struct intel_digital_port *dig_port,static int intel_dp_hdcp_read_bstatus (struct intel_digital_port *dig_port,u8 *bstatus) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;/* @@ -120,7 +120,7 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *dig_port, ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BINFO , bstatus,DRM_HDCP_BSTATUS_LEN );if (ret !=DRM_HDCP_BSTATUS_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -129,7 +129,7 @@ static int intel_dp_hdcp_read_bstatus(struct intel_digital_port *dig_port,static int intel_dp_hdcp_read_bcaps (struct drm_dp_aux *aux, -struct drm_i915_private *i915, +struct intel_display *display,u8 *bcaps) {ssize_t ret;@@ -137,7 +137,7 @@ int intel_dp_hdcp_read_bcaps(struct drm_dp_aux *aux, ret =drm_dp_dpcd_read (aux,DP_AUX_HDCP_BCAPS , bcaps,1 );if (ret !=1 ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bcaps from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -149,11 +149,11 @@ staticint intel_dp_hdcp_repeater_present (struct intel_digital_port *dig_port,bool *repeater_present) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bcaps; - ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, i915, &bcaps); + ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, display, &bcaps);if (ret)return ret;@@ -165,13 +165,14 @@ staticint intel_dp_hdcp_read_ri_prime (struct intel_digital_port *dig_port,u8 *ri_prime) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_RI_PRIME , ri_prime,DRM_HDCP_RI_LEN );if (ret !=DRM_HDCP_RI_LEN ) { -drm_dbg_kms (&i915->drm,"Read Ri' from DP/AUX failed (%zd)\n" , +drm_dbg_kms (display->drm, +"Read Ri' from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -182,14 +183,14 @@ staticint intel_dp_hdcp_read_ksv_ready (struct intel_digital_port *dig_port,bool *ksv_ready) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bstatus; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -201,7 +202,7 @@ staticint intel_dp_hdcp_read_ksv_fifo (struct intel_digital_port *dig_port,int num_downstream,u8 *ksv_fifo) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;int i;@@ -213,7 +214,7 @@ int intel_dp_hdcp_read_ksv_fifo(struct intel_digital_port *dig_port, ksv_fifo + i *DRM_HDCP_KSV_LEN , len);if (ret != len) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read ksv[%d] from DP/AUX failed (%zd)\n" , i, ret);return ret >=0 ? -EIO : ret;@@ -226,7 +227,7 @@ staticint intel_dp_hdcp_read_v_prime_part (struct intel_digital_port *dig_port,int i,u32 *part) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;if (i >=DRM_HDCP_V_PRIME_NUM_PARTS )@@ -236,7 +237,7 @@ int intel_dp_hdcp_read_v_prime_part(struct intel_digital_port *dig_port,DP_AUX_HDCP_V_PRIME (i), part, DRM_HDCP_V_PRIME_PART_LEN);if (ret !=DRM_HDCP_V_PRIME_PART_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read v'[%d] from DP/AUX failed (%zd)\n" , i, ret);return ret >=0 ? -EIO : ret; }@@ -256,14 +257,14 @@ staticbool intel_dp_hdcp_check_link (struct intel_digital_port *dig_port,struct intel_connector *connector) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bstatus; ret =drm_dp_dpcd_read (&dig_port->dp.aux,DP_AUX_HDCP_BSTATUS , &bstatus,1 );if (ret !=1 ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return false; }@@ -275,11 +276,11 @@ staticint intel_dp_hdcp_get_capability (struct intel_digital_port *dig_port,bool *hdcp_capable) { -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev); +struct intel_display *display =to_intel_display (dig_port);ssize_t ret;u8 bcaps; - ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, i915, &bcaps); + ret =intel_dp_hdcp_read_bcaps (&dig_port->dp.aux, display, &bcaps);if (ret)return ret;@@ -342,7 +343,7 @@ static int intel_dp_hdcp2_read_rx_status(struct intel_connector *connector, u8 *rx_status) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct drm_dp_aux *aux = &dig_port->dp.aux;ssize_t ret;@@ -351,7 +352,7 @@ intel_dp_hdcp2_read_rx_status(struct intel_connector *connector,DP_HDCP_2_2_REG_RXSTATUS_OFFSET , rx_status, HDCP_2_2_DP_RXSTATUS_LEN);if (ret !=HDCP_2_2_DP_RXSTATUS_LEN ) { -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"Read bstatus from DP/AUX failed (%zd)\n" , ret);return ret >=0 ? -EIO : ret; }@@ -397,7 +398,7 @@ static ssize_t intel_dp_hdcp2_wait_for_msg(struct intel_connector *connector, const struct hdcp2_dp_msg_data *hdcp2_msg_data) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct intel_dp *dp = &dig_port->dp;struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;@@ -430,7 +431,7 @@ intel_dp_hdcp2_wait_for_msg(struct intel_connector *connector, }if (ret) -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"msg_id %d, ret %d, timeout(mSec): %d\n" , hdcp2_msg_data->msg_id, ret, timeout);@@ -514,8 +515,8 @@ staticint intel_dp_hdcp2_read_msg (struct intel_connector *connector,u8 msg_id,void *buf,size_t size) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (dig_port->base.base.dev);struct drm_dp_aux *aux = &dig_port->dp.aux;struct intel_dp *dp = &dig_port->dp;struct intel_hdcp *hdcp = &dp->attached_connector->hdcp;@@ -568,7 +569,7 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector, ret =drm_dp_dpcd_read (aux, offset, (void *)byte, len);if (ret <0 ) { -drm_dbg_kms (&i915->drm,"msg_id %d, ret %zd\n" , +drm_dbg_kms (display->drm,"msg_id %d, ret %zd\n" , msg_id, ret);return ret; }@@ -581,7 +582,8 @@ int intel_dp_hdcp2_read_msg(struct intel_connector *connector,if (hdcp2_msg_data->msg_read_timeout >0 ) { msg_expired =ktime_after (ktime_get_raw (), msg_end);if (msg_expired) { -drm_dbg_kms (&i915->drm,"msg_id %d, entire msg read timeout(mSec): %d\n" , +drm_dbg_kms (display->drm, +"msg_id %d, entire msg read timeout(mSec): %d\n" , msg_id, hdcp2_msg_data->msg_read_timeout);return -ETIMEDOUT ; }@@ -696,7 +698,7 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector,bool *hdcp_capable, bool *hdcp2_capable) { - struct drm_i915_private *i915 = to_i915(connector->base.dev); + struct intel_display *display = to_intel_display(connector);struct drm_dp_aux *aux;u8 bcaps;int ret;@@ -709,10 +711,10 @@ int intel_dp_hdcp_get_remote_capability(struct intel_connector *connector, aux = &connector->port->aux; ret =_intel_dp_hdcp2_get_capability (aux, hdcp2_capable);if (ret) -drm_dbg_kms (&i915->drm, +drm_dbg_kms (display->drm,"HDCP2 DPCD capability read failed err: %d\n" , ret); - ret =intel_dp_hdcp_read_bcaps (aux, i915, &bcaps); + ret =intel_dp_hdcp_read_bcaps (aux, display, &bcaps);if (ret)return ret;@@ -745,8 +747,8 @@ static int intel_dp_mst_toggle_hdcp_stream_select(struct intel_connector *connector, bool enable) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;int ret;@@ -754,7 +756,7 @@ intel_dp_mst_toggle_hdcp_stream_select(struct intel_connector *connector, hdcp->stream_transcoder, enable, TRANS_DDI_HDCP_SELECT);if (ret) -drm_err (&i915->drm,"%s HDCP stream select failed (%d)\n" , +drm_err (display->drm,"%s HDCP stream select failed (%d)\n" , enable ?"Enable" :"Disable" , ret);return ret; }@@ -763,8 +765,8 @@ static int intel_dp_mst_hdcp_stream_encryption(struct intel_connector *connector, bool enable) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct intel_hdcp *hdcp = &connector->hdcp;enum port port = dig_port->base.port;enum transcoder cpu_transcoder = hdcp->stream_transcoder;@@ -780,10 +782,10 @@ intel_dp_mst_hdcp_stream_encryption(struct intel_connector *connector,return -EINVAL ;/* Wait for encryption confirmation */ -if (intel_de_wait (i915,HDCP_STATUS (i915, cpu_transcoder, port), +if (intel_de_wait (display,HDCP_STATUS (display, cpu_transcoder, port), stream_enc_status, enable ? stream_enc_status :0 ,HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) { -drm_err (&i915->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" , +drm_err (display->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" ,transcoder_name (cpu_transcoder), enable ?"enabled" :"disabled" );return -ETIMEDOUT ; }@@ -795,8 +797,8 @@ static int intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector, bool enable) { +struct intel_display *display =to_intel_display (connector);struct intel_digital_port *dig_port =intel_attached_dig_port (connector); -struct drm_i915_private *i915 =to_i915 (connector->base.dev);struct hdcp_port_data *data = &dig_port->hdcp_port_data;struct intel_hdcp *hdcp = &connector->hdcp;enum transcoder cpu_transcoder = hdcp->stream_transcoder;@@ -804,8 +806,8 @@ intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector,enum port port = dig_port->base.port;int ret; -drm_WARN_ON (&i915->drm, enable && - !!(intel_de_read (i915,HDCP2_AUTH_STREAM (i915, cpu_transcoder, port)) +drm_WARN_ON (display->drm, enable && + !!(intel_de_read (display,HDCP2_AUTH_STREAM (display, cpu_transcoder, port)) &AUTH_STREAM_TYPE ) != data->streams[0 ].stream_type); ret =intel_dp_mst_toggle_hdcp_stream_select (connector, enable);@@ -813,11 +815,11 @@ intel_dp_mst_hdcp2_stream_encryption(struct intel_connector *connector,return ret;/* Wait for encryption confirmation */ -if (intel_de_wait (i915,HDCP2_STREAM_STATUS (i915, cpu_transcoder, pipe), +if (intel_de_wait (display,HDCP2_STREAM_STATUS (display, cpu_transcoder, pipe),STREAM_ENCRYPTION_STATUS , enable ?STREAM_ENCRYPTION_STATUS :0 ,HDCP_ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) { -drm_err (&i915->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" , +drm_err (display->drm,"Timed out waiting for transcoder: %s stream encryption %s\n" ,transcoder_name (cpu_transcoder), enable ?"enabled" :"disabled" );return -ETIMEDOUT ; }Signature · 1 line
2.39.5
Re: [PATCH 06/11] drm/i915/crt: convert to struct intel_display
In reply to Jani NikulaQuoted 4 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch CRT code over to it.Signed-off-by Jani Nikula <[email protected]>
Quoted 782 lines
--- drivers/gpu/drm/i915/display/intel_crt.c | 207 +++++++++--------- drivers/gpu/drm/i915/display/intel_crt.h | 10 +- drivers/gpu/drm/i915/display/intel_display.c | 12 +- .../gpu/drm/i915/display/intel_pch_display.c | 3 +- 4 files changed, 122 insertions(+), 110 deletions(-)drivers/gpu/drm/i915/display/intel_crt.c +109
-98@@ -81,12 +81,13 @@ static struct intel_crt *intel_attached_crt(struct intel_connector *connector)return intel_encoder_to_crt (intel_attached_encoder (connector)); } -bool intel_crt_port_enabled (struct drm_i915_private *dev_priv, +bool intel_crt_port_enabled (struct intel_display *display,i915_reg_t adpa_reg,enum pipe *pipe) { +struct drm_i915_private *dev_priv =to_i915 (display->drm);u32 val; - val =intel_de_read (dev_priv, adpa_reg); + val =intel_de_read (display, adpa_reg);/* asserts want to know the pipe even if the port is disabled */ if (HAS_PCH_CPT (dev_priv))@@ -100,6 +101,7 @@ bool intel_crt_port_enabled(struct drm_i915_private *dev_priv,static bool intel_crt_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crt *crt =intel_encoder_to_crt (encoder);intel_wakeref_t wakeref;@@ -110,7 +112,7 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,if (!wakeref)return false; - ret =intel_crt_port_enabled (dev_priv, crt->adpa_reg, pipe); + ret =intel_crt_port_enabled (display, crt->adpa_reg, pipe);intel_display_power_put (dev_priv, encoder->power_domain, wakeref);@@ -119,11 +121,11 @@ static bool intel_crt_get_hw_state(struct intel_encoder *encoder,static unsigned int intel_crt_get_flags (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_crt *crt =intel_encoder_to_crt (encoder);u32 tmp, flags =0 ; - tmp =intel_de_read (dev_priv, crt->adpa_reg); + tmp =intel_de_read (display, crt->adpa_reg);if (tmp &ADPA_HSYNC_ACTIVE_HIGH ) flags |=DRM_MODE_FLAG_PHSYNC ;@@ -168,13 +170,14 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state, int mode) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crt *crt =intel_encoder_to_crt (encoder);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;u32 adpa; -if (DISPLAY_VER (dev_priv) >=5 ) +if (DISPLAY_VER (display) >=5 ) adpa =ADPA_HOTPLUG_BITS ;else adpa =0 ;@@ -193,7 +196,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, adpa |=ADPA_PIPE_SEL (crtc->pipe);if (!HAS_PCH_SPLIT (dev_priv)) -intel_de_write (dev_priv,BCLRPAT (dev_priv, crtc->pipe),0 ); +intel_de_write (display,BCLRPAT (display, crtc->pipe),0 );switch (mode) {case DRM_MODE_DPMS_ON :@@ -210,7 +213,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder,break ; } -intel_de_write (dev_priv, crt->adpa_reg, adpa); +intel_de_write (display, crt->adpa_reg, adpa); } static void intel_disable_crt(struct intel_atomic_state *state,@@ -241,9 +244,10 @@ static void hsw_disable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -drm_WARN_ON (&dev_priv->drm, !old_crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !old_crtc_state->has_pch_encoder);intel_set_pch_fifo_underrun_reporting (dev_priv,PIPE_A , false); }@@ -253,6 +257,7 @@ static void hsw_post_disable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { + struct intel_display *display = to_intel_display(state);struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);@@ -272,7 +277,7 @@ static void hsw_post_disable_crt(struct intel_atomic_state *state,hsw_fdi_disable (encoder); -drm_WARN_ON (&dev_priv->drm, !old_crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !old_crtc_state->has_pch_encoder);intel_set_pch_fifo_underrun_reporting (dev_priv,PIPE_A , true); }@@ -282,9 +287,10 @@ static void hsw_pre_pll_enable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -drm_WARN_ON (&dev_priv->drm, !crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !crtc_state->has_pch_encoder);intel_set_pch_fifo_underrun_reporting (dev_priv,PIPE_A , false); }@@ -294,11 +300,12 @@ static void hsw_pre_enable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe; -drm_WARN_ON (&dev_priv->drm, !crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !crtc_state->has_pch_encoder);intel_set_cpu_fifo_underrun_reporting (dev_priv, pipe, false);@@ -312,11 +319,12 @@ static void hsw_enable_crt(struct intel_atomic_state *state,const struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(state);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);enum pipe pipe = crtc->pipe; -drm_WARN_ON (&dev_priv->drm, !crtc_state->has_pch_encoder); +drm_WARN_ON (display->drm, !crtc_state->has_pch_encoder);intel_ddi_enable_transcoder_func (encoder, crtc_state);@@ -346,9 +354,10 @@ static enum drm_mode_status intel_crt_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { + struct intel_display *display = to_intel_display(connector->dev);struct drm_device *dev = connector->dev;struct drm_i915_private *dev_priv =to_i915 (dev); -int max_dotclk = dev_priv->display.cdclk.max_dotclk_freq; +int max_dotclk = display->cdclk.max_dotclk_freq;enum drm_mode_status status;int max_clock;@@ -367,7 +376,7 @@ intel_crt_mode_valid(struct drm_connector *connector,* DAC limit supposedly 355 MHz. */ max_clock =270000 ; - else if (IS_DISPLAY_VER(dev_priv, 3, 4)) + else if (IS_DISPLAY_VER(display, 3, 4)) max_clock =400000 ; else max_clock =350000 ;@@ -428,6 +437,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode;@@ -450,7 +460,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder,if (HAS_PCH_LPT (dev_priv)) {/* TODO: Check crtc_state->max_link_bpp_x16 instead of bw_constrained */ if (pipe_config->bw_constrained && pipe_config->pipe_bpp <24 ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"LPT only supports 24bpp\n" );return -EINVAL ; }@@ -470,6 +480,7 @@ static int hsw_crt_compute_config(struct intel_encoder *encoder,static bool ilk_crt_detect_hotplug (struct drm_connector *connector) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_device *dev = connector->dev;struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector));struct drm_i915_private *dev_priv =to_i915 (dev);@@ -483,36 +494,36 @@ static bool ilk_crt_detect_hotplug(struct drm_connector *connector) crt->force_hotplug_required = false; - save_adpa = adpa =intel_de_read (dev_priv, crt->adpa_reg); -drm_dbg_kms (&dev_priv->drm, + save_adpa = adpa =intel_de_read (display, crt->adpa_reg); +drm_dbg_kms (display->drm,"trigger hotplug detect cycle: adpa=0x%x\n" , adpa); adpa |=ADPA_CRT_HOTPLUG_FORCE_TRIGGER ;if (turn_off_dac) adpa &= ~ADPA_DAC_ENABLE ; -intel_de_write (dev_priv, crt->adpa_reg, adpa); +intel_de_write (display, crt->adpa_reg, adpa); -if (intel_de_wait_for_clear (dev_priv, +if (intel_de_wait_for_clear (display, crt->adpa_reg,ADPA_CRT_HOTPLUG_FORCE_TRIGGER ,1000 )) -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"timed out waiting for FORCE_TRIGGER" );if (turn_off_dac) { -intel_de_write (dev_priv, crt->adpa_reg, save_adpa); -intel_de_posting_read (dev_priv, crt->adpa_reg); +intel_de_write (display, crt->adpa_reg, save_adpa); +intel_de_posting_read (display, crt->adpa_reg); } }/* Check the status to see if both blue and green are on now */ - adpa =intel_de_read (dev_priv, crt->adpa_reg); + adpa =intel_de_read (display, crt->adpa_reg);if ((adpa &ADPA_CRT_HOTPLUG_MONITOR_MASK ) !=0 ) ret = true;else ret = false; -drm_dbg_kms (&dev_priv->drm,"ironlake hotplug adpa=0x%x, result %d\n" , +drm_dbg_kms (display->drm,"ironlake hotplug adpa=0x%x, result %d\n" , adpa, ret);return ret;@@ -520,6 +531,7 @@ static bool ilk_crt_detect_hotplug(struct drm_connector *connector)static bool valleyview_crt_detect_hotplug (struct drm_connector *connector) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_device *dev = connector->dev;struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector));struct drm_i915_private *dev_priv =to_i915 (dev);@@ -542,29 +554,29 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)*/ reenable_hpd =intel_hpd_disable (dev_priv, crt->base.hpd_pin); - save_adpa = adpa =intel_de_read (dev_priv, crt->adpa_reg); -drm_dbg_kms (&dev_priv->drm, + save_adpa = adpa =intel_de_read (display, crt->adpa_reg); +drm_dbg_kms (display->drm,"trigger hotplug detect cycle: adpa=0x%x\n" , adpa); adpa |=ADPA_CRT_HOTPLUG_FORCE_TRIGGER ; -intel_de_write (dev_priv, crt->adpa_reg, adpa); +intel_de_write (display, crt->adpa_reg, adpa); -if (intel_de_wait_for_clear (dev_priv, crt->adpa_reg, +if (intel_de_wait_for_clear (display, crt->adpa_reg,ADPA_CRT_HOTPLUG_FORCE_TRIGGER ,1000 )) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"timed out waiting for FORCE_TRIGGER" ); -intel_de_write (dev_priv, crt->adpa_reg, save_adpa); +intel_de_write (display, crt->adpa_reg, save_adpa); }/* Check the status to see if both blue and green are on now */ - adpa =intel_de_read (dev_priv, crt->adpa_reg); + adpa =intel_de_read (display, crt->adpa_reg);if ((adpa &ADPA_CRT_HOTPLUG_MONITOR_MASK ) !=0 ) ret = true;else ret = false; -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"valleyview hotplug adpa=0x%x, result %d\n" , adpa, ret);if (reenable_hpd)@@ -575,6 +587,7 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)static bool intel_crt_detect_hotplug (struct drm_connector *connector) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_device *dev = connector->dev;struct drm_i915_private *dev_priv =to_i915 (dev);u32 stat;@@ -603,18 +616,18 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)CRT_HOTPLUG_FORCE_DETECT , CRT_HOTPLUG_FORCE_DETECT);/* wait for FORCE_DETECT to go off */ -if (intel_de_wait_for_clear (dev_priv,PORT_HOTPLUG_EN (dev_priv), +if (intel_de_wait_for_clear (display,PORT_HOTPLUG_EN (display),CRT_HOTPLUG_FORCE_DETECT ,1000 )) -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"timed out waiting for FORCE_DETECT to go off" ); } - stat =intel_de_read (dev_priv,PORT_HOTPLUG_STAT (dev_priv)); + stat =intel_de_read (display,PORT_HOTPLUG_STAT (display));if ((stat &CRT_HOTPLUG_MONITOR_MASK ) !=CRT_HOTPLUG_MONITOR_NONE ) ret = true;/* clear the interrupt we just generated, if any */ -intel_de_write (dev_priv,PORT_HOTPLUG_STAT (dev_priv), +intel_de_write (display,PORT_HOTPLUG_STAT (display),CRT_HOTPLUG_INT_STATUS );i915_hotplug_interrupt_update (dev_priv,CRT_HOTPLUG_FORCE_DETECT ,0 );@@ -660,8 +673,7 @@ static int intel_crt_ddc_get_modes(struct drm_connector *connector,static bool intel_crt_detect_ddc (struct drm_connector *connector) { -struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector)); -struct drm_i915_private *dev_priv =to_i915 (crt->base.base.dev); +struct intel_display *display =to_intel_display (connector->dev);const struct drm_edid *drm_edid;bool ret = false;@@ -674,15 +686,15 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)* have to check the EDID input spec of the attached device. */ if (drm_edid_is_digital (drm_edid)) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT not detected via DDC:0x50 [EDID reports a digital panel]\n" ); }else { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT detected via DDC:0x50 [EDID]\n" ); ret = true; } }else { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT not detected via DDC:0x50 [no valid EDID found]\n" ); }@@ -695,8 +707,6 @@ static enum drm_connector_status intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) {struct intel_display *display =to_intel_display (&crt->base); -struct drm_device *dev = crt->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);enum transcoder cpu_transcoder = (enum transcoder )pipe;u32 save_bclrpat;u32 save_vtotal;@@ -707,14 +717,14 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)u8 st00;enum drm_connector_status status; -drm_dbg_kms (&dev_priv->drm,"starting load-detect on CRT\n" ); +drm_dbg_kms (display->drm,"starting load-detect on CRT\n" ); - save_bclrpat =intel_de_read (dev_priv, -BCLRPAT (dev_priv, cpu_transcoder)); - save_vtotal =intel_de_read (dev_priv, -TRANS_VTOTAL (dev_priv, cpu_transcoder)); - vblank =intel_de_read (dev_priv, -TRANS_VBLANK (dev_priv, cpu_transcoder)); + save_bclrpat =intel_de_read (display, +BCLRPAT (display, cpu_transcoder)); + save_vtotal =intel_de_read (display, +TRANS_VTOTAL (display, cpu_transcoder)); + vblank =intel_de_read (display, +TRANS_VBLANK (display, cpu_transcoder)); vtotal =REG_FIELD_GET (VTOTAL_MASK , save_vtotal) +1 ; vactive =REG_FIELD_GET (VACTIVE_MASK , save_vtotal) +1 ;@@ -723,25 +733,25 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) vblank_end =REG_FIELD_GET (VBLANK_END_MASK , vblank) +1 ;/* Set the border color to purple. */ -intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder),0x500050 ); +intel_de_write (display,BCLRPAT (display, cpu_transcoder),0x500050 ); -if (DISPLAY_VER (dev_priv) !=2 ) { -u32 transconf =intel_de_read (dev_priv, -TRANSCONF (dev_priv, cpu_transcoder)); +if (DISPLAY_VER (display) !=2 ) { +u32 transconf =intel_de_read (display, +TRANSCONF (display, cpu_transcoder)); -intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), +intel_de_write (display,TRANSCONF (display, cpu_transcoder), transconf |TRANSCONF_FORCE_BORDER ); -intel_de_posting_read (dev_priv, -TRANSCONF (dev_priv, cpu_transcoder)); +intel_de_posting_read (display, +TRANSCONF (display, cpu_transcoder));/* Wait for next Vblank to substitue * border color for Color info */ intel_crtc_wait_for_next_vblank (intel_crtc_for_pipe (display, pipe)); - st00 =intel_de_read8 (dev_priv, _VGA_MSR_WRITE); + st00 =intel_de_read8 (display, _VGA_MSR_WRITE); status = ((st00 & (1 <<4 )) !=0 ) ? connector_status_connected : connector_status_disconnected; -intel_de_write (dev_priv,TRANSCONF (dev_priv, cpu_transcoder), +intel_de_write (display,TRANSCONF (display, cpu_transcoder), transconf); }else {bool restore_vblank = false;@@ -752,13 +762,13 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)* Yes, this will flicker */ if (vblank_start <= vactive && vblank_end >= vtotal) { -u32 vsync =intel_de_read (dev_priv, -TRANS_VSYNC (dev_priv, cpu_transcoder)); +u32 vsync =intel_de_read (display, +TRANS_VSYNC (display, cpu_transcoder));u32 vsync_start =REG_FIELD_GET (VSYNC_START_MASK , vsync) +1 ; vblank_start = vsync_start; -intel_de_write (dev_priv, -TRANS_VBLANK (dev_priv, cpu_transcoder), +intel_de_write (display, +TRANS_VBLANK (display, cpu_transcoder),VBLANK_START (vblank_start -1 ) |VBLANK_END (vblank_end -1 )); restore_vblank = true;@@ -772,9 +782,9 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)/* * Wait for the border to be displayed */ -while (intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe)) >= vactive) +while (intel_de_read (display,PIPEDSL (display, pipe)) >= vactive) ; -while ((dsl =intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe))) <= vsample) +while ((dsl =intel_de_read (display,PIPEDSL (display, pipe))) <= vsample) ;/* * Watch ST00 for an entire scanline @@ -784,15 +794,15 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe)do { count++;/* Read the ST00 VGA status register */ - st00 =intel_de_read8 (dev_priv, _VGA_MSR_WRITE); + st00 =intel_de_read8 (display, _VGA_MSR_WRITE);if (st00 & (1 <<4 )) detect++; - }while ((intel_de_read (dev_priv,PIPEDSL (dev_priv, pipe)) == dsl)); + }while ((intel_de_read (display,PIPEDSL (display, pipe)) == dsl));/* restore vblank if necessary */ if (restore_vblank) -intel_de_write (dev_priv, -TRANS_VBLANK (dev_priv, cpu_transcoder), +intel_de_write (display, +TRANS_VBLANK (display, cpu_transcoder), vblank);/* * If more than 3/4 of the scanline detected a monitor, @@ -806,7 +816,7 @@ intel_crt_load_detect(struct intel_crt *crt, enum pipe pipe) }/* Restore previous settings */ -intel_de_write (dev_priv,BCLRPAT (dev_priv, cpu_transcoder), +intel_de_write (display,BCLRPAT (display, cpu_transcoder), save_bclrpat);return status;@@ -843,6 +853,7 @@ intel_crt_detect(struct drm_connector *connector, struct drm_modeset_acquire_ctx *ctx, bool force) { +struct intel_display *display =to_intel_display (connector->dev);struct drm_i915_private *dev_priv =to_i915 (connector->dev);struct intel_crt *crt =intel_attached_crt (to_intel_connector (connector));struct intel_encoder *intel_encoder = &crt->base;@@ -850,7 +861,7 @@ intel_crt_detect(struct drm_connector *connector,intel_wakeref_t wakeref;int status; -drm_dbg_kms (&dev_priv->drm,"[CONNECTOR:%d:%s] force=%d\n" , +drm_dbg_kms (display->drm,"[CONNECTOR:%d:%s] force=%d\n" , connector->base.id, connector->name, force);@@ -860,7 +871,7 @@ intel_crt_detect(struct drm_connector *connector,if (!intel_display_driver_check_access (dev_priv))return connector->status; -if (dev_priv->display.params.load_detect_test) { +if (display->params.load_detect_test) { wakeref =intel_display_power_get (dev_priv, intel_encoder->power_domain); goto load_detect;@@ -873,18 +884,18 @@ intel_crt_detect(struct drm_connector *connector, wakeref =intel_display_power_get (dev_priv, intel_encoder->power_domain); -if (I915_HAS_HOTPLUG (dev_priv)) { +if (I915_HAS_HOTPLUG (display)) {/* We can not rely on the HPD pin always being correctly wired * up, for example many KVM do not pass it through, and so * only trust an assertion that the monitor is connected. */ if (intel_crt_detect_hotplug (connector)) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT detected via hotplug\n" ); status = connector_status_connected; goto out; }else -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"CRT not detected via hotplug\n" ); }@@ -897,7 +908,7 @@ intel_crt_detect(struct drm_connector *connector,* broken monitor (without edid) to work behind a broken kvm (that fails * to have the right resistors for HP detection) needs to fix this up. * For now just bail out. */ -if (I915_HAS_HOTPLUG (dev_priv)) { +if (I915_HAS_HOTPLUG (display)) { status = connector_status_disconnected; goto out; }@@ -917,10 +928,10 @@ intel_crt_detect(struct drm_connector *connector, }else {if (intel_crt_detect_ddc (connector)) status = connector_status_connected; -else if (DISPLAY_VER (dev_priv) <4 ) +else if (DISPLAY_VER (display) <4 ) status =intel_crt_load_detect (crt,to_intel_crtc (connector->state->crtc)->pipe); -else if (dev_priv->display.params.load_detect_test) +else if (display->params.load_detect_test) status = connector_status_disconnected;else status = connector_status_unknown;@@ -966,19 +977,19 @@ static int intel_crt_get_modes(struct drm_connector *connector)void intel_crt_reset (struct drm_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->dev); +struct intel_display *display =to_intel_display (encoder->dev);struct intel_crt *crt =intel_encoder_to_crt (to_intel_encoder (encoder)); -if (DISPLAY_VER (dev_priv) >=5 ) { +if (DISPLAY_VER (display) >=5 ) {u32 adpa; - adpa =intel_de_read (dev_priv, crt->adpa_reg); + adpa =intel_de_read (display, crt->adpa_reg); adpa &= ~ADPA_CRT_HOTPLUG_MASK ; adpa |=ADPA_HOTPLUG_BITS ; -intel_de_write (dev_priv, crt->adpa_reg, adpa); -intel_de_posting_read (dev_priv, crt->adpa_reg); +intel_de_write (display, crt->adpa_reg, adpa); +intel_de_posting_read (display, crt->adpa_reg); -drm_dbg_kms (&dev_priv->drm,"crt adpa set to 0x%x\n" , adpa); +drm_dbg_kms (display->drm,"crt adpa set to 0x%x\n" , adpa); crt->force_hotplug_required = true; }@@ -1008,9 +1019,9 @@ static const struct drm_encoder_funcs intel_crt_enc_funcs = { .destroy = intel_encoder_destroy, }; -void intel_crt_init (struct drm_i915_private *dev_priv) +void intel_crt_init (struct intel_display *display) { -struct intel_display *display = &dev_priv->display; +struct drm_i915_private *dev_priv =to_i915 (display->drm);struct drm_connector *connector;struct intel_crt *crt;struct intel_connector *intel_connector;@@ -1025,7 +1036,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv)else adpa_reg =ADPA ; - adpa =intel_de_read (dev_priv, adpa_reg); + adpa =intel_de_read (display, adpa_reg);if ((adpa &ADPA_DAC_ENABLE ) ==0 ) {/* * On some machines (some IVB at least) CRT can be @@ -1035,11 +1046,11 @@ void intel_crt_init(struct drm_i915_private *dev_priv)* take. So the only way to tell is attempt to enable * it and see what happens. */ -intel_de_write (dev_priv, adpa_reg, +intel_de_write (display, adpa_reg, adpa |ADPA_DAC_ENABLE |ADPA_HSYNC_CNTL_DISABLE |ADPA_VSYNC_CNTL_DISABLE ); -if ((intel_de_read (dev_priv, adpa_reg) &ADPA_DAC_ENABLE ) ==0 ) +if ((intel_de_read (display, adpa_reg) &ADPA_DAC_ENABLE ) ==0 )return ; -intel_de_write (dev_priv, adpa_reg, adpa); +intel_de_write (display, adpa_reg, adpa); } crt =kzalloc (sizeof (struct intel_crt ),GFP_KERNEL );@@ -1052,16 +1063,16 @@ void intel_crt_init(struct drm_i915_private *dev_priv)return ; } - ddc_pin = dev_priv->display.vbt.crt_ddc_pin; + ddc_pin = display->vbt.crt_ddc_pin; connector = &intel_connector->base; crt->connector = intel_connector; -drm_connector_init_with_ddc (&dev_priv->drm, connector, +drm_connector_init_with_ddc (display->drm, connector, &intel_crt_connector_funcs,DRM_MODE_CONNECTOR_VGA ,intel_gmbus_get_adapter (display, ddc_pin)); -drm_encoder_init (&dev_priv->drm, &crt->base.base, &intel_crt_enc_funcs, +drm_encoder_init (display->drm, &crt->base.base, &intel_crt_enc_funcs,DRM_MODE_ENCODER_DAC ,"CRT" );intel_connector_attach_encoder (intel_connector, &crt->base);@@ -1073,14 +1084,14 @@ void intel_crt_init(struct drm_i915_private *dev_priv)else crt->base.pipe_mask = ~0 ; -if (DISPLAY_VER (dev_priv) !=2 ) +if (DISPLAY_VER (display) !=2 ) connector->interlace_allowed = true; crt->adpa_reg = adpa_reg; crt->base.power_domain =POWER_DOMAIN_PORT_CRT ; -if (I915_HAS_HOTPLUG (dev_priv) && +if (I915_HAS_HOTPLUG (display) && !dmi_check_system (intel_spurious_crt_detect)) { crt->base.hpd_pin =HPD_CRT ; crt->base.hotplug = intel_encoder_hotplug;@@ -1090,7 +1101,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv) } intel_connector->base.polled = intel_connector->polled; -if (HAS_DDI (dev_priv)) { +if (HAS_DDI (display)) {assert_port_valid (dev_priv,PORT_E ); crt->base.port =PORT_E ;@@ -1134,7 +1145,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv)u32 fdi_config =FDI_RX_POLARITY_REVERSED_LPT |FDI_RX_LINK_REVERSAL_OVERRIDE ; - dev_priv->display.fdi.rx_config =intel_de_read (dev_priv, + display->fdi.rx_config =intel_de_read (display,FDI_RX_CTL (PIPE_A )) & fdi_config; }drivers/gpu/drm/i915/display/intel_crt.h +5
-5@@ -10,20 +10,20 @@enum pipe ;struct drm_encoder ; -struct drm_i915_private ; +struct intel_display ;#ifdef I915 -bool intel_crt_port_enabled (struct drm_i915_private *dev_priv, +bool intel_crt_port_enabled (struct intel_display *display,i915_reg_t adpa_reg,enum pipe *pipe); -void intel_crt_init (struct drm_i915_private *dev_priv); +void intel_crt_init (struct intel_display *display);void intel_crt_reset (struct drm_encoder *encoder);#else -static inline bool intel_crt_port_enabled (struct drm_i915_private *dev_priv, +static inline bool intel_crt_port_enabled (struct intel_display *display,i915_reg_t adpa_reg,enum pipe *pipe) {return false; } -static inline void intel_crt_init (struct drm_i915_private *dev_priv) +static inline void intel_crt_init (struct intel_display *display) { }static inline void intel_crt_reset (struct drm_encoder *encoder)drivers/gpu/drm/i915/display/intel_display.c +6
-6@@ -8147,7 +8147,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)if (HAS_DDI (dev_priv)) {if (intel_ddi_crt_present (dev_priv)) -intel_crt_init (dev_priv); +intel_crt_init (display);intel_bios_for_each_encoder (display, intel_ddi_init);@@ -8162,7 +8162,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)* incorrect sharing of the PPS. */ intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display); dpd_is_edp =intel_dp_is_port_edp (dev_priv,PORT_D );@@ -8193,7 +8193,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)bool has_edp, has_port;if (IS_VALLEYVIEW (dev_priv) && dev_priv->display.vbt.int_crt_support) -intel_crt_init (dev_priv); +intel_crt_init (display);/* * The DP_DETECTED bit is the latched state of the DDC @@ -8239,14 +8239,14 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)vlv_dsi_init (dev_priv); }else if (IS_PINEVIEW (dev_priv)) {intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display); }else if (IS_DISPLAY_VER (dev_priv,3 ,4 )) {bool found = false;if (IS_MOBILE (dev_priv))intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display);if (intel_de_read (dev_priv,GEN3_SDVOB ) &SDVO_DETECTED ) {drm_dbg_kms (&dev_priv->drm,"probing SDVOB\n" );@@ -8288,7 +8288,7 @@ void intel_setup_outputs(struct drm_i915_private *dev_priv)if (IS_I85X (dev_priv))intel_lvds_init (dev_priv); -intel_crt_init (dev_priv); +intel_crt_init (display);intel_dvo_init (dev_priv); }drivers/gpu/drm/i915/display/intel_pch_display.c +2
-1@@ -76,6 +76,7 @@ static void assert_pch_hdmi_disabled(struct drm_i915_private *dev_priv,static void assert_pch_ports_disabled (struct drm_i915_private *dev_priv,enum pipe pipe) { +struct intel_display *display = &dev_priv->display;enum pipe port_pipe;assert_pch_dp_disabled (dev_priv, pipe,PORT_B ,PCH_DP_B );@@ -83,7 +84,7 @@ static void assert_pch_ports_disabled(struct drm_i915_private *dev_priv,assert_pch_dp_disabled (dev_priv, pipe,PORT_D ,PCH_DP_D );I915_STATE_WARN (dev_priv, -intel_crt_port_enabled (dev_priv,PCH_ADPA , &port_pipe) && port_pipe == pipe, +intel_crt_port_enabled (display,PCH_ADPA , &port_pipe) && port_pipe == pipe,"PCH VGA enabled on transcoder %c, should be disabled\n" ,pipe_name (pipe));Signature · 1 line
2.39.5
Re: [PATCH 07/11] drm/i915/display: convert vlv_wait_port_ready() to struct intel_display
In reply to Jani NikulaQuoted 6 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switchvlv_wait_port_ready()over to it. The main motivation to do just one function is to stop passing i915 tointel_de_wait(), so its generic wrapper can be removed.Signed-off-by Jani Nikula <[email protected]>
Quoted 122 lines
--- drivers/gpu/drm/i915/display/g4x_dp.c | 3 +-- drivers/gpu/drm/i915/display/g4x_hdmi.c | 9 ++++----- drivers/gpu/drm/i915/display/intel_display.c | 12 ++++++------ drivers/gpu/drm/i915/display/intel_display.h | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-)drivers/gpu/drm/i915/display/g4x_dp.c +1
-2@@ -706,8 +706,7 @@ static void intel_enable_dp(struct intel_atomic_state *state,if (IS_CHERRYVIEW (dev_priv)) lane_mask =intel_dp_unused_lane_mask (pipe_config->lane_count); -vlv_wait_port_ready (dev_priv,dp_to_dig_port (intel_dp), - lane_mask); +vlv_wait_port_ready (display,dp_to_dig_port (intel_dp), lane_mask); }intel_dp_set_power (intel_dp,DP_SET_POWER_D0 );drivers/gpu/drm/i915/display/g4x_hdmi.c +4
-5@@ -480,8 +480,8 @@ static void vlv_hdmi_pre_enable(struct intel_atomic_state *state,const struct intel_crtc_state *pipe_config, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(encoder);struct intel_digital_port *dig_port =enc_to_dig_port (encoder); -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);vlv_phy_pre_encoder_enable (encoder, pipe_config);@@ -496,7 +496,7 @@ static void vlv_hdmi_pre_enable(struct intel_atomic_state *state,g4x_hdmi_enable_port (encoder, pipe_config); -vlv_wait_port_ready (dev_priv, dig_port,0x0 ); +vlv_wait_port_ready (display, dig_port,0x0 ); } static void vlv_hdmi_pre_pll_enable(struct intel_atomic_state *state,@@ -557,9 +557,8 @@ static void chv_hdmi_pre_enable(struct intel_atomic_state *state,const struct intel_crtc_state *pipe_config, const struct drm_connector_state *conn_state) { + struct intel_display *display = to_intel_display(encoder);struct intel_digital_port *dig_port =enc_to_dig_port (encoder); -struct drm_device *dev = encoder->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev);chv_phy_pre_encoder_enable (encoder, pipe_config);@@ -573,7 +572,7 @@ static void chv_hdmi_pre_enable(struct intel_atomic_state *state,g4x_hdmi_enable_port (encoder, pipe_config); -vlv_wait_port_ready (dev_priv, dig_port,0x0 ); +vlv_wait_port_ready (display, dig_port,0x0 );/* Second common lane will stay alive on its own now */ chv_phy_release_cl2_override (encoder);drivers/gpu/drm/i915/display/intel_display.c +6
-6@@ -474,7 +474,7 @@ static void assert_planes_disabled(struct intel_crtc *crtc)assert_plane_disabled (plane); } -void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +void vlv_wait_port_ready (struct intel_display *display,struct intel_digital_port *dig_port,unsigned int expected_mask) {@@ -487,11 +487,11 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, fallthrough;case PORT_B : port_mask =DPLL_PORTB_READY_MASK ; - dpll_reg =DPLL (dev_priv,0 ); + dpll_reg =DPLL (display,0 );break ;case PORT_C : port_mask =DPLL_PORTC_READY_MASK ; - dpll_reg =DPLL (dev_priv,0 ); + dpll_reg =DPLL (display,0 ); expected_mask <<=4 ;break ;case PORT_D :@@ -500,11 +500,11 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,break ; } -if (intel_de_wait (dev_priv, dpll_reg, port_mask, expected_mask,1000 )) -drm_WARN (&dev_priv->drm,1 , +if (intel_de_wait (display, dpll_reg, port_mask, expected_mask,1000 )) +drm_WARN (display->drm,1 ,"timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n" , dig_port->base.base.base.id, dig_port->base.base.name, -intel_de_read (dev_priv, dpll_reg) & port_mask, +intel_de_read (display, dpll_reg) & port_mask, expected_mask); }drivers/gpu/drm/i915/display/intel_display.h +1
-1@@ -492,7 +492,7 @@ bool intel_encoder_is_tc(struct intel_encoder *encoder);enum tc_port intel_encoder_to_tc (struct intel_encoder *encoder);int ilk_get_lanes_required (int target_clock,int link_bw,int bpp); -void vlv_wait_port_ready (struct drm_i915_private *dev_priv, +void vlv_wait_port_ready (struct intel_display *display,struct intel_digital_port *dig_port,unsigned int expected_mask);Signature · 1 line
2.39.5
Re: [PATCH 08/11] drm/i915/power: convert assert_chv_phy_status() to struct intel_display
In reply to Jani NikulaQuoted 6 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switchassert_chv_phy_status()and its callers to it. Main motivation to do just one function is to stop passing i915 tointel_de_wait(), so its generic wrapper can be removed.Signed-off-by Jani Nikula <[email protected]>
Quoted 240 lines
--- .../i915/display/intel_display_power_well.c | 95 ++++++++++--------- 1 file changed, 50 insertions(+), 45 deletions(-)drivers/gpu/drm/i915/display/intel_display_power_well.c +50
-45@@ -1337,13 +1337,14 @@ static void vlv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,#define BITS_SET (val, bits) (((val) & (bits)) == (bits)) -static void assert_chv_phy_status (struct drm_i915_private *dev_priv) +static void assert_chv_phy_status (struct intel_display *display) { +struct drm_i915_private *dev_priv =to_i915 (display->drm);struct i915_power_well *cmn_bc =lookup_power_well (dev_priv,VLV_DISP_PW_DPIO_CMN_BC );struct i915_power_well *cmn_d =lookup_power_well (dev_priv,CHV_DISP_PW_DPIO_CMN_D ); -u32 phy_control = dev_priv->display.power.chv_phy_control; +u32 phy_control = display->power.chv_phy_control;u32 phy_status =0 ;u32 phy_status_mask =0xffffffff ;@@ -1354,7 +1355,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)* reset (ie. the power well has been disabled at * least once). */ -if (!dev_priv->display.power.chv_phy_assert[DPIO_PHY0 ]) +if (!display->power.chv_phy_assert[DPIO_PHY0 ]) phy_status_mask &= ~(PHY_STATUS_CMN_LDO(DPIO_PHY0, DPIO_CH0) | PHY_STATUS_SPLINE_LDO(DPIO_PHY0, DPIO_CH0, 0) | PHY_STATUS_SPLINE_LDO(DPIO_PHY0, DPIO_CH0, 1) |@@ -1362,7 +1363,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)PHY_STATUS_SPLINE_LDO (DPIO_PHY0 ,DPIO_CH1 ,0 ) | PHY_STATUS_SPLINE_LDO(DPIO_PHY0, DPIO_CH1, 1)); -if (!dev_priv->display.power.chv_phy_assert[DPIO_PHY1 ]) +if (!display->power.chv_phy_assert[DPIO_PHY1 ]) phy_status_mask &= ~(PHY_STATUS_CMN_LDO (DPIO_PHY1 ,DPIO_CH0 ) |PHY_STATUS_SPLINE_LDO (DPIO_PHY1 ,DPIO_CH0 ,0 ) |PHY_STATUS_SPLINE_LDO (DPIO_PHY1 ,DPIO_CH0 ,1 ));@@ -1390,7 +1391,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)*/ if (BITS_SET (phy_control,PHY_CH_POWER_DOWN_OVRD (0xf ,DPIO_PHY0 ,DPIO_CH1 )) && - (intel_de_read (dev_priv,DPLL (dev_priv,PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) + (intel_de_read (display,DPLL (display,PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) phy_status |=PHY_STATUS_CMN_LDO (DPIO_PHY0 ,DPIO_CH1 ); if (BITS_SET(phy_control,@@ -1433,12 +1434,12 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)* The PHY may be busy with some initial calibration and whatnot, * so the power state can take a while to actually change. */ -if (intel_de_wait (dev_priv,DISPLAY_PHY_STATUS , +if (intel_de_wait (display,DISPLAY_PHY_STATUS , phy_status_mask, phy_status,10 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"Unexpected PHY_STATUS 0x%08x, expected 0x%08x (PHY_CONTROL=0x%08x)\n" , -intel_de_read (dev_priv,DISPLAY_PHY_STATUS ) & phy_status_mask, - phy_status, dev_priv->display.power.chv_phy_control); +intel_de_read (display,DISPLAY_PHY_STATUS ) & phy_status_mask, + phy_status, display->power.chv_phy_control); }#undef BITS_SET@@ -1446,11 +1447,12 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)static void chv_dpio_cmn_power_well_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { +struct intel_display *display = &dev_priv->display;enum i915_power_well_id id =i915_power_well_instance (power_well)->id;enum dpio_phy phy;u32 tmp; -drm_WARN_ON_ONCE (&dev_priv->drm, +drm_WARN_ON_ONCE (display->drm, id !=VLV_DISP_PW_DPIO_CMN_BC && id !=CHV_DISP_PW_DPIO_CMN_D );@@ -1464,9 +1466,9 @@ static void chv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,vlv_set_power_well (dev_priv, power_well, true);/* Poll for phypwrgood signal */ -if (intel_de_wait_for_set (dev_priv,DISPLAY_PHY_STATUS , +if (intel_de_wait_for_set (display,DISPLAY_PHY_STATUS ,PHY_POWERGOOD (phy),1 )) -drm_err (&dev_priv->drm,"Display PHY %d is not power up\n" , +drm_err (display->drm,"Display PHY %d is not power up\n" , phy);vlv_dpio_get (dev_priv);@@ -1494,24 +1496,25 @@ static void chv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,vlv_dpio_put (dev_priv); - dev_priv->display.power.chv_phy_control |=PHY_COM_LANE_RESET_DEASSERT (phy); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); + display->power.chv_phy_control |=PHY_COM_LANE_RESET_DEASSERT (phy); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Enabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n" , - phy, dev_priv->display.power.chv_phy_control); + phy, display->power.chv_phy_control); -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display); }static void chv_dpio_cmn_power_well_disable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { +struct intel_display *display = &dev_priv->display;enum i915_power_well_id id =i915_power_well_instance (power_well)->id;enum dpio_phy phy; -drm_WARN_ON_ONCE (&dev_priv->drm, +drm_WARN_ON_ONCE (display->drm, id !=VLV_DISP_PW_DPIO_CMN_BC && id !=CHV_DISP_PW_DPIO_CMN_D );@@ -1524,20 +1527,20 @@ static void chv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,assert_pll_disabled (dev_priv,PIPE_C ); } - dev_priv->display.power.chv_phy_control &= ~PHY_COM_LANE_RESET_DEASSERT (phy); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); + display->power.chv_phy_control &= ~PHY_COM_LANE_RESET_DEASSERT (phy); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control);vlv_set_power_well (dev_priv, power_well, false); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Disabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n" , - phy, dev_priv->display.power.chv_phy_control); + phy, display->power.chv_phy_control);/* PHY is fully reset now, so we can enable the PHY state asserts */ - dev_priv->display.power.chv_phy_assert[phy] = true; + display->power.chv_phy_assert[phy] = true; -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display); } static void assert_chv_phy_powergate(struct drm_i915_private *dev_priv, enum dpio_phy phy,@@ -1607,29 +1610,30 @@ static void assert_chv_phy_powergate(struct drm_i915_private *dev_priv, enum dpibool chv_phy_powergate_ch (struct drm_i915_private *dev_priv,enum dpio_phy phy,enum dpio_channel ch,bool override) { -struct i915_power_domains *power_domains = &dev_priv->display.power.domains; +struct intel_display *display = &dev_priv->display; +struct i915_power_domains *power_domains = &display->power.domains;bool was_override;mutex_lock (&power_domains->lock); - was_override = dev_priv->display.power.chv_phy_control &PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + was_override = display->power.chv_phy_control &PHY_CH_POWER_DOWN_OVRD_EN (phy, ch);if (override == was_override) goto out;if (override) - dev_priv->display.power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch);else - dev_priv->display.power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Power gating DPIO PHY%d CH%d (DPIO_PHY_CONTROL=0x%08x)\n" , - phy, ch, dev_priv->display.power.chv_phy_control); + phy, ch, display->power.chv_phy_control); -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display); out:mutex_unlock (&power_domains->lock);@@ -1640,29 +1644,30 @@ bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,void chv_phy_powergate_lanes (struct intel_encoder *encoder,bool override,unsigned int mask) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -struct i915_power_domains *power_domains = &dev_priv->display.power.domains; +struct i915_power_domains *power_domains = &display->power.domains;enum dpio_phy phy =vlv_dig_port_to_phy (enc_to_dig_port (encoder));enum dpio_channel ch =vlv_dig_port_to_channel (enc_to_dig_port (encoder));mutex_lock (&power_domains->lock); - dev_priv->display.power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD (0xf , phy, ch); - dev_priv->display.power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD (mask, phy, ch); + display->power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD (0xf , phy, ch); + display->power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD (mask, phy, ch);if (override) - dev_priv->display.power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control |=PHY_CH_POWER_DOWN_OVRD_EN (phy, ch);else - dev_priv->display.power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); + display->power.chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); -intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , - dev_priv->display.power.chv_phy_control); +intel_de_write (display,DISPLAY_PHY_CONTROL , + display->power.chv_phy_control); -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"Power gating DPIO PHY%d CH%d lanes 0x%x (PHY_CONTROL=0x%08x)\n" , - phy, ch, mask, dev_priv->display.power.chv_phy_control); + phy, ch, mask, display->power.chv_phy_control); -assert_chv_phy_status (dev_priv); +assert_chv_phy_status (display);assert_chv_phy_powergate (dev_priv, phy, ch, override, mask);Signature · 1 line
2.39.5
Re: [PATCH 09/11] drm/i915/ips: convert to struct intel_display
In reply to Jani NikulaQuoted 4 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch HSW IPS code over to it.Signed-off-by Jani Nikula <[email protected]>
Quoted 187 lines
--- drivers/gpu/drm/i915/display/hsw_ips.c | 47 ++++++++++++++------------ 1 file changed, 26 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/display/hsw_ips.c +26
-21@@ -15,6 +15,7 @@static void hsw_ips_enable (const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);u32 val;@@ -27,16 +28,16 @@ static void hsw_ips_enable(const struct intel_crtc_state *crtc_state)* This function is called from post_plane_update, which is run after * a vblank wait. */ -drm_WARN_ON (&i915->drm, +drm_WARN_ON (display->drm, !(crtc_state->active_planes & ~BIT (PLANE_CURSOR ))); val =IPS_ENABLE ; -if (i915->display.ips.false_color) +if (display->ips.false_color) val |=IPS_FALSE_COLOR ;if (IS_BROADWELL (i915)) { -drm_WARN_ON (&i915->drm, +drm_WARN_ON (display->drm,snb_pcode_write (&i915->uncore,DISPLAY_IPS_CONTROL , val |IPS_PCODE_CONTROL ));/* @@ -46,7 +47,7 @@ static void hsw_ips_enable(const struct intel_crtc_state *crtc_state)* so we need to just enable it and continue on. */ }else { -intel_de_write (i915,IPS_CTL , val); +intel_de_write (display,IPS_CTL , val);/* * The bit only becomes 1 in the next vblank, so this wait here * is essentially intel_wait_for_vblank. If we don't have this @@ -54,14 +55,15 @@ static void hsw_ips_enable(const struct intel_crtc_state *crtc_state)* the HW state readout code will complain that the expected * IPS_CTL value is not the one we read. */ -if (intel_de_wait_for_set (i915,IPS_CTL ,IPS_ENABLE ,50 )) -drm_err (&i915->drm, +if (intel_de_wait_for_set (display,IPS_CTL ,IPS_ENABLE ,50 )) +drm_err (display->drm,"Timed out waiting for IPS enable\n" ); } }bool hsw_ips_disable (const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);bool need_vblank_wait = false;@@ -70,19 +72,19 @@ bool hsw_ips_disable(const struct intel_crtc_state *crtc_state)return need_vblank_wait;if (IS_BROADWELL (i915)) { -drm_WARN_ON (&i915->drm, +drm_WARN_ON (display->drm,snb_pcode_write (&i915->uncore,DISPLAY_IPS_CONTROL ,0 ));/* * Wait for PCODE to finish disabling IPS. The BSpec specified * 42ms timeout value leads to occasional timeouts so use 100ms * instead. */ -if (intel_de_wait_for_clear (i915,IPS_CTL ,IPS_ENABLE ,100 )) -drm_err (&i915->drm, +if (intel_de_wait_for_clear (display,IPS_CTL ,IPS_ENABLE ,100 )) +drm_err (display->drm,"Timed out waiting for IPS disable\n" ); }else { -intel_de_write (i915,IPS_CTL ,0 ); -intel_de_posting_read (i915,IPS_CTL ); +intel_de_write (display,IPS_CTL ,0 ); +intel_de_posting_read (display,IPS_CTL ); }/* We need to wait for a vblank before we can disable the plane. */ @@ -188,6 +190,7 @@ bool hsw_crtc_supports_ips(struct intel_crtc *crtc)bool hsw_crtc_state_ips_capable (const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);@@ -195,7 +198,7 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)if (!hsw_crtc_supports_ips (crtc))return false; -if (!i915->display.params.enable_ips) +if (!display->params.enable_ips)return false;if (crtc_state->pipe_bpp >24 )@@ -209,7 +212,7 @@ bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state)* Should measure whether using a lower cdclk w/o IPS */ if (IS_BROADWELL (i915) && - crtc_state->pixel_rate > i915->display.cdclk.max_cdclk_freq *95 /100 ) + crtc_state->pixel_rate > display->cdclk.max_cdclk_freq *95 /100 )return false;return true;@@ -259,6 +262,7 @@ int hsw_ips_compute_config(struct intel_atomic_state *state,void hsw_ips_get_config (struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (crtc_state);struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);@@ -266,7 +270,7 @@ void hsw_ips_get_config(struct intel_crtc_state *crtc_state)return ;if (IS_HASWELL (i915)) { - crtc_state->ips_enabled =intel_de_read (i915,IPS_CTL ) &IPS_ENABLE ; + crtc_state->ips_enabled =intel_de_read (display,IPS_CTL ) &IPS_ENABLE ; }else {/* * We cannot readout IPS state on broadwell, set to @@ -280,9 +284,9 @@ void hsw_ips_get_config(struct intel_crtc_state *crtc_state)static int hsw_ips_debugfs_false_color_get (void *data,u64 *val) {struct intel_crtc *crtc = data; -struct drm_i915_private *i915 =to_i915 (crtc->base.dev); +struct intel_display *display =to_intel_display (crtc); - *val = i915->display.ips.false_color; + *val = display->ips.false_color;return 0 ; }@@ -290,7 +294,7 @@ static int hsw_ips_debugfs_false_color_get(void *data, u64 *val)static int hsw_ips_debugfs_false_color_set (void *data,u64 val) {struct intel_crtc *crtc = data; -struct drm_i915_private *i915 =to_i915 (crtc->base.dev); +struct intel_display *display =to_intel_display (crtc);struct intel_crtc_state *crtc_state;int ret;@@ -298,7 +302,7 @@ static int hsw_ips_debugfs_false_color_set(void *data, u64 val)if (ret)return ret; - i915->display.ips.false_color = val; + display->ips.false_color = val; crtc_state =to_intel_crtc_state (crtc->base.state);@@ -325,18 +329,19 @@ DEFINE_DEBUGFS_ATTRIBUTE(hsw_ips_debugfs_false_color_fops,static int hsw_ips_debugfs_status_show (struct seq_file *m,void *unused) {struct intel_crtc *crtc = m->private; +struct intel_display *display =to_intel_display (crtc);struct drm_i915_private *i915 =to_i915 (crtc->base.dev);intel_wakeref_t wakeref; wakeref =intel_runtime_pm_get (&i915->runtime_pm);seq_printf (m,"Enabled by kernel parameter: %s\n" , -str_yes_no (i915->display.params.enable_ips)); +str_yes_no (display->params.enable_ips)); -if (DISPLAY_VER (i915) >=8 ) { +if (DISPLAY_VER (display) >=8 ) {seq_puts (m,"Currently: unknown\n" ); }else { -if (intel_de_read (i915,IPS_CTL ) &IPS_ENABLE ) +if (intel_de_read (display,IPS_CTL ) &IPS_ENABLE )seq_puts (m,"Currently: enabled\n" );else seq_puts (m,"Currently: disabled\n" );Signature · 1 line
2.39.5
Re: [PATCH 10/11] drm/i915/dsi: convert to struct intel_display
In reply to Jani NikulaQuoted 9 lines · Jani Nikula
struct
intel_displaywill replace structdrm_i915_privateas the main device pointer for display code. Switch ICL DSI code over to it.Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 444 ++++++++++++----------- drivers/gpu/drm/i915/display/icl_dsi.h | 4 +- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- 3 files changed, 227 insertions(+), 223 deletions(-)
I think I need more coffee after this one :)
Quoted 1,402 lines
drivers/gpu/drm/i915/display/icl_dsi.c +224
-220@@ -51,38 +51,38 @@#include "skl_scaler.h" #include "skl_universal_plane.h" -static int header_credits_available (struct drm_i915_private *dev_priv, +static int header_credits_available (struct intel_display *display,enum transcoder dsi_trans) { -return (intel_de_read (dev_priv,DSI_CMD_TXCTL (dsi_trans)) &FREE_HEADER_CREDIT_MASK ) +return (intel_de_read (display,DSI_CMD_TXCTL (dsi_trans)) &FREE_HEADER_CREDIT_MASK ) >>FREE_HEADER_CREDIT_SHIFT ; } -static int payload_credits_available (struct drm_i915_private *dev_priv, +static int payload_credits_available (struct intel_display *display,enum transcoder dsi_trans) { -return (intel_de_read (dev_priv,DSI_CMD_TXCTL (dsi_trans)) &FREE_PLOAD_CREDIT_MASK ) +return (intel_de_read (display,DSI_CMD_TXCTL (dsi_trans)) &FREE_PLOAD_CREDIT_MASK ) >>FREE_PLOAD_CREDIT_SHIFT ; } -static bool wait_for_header_credits (struct drm_i915_private *dev_priv, +static bool wait_for_header_credits (struct intel_display *display,enum transcoder dsi_trans,int hdr_credit) { -if (wait_for_us (header_credits_available (dev_priv, dsi_trans) >= +if (wait_for_us (header_credits_available (display, dsi_trans) >= hdr_credit,100 )) { -drm_err (&dev_priv->drm,"DSI header credits not released\n" ); +drm_err (display->drm,"DSI header credits not released\n" );return false; }return true; } -static bool wait_for_payload_credits (struct drm_i915_private *dev_priv, +static bool wait_for_payload_credits (struct intel_display *display,enum transcoder dsi_trans,int payld_credit) { -if (wait_for_us (payload_credits_available (dev_priv, dsi_trans) >= +if (wait_for_us (payload_credits_available (display, dsi_trans) >= payld_credit,100 )) { -drm_err (&dev_priv->drm,"DSI payload credits not released\n" ); +drm_err (display->drm,"DSI payload credits not released\n" );return false; }@@ -99,7 +99,7 @@ static enum transcoder dsi_port_to_transcoder(enum port port)static void wait_for_cmds_dispatched_to_panel (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct mipi_dsi_device *dsi;enum port port;@@ -109,8 +109,8 @@ static void wait_for_cmds_dispatched_to_panel(struct intel_encoder *encoder)/* wait for header/payload credits to be released */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -wait_for_header_credits (dev_priv, dsi_trans,MAX_HEADER_CREDIT ); -wait_for_payload_credits (dev_priv, dsi_trans,MAX_PLOAD_CREDIT ); +wait_for_header_credits (display, dsi_trans,MAX_HEADER_CREDIT ); +wait_for_payload_credits (display, dsi_trans,MAX_PLOAD_CREDIT ); }/* send nop DCS command */ @@ -120,22 +120,22 @@ static void wait_for_cmds_dispatched_to_panel(struct intel_encoder *encoder) dsi->channel =0 ; ret =mipi_dsi_dcs_nop (dsi);if (ret <0 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"error sending DCS NOP command\n" ); }/* wait for header credits to be released */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -wait_for_header_credits (dev_priv, dsi_trans,MAX_HEADER_CREDIT ); +wait_for_header_credits (display, dsi_trans,MAX_HEADER_CREDIT ); }/* wait for LP TX in progress bit to be cleared */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -if (wait_for_us (!(intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)) & +if (wait_for_us (!(intel_de_read (display,DSI_LP_MSG (dsi_trans)) &LPTX_IN_PROGRESS ),20 )) -drm_err (&dev_priv->drm,"LPTX bit not cleared\n" ); +drm_err (display->drm,"LPTX bit not cleared\n" ); } }@@ -143,7 +143,7 @@ static int dsi_send_pkt_payld(struct intel_dsi_host *host, const struct mipi_dsi_packet *packet) {struct intel_dsi *intel_dsi = host->intel_dsi; -struct drm_i915_private *i915 =to_i915 (intel_dsi->base.base.dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);enum transcoder dsi_trans =dsi_port_to_transcoder (host->port);const u8 *data = packet->payload;u32 len = packet->payload_length;@@ -151,20 +151,20 @@ static int dsi_send_pkt_payld(struct intel_dsi_host *host,/* payload queue can accept *256 bytes*, check limit */ if (len >MAX_PLOAD_CREDIT *4 ) { -drm_err (&i915->drm,"payload size exceeds max queue limit\n" ); +drm_err (display->drm,"payload size exceeds max queue limit\n" );return -EINVAL ; }for (i =0 ; i < len; i +=4 ) {u32 tmp =0 ; -if (!wait_for_payload_credits (i915, dsi_trans,1 )) +if (!wait_for_payload_credits (display, dsi_trans,1 ))return -EBUSY ;for (j =0 ; j <min_t (u32, len - i,4 ); j++) tmp |= *data++ <<8 * j; -intel_de_write (i915,DSI_CMD_TXPYLD (dsi_trans), tmp); +intel_de_write (display,DSI_CMD_TXPYLD (dsi_trans), tmp); }return 0 ;@@ -175,14 +175,14 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host, bool enable_lpdt) {struct intel_dsi *intel_dsi = host->intel_dsi; -struct drm_i915_private *dev_priv =to_i915 (intel_dsi->base.base.dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);enum transcoder dsi_trans =dsi_port_to_transcoder (host->port);u32 tmp; -if (!wait_for_header_credits (dev_priv, dsi_trans,1 )) +if (!wait_for_header_credits (display, dsi_trans,1 ))return -EBUSY ; - tmp =intel_de_read (dev_priv,DSI_CMD_TXHDR (dsi_trans)); + tmp =intel_de_read (display,DSI_CMD_TXHDR (dsi_trans));if (packet->payload) tmp |=PAYLOAD_PRESENT ;@@ -201,15 +201,14 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host, tmp |= ((packet->header[0 ] &DT_MASK ) <<DT_SHIFT ); tmp |= (packet->header[1 ] <<PARAM_WC_LOWER_SHIFT ); tmp |= (packet->header[2 ] <<PARAM_WC_UPPER_SHIFT ); -intel_de_write (dev_priv,DSI_CMD_TXHDR (dsi_trans), tmp); +intel_de_write (display,DSI_CMD_TXHDR (dsi_trans), tmp);return 0 ; }void icl_dsi_frame_update (struct intel_crtc_state *crtc_state) { -struct intel_crtc *crtc =to_intel_crtc (crtc_state->uapi.crtc); -struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); +struct intel_display *display =to_intel_display (crtc_state);u32 mode_flags;enum port port;@@ -227,12 +226,13 @@ void icl_dsi_frame_update(struct intel_crtc_state *crtc_state)else return ; -intel_de_rmw (dev_priv,DSI_CMD_FRMCTL (port),0 ,DSI_FRAME_UPDATE_REQUEST ); +intel_de_rmw (display,DSI_CMD_FRMCTL (port),0 , +DSI_FRAME_UPDATE_REQUEST ); }static void dsi_program_swing_and_deemphasis (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum phy phy;u32 tmp, mask, val;@@ -246,31 +246,31 @@ static void dsi_program_swing_and_deemphasis(struct intel_encoder *encoder) mask =SCALING_MODE_SEL_MASK |RTERM_SELECT_MASK ; val =SCALING_MODE_SEL (0x2 ) |TAP2_DISABLE |TAP3_DISABLE |RTERM_SELECT (0x6 ); - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW5_LN (0 , phy)); tmp &= ~mask; tmp |= val; -intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW5_AUX (phy), mask, val); +intel_de_write (display,ICL_PORT_TX_DW5_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW5_AUX (phy), mask, val); mask =SWING_SEL_LOWER_MASK |SWING_SEL_UPPER_MASK |RCOMP_SCALAR_MASK ; val =SWING_SEL_UPPER (0x2 ) |SWING_SEL_LOWER (0x2 ) |RCOMP_SCALAR (0x98 ); - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW2_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW2_LN (0 , phy)); tmp &= ~mask; tmp |= val; -intel_de_write (dev_priv,ICL_PORT_TX_DW2_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW2_AUX (phy), mask, val); +intel_de_write (display,ICL_PORT_TX_DW2_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW2_AUX (phy), mask, val); mask =POST_CURSOR_1_MASK |POST_CURSOR_2_MASK |CURSOR_COEFF_MASK ; val =POST_CURSOR_1 (0x0 ) |POST_CURSOR_2 (0x0 ) |CURSOR_COEFF (0x3f ); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_AUX (phy), mask, val); +intel_de_rmw (display,ICL_PORT_TX_DW4_AUX (phy), mask, val);/* Bspec: must not use GRP register for write */ for (lane =0 ; lane <=3 ; lane++) -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_LN (lane, phy), +intel_de_rmw (display,ICL_PORT_TX_DW4_LN (lane, phy), mask, val); } }@@ -278,13 +278,13 @@ static void dsi_program_swing_and_deemphasis(struct intel_encoder *encoder)static void configure_dual_link_mode (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);i915_reg_t dss_ctl1_reg, dss_ctl2_reg;u32 dss_ctl1;/* FIXME: Move all DSS handling to intel_vdsc.c */ -if (DISPLAY_VER (dev_priv) >=12 ) { +if (DISPLAY_VER (display) >=12 ) {struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); dss_ctl1_reg =ICL_PIPE_DSS_CTL1 (crtc->pipe);@@ -294,7 +294,7 @@ static void configure_dual_link_mode(struct intel_encoder *encoder, dss_ctl2_reg =DSS_CTL2 ; } - dss_ctl1 =intel_de_read (dev_priv, dss_ctl1_reg); + dss_ctl1 =intel_de_read (display, dss_ctl1_reg); dss_ctl1 |=SPLITTER_ENABLE ; dss_ctl1 &= ~OVERLAP_PIXELS_MASK ; dss_ctl1 |=OVERLAP_PIXELS (intel_dsi->pixel_overlap);@@ -309,19 +309,19 @@ static void configure_dual_link_mode(struct intel_encoder *encoder, dl_buffer_depth = hactive /2 + intel_dsi->pixel_overlap;if (dl_buffer_depth >MAX_DL_BUFFER_TARGET_DEPTH ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DL buffer depth exceed max value\n" ); dss_ctl1 &= ~LEFT_DL_BUF_TARGET_DEPTH_MASK ; dss_ctl1 |=LEFT_DL_BUF_TARGET_DEPTH (dl_buffer_depth); -intel_de_rmw (dev_priv, dss_ctl2_reg,RIGHT_DL_BUF_TARGET_DEPTH_MASK , +intel_de_rmw (display, dss_ctl2_reg,RIGHT_DL_BUF_TARGET_DEPTH_MASK ,RIGHT_DL_BUF_TARGET_DEPTH (dl_buffer_depth)); }else {/* Interleave */ dss_ctl1 |=DUAL_LINK_MODE_INTERLEAVE ; } -intel_de_write (dev_priv, dss_ctl1_reg, dss_ctl1); +intel_de_write (display, dss_ctl1_reg, dss_ctl1); }/* aka DSI 8X clock */ @@ -342,6 +342,7 @@ static int afe_clk(struct intel_encoder *encoder,static void gen11_dsi_program_esc_clk_div (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;@@ -361,33 +362,34 @@ static void gen11_dsi_program_esc_clk_div(struct intel_encoder *encoder, }for_each_dsi_port (port, intel_dsi->ports) { -intel_de_write (dev_priv,ICL_DSI_ESC_CLK_DIV (port), +intel_de_write (display,ICL_DSI_ESC_CLK_DIV (port), esc_clk_div_m &ICL_ESC_CLK_DIV_MASK ); -intel_de_posting_read (dev_priv,ICL_DSI_ESC_CLK_DIV (port)); +intel_de_posting_read (display,ICL_DSI_ESC_CLK_DIV (port)); }for_each_dsi_port (port, intel_dsi->ports) { -intel_de_write (dev_priv,ICL_DPHY_ESC_CLK_DIV (port), +intel_de_write (display,ICL_DPHY_ESC_CLK_DIV (port), esc_clk_div_m &ICL_ESC_CLK_DIV_MASK ); -intel_de_posting_read (dev_priv,ICL_DPHY_ESC_CLK_DIV (port)); +intel_de_posting_read (display,ICL_DPHY_ESC_CLK_DIV (port)); }if (IS_ALDERLAKE_S (dev_priv) ||IS_ALDERLAKE_P (dev_priv)) {for_each_dsi_port (port, intel_dsi->ports) { -intel_de_write (dev_priv,ADL_MIPIO_DW (port,8 ), +intel_de_write (display,ADL_MIPIO_DW (port,8 ), esc_clk_div_m_phy &TX_ESC_CLK_DIV_PHY ); -intel_de_posting_read (dev_priv,ADL_MIPIO_DW (port,8 )); +intel_de_posting_read (display,ADL_MIPIO_DW (port,8 )); } } } -static void get_dsi_io_power_domains (struct drm_i915_private *dev_priv, -struct intel_dsi *intel_dsi) +static void get_dsi_io_power_domains (struct intel_dsi *intel_dsi) { +struct intel_display *display =to_intel_display (&intel_dsi->base); +struct drm_i915_private *dev_priv =to_i915 (display->drm);enum port port;for_each_dsi_port (port, intel_dsi->ports) { -drm_WARN_ON (&dev_priv->drm, intel_dsi->io_wakeref[port]); +drm_WARN_ON (display->drm, intel_dsi->io_wakeref[port]); intel_dsi->io_wakeref[port] = intel_display_power_get(dev_priv, port == PORT_A ?@@ -398,15 +400,15 @@ static void get_dsi_io_power_domains(struct drm_i915_private *dev_priv,static void gen11_dsi_enable_io_power (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,ICL_DSI_IO_MODECTL (port), +intel_de_rmw (display,ICL_DSI_IO_MODECTL (port),0 ,COMBO_PHY_MODE_DSI ); -get_dsi_io_power_domains (dev_priv, intel_dsi); +get_dsi_io_power_domains (intel_dsi); }static void gen11_dsi_power_up_lanes (struct intel_encoder *encoder)@@ -422,6 +424,7 @@ static void gen11_dsi_power_up_lanes(struct intel_encoder *encoder)static void gen11_dsi_config_phy_lanes_sequence (struct intel_encoder *encoder) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum phy phy;@@ -430,32 +433,33 @@ static void gen11_dsi_config_phy_lanes_sequence(struct intel_encoder *encoder)/* Step 4b(i) set loadgen select for transmit and aux lanes */ for_each_dsi_phy (phy, intel_dsi->phys) { -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_AUX (phy),LOADGEN_SELECT ,0 ); +intel_de_rmw (display,ICL_PORT_TX_DW4_AUX (phy), +LOADGEN_SELECT ,0 );for (lane =0 ; lane <=3 ; lane++) -intel_de_rmw (dev_priv,ICL_PORT_TX_DW4_LN (lane, phy), +intel_de_rmw (display,ICL_PORT_TX_DW4_LN (lane, phy),LOADGEN_SELECT , lane !=2 ?LOADGEN_SELECT :0 ); }/* Step 4b(ii) set latency optimization for transmit and aux lanes */ for_each_dsi_phy (phy, intel_dsi->phys) { -intel_de_rmw (dev_priv,ICL_PORT_TX_DW2_AUX (phy), +intel_de_rmw (display,ICL_PORT_TX_DW2_AUX (phy),FRC_LATENCY_OPTIM_MASK ,FRC_LATENCY_OPTIM_VAL (0x5 )); - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW2_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW2_LN (0 , phy)); tmp &= ~FRC_LATENCY_OPTIM_MASK ; tmp |=FRC_LATENCY_OPTIM_VAL (0x5 ); -intel_de_write (dev_priv,ICL_PORT_TX_DW2_GRP (phy), tmp); +intel_de_write (display,ICL_PORT_TX_DW2_GRP (phy), tmp);/* For EHL, TGL, set latency optimization for PCS_DW1 lanes */ if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv) || - (DISPLAY_VER (dev_priv) >=12 )) { -intel_de_rmw (dev_priv,ICL_PORT_PCS_DW1_AUX (phy), + (DISPLAY_VER (display) >=12 )) { +intel_de_rmw (display,ICL_PORT_PCS_DW1_AUX (phy),LATENCY_OPTIM_MASK ,LATENCY_OPTIM_VAL (0 )); - tmp =intel_de_read (dev_priv, + tmp =intel_de_read (display,ICL_PORT_PCS_DW1_LN (0 , phy)); tmp &= ~LATENCY_OPTIM_MASK ; tmp |=LATENCY_OPTIM_VAL (0x1 ); -intel_de_write (dev_priv,ICL_PORT_PCS_DW1_GRP (phy), +intel_de_write (display,ICL_PORT_PCS_DW1_GRP (phy), tmp); } }@@ -464,17 +468,17 @@ static void gen11_dsi_config_phy_lanes_sequence(struct intel_encoder *encoder)static void gen11_dsi_voltage_swing_program_seq (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;enum phy phy;/* clear common keeper enable bit */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =intel_de_read (dev_priv,ICL_PORT_PCS_DW1_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_PCS_DW1_LN (0 , phy)); tmp &= ~COMMON_KEEPER_EN ; -intel_de_write (dev_priv,ICL_PORT_PCS_DW1_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_PCS_DW1_AUX (phy),COMMON_KEEPER_EN ,0 ); +intel_de_write (display,ICL_PORT_PCS_DW1_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_PCS_DW1_AUX (phy),COMMON_KEEPER_EN ,0 ); }/* @@ -483,14 +487,15 @@ static void gen11_dsi_voltage_swing_program_seq(struct intel_encoder *encoder)* as part of lane phy sequence configuration */ for_each_dsi_phy (phy, intel_dsi->phys) -intel_de_rmw (dev_priv,ICL_PORT_CL_DW5 (phy),0 ,SUS_CLOCK_CONFIG ); +intel_de_rmw (display,ICL_PORT_CL_DW5 (phy),0 , +SUS_CLOCK_CONFIG );/* Clear training enable to change swing values */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW5_LN (0 , phy)); tmp &= ~TX_TRAINING_EN ; -intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW5_AUX (phy),TX_TRAINING_EN ,0 ); +intel_de_write (display,ICL_PORT_TX_DW5_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW5_AUX (phy),TX_TRAINING_EN ,0 ); }/* Program swing and de-emphasis */ @@ -498,26 +503,26 @@ static void gen11_dsi_voltage_swing_program_seq(struct intel_encoder *encoder)/* Set training enable to trigger update */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN (0 , phy)); + tmp =intel_de_read (display,ICL_PORT_TX_DW5_LN (0 , phy)); tmp |=TX_TRAINING_EN ; -intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); -intel_de_rmw (dev_priv,ICL_PORT_TX_DW5_AUX (phy),0 ,TX_TRAINING_EN ); +intel_de_write (display,ICL_PORT_TX_DW5_GRP (phy), tmp); +intel_de_rmw (display,ICL_PORT_TX_DW5_AUX (phy),0 ,TX_TRAINING_EN ); } }static void gen11_dsi_enable_ddi_buffer (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;for_each_dsi_port (port, intel_dsi->ports) { -intel_de_rmw (dev_priv,DDI_BUF_CTL (port),0 ,DDI_BUF_CTL_ENABLE ); +intel_de_rmw (display,DDI_BUF_CTL (port),0 ,DDI_BUF_CTL_ENABLE ); -if (wait_for_us (!(intel_de_read (dev_priv,DDI_BUF_CTL (port)) & +if (wait_for_us (!(intel_de_read (display,DDI_BUF_CTL (port)) &DDI_BUF_IS_IDLE ),500 )) -drm_err (&dev_priv->drm,"DDI port:%c buffer idle\n" , +drm_err (display->drm,"DDI port:%c buffer idle\n" ,port_name (port)); } }@@ -526,6 +531,7 @@ static void gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { + struct intel_display *display = to_intel_display(encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;@@ -533,12 +539,12 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,/* Program DPHY clock lanes timings */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DPHY_CLK_TIMING_PARAM (port), +intel_de_write (display,DPHY_CLK_TIMING_PARAM (port), intel_dsi->dphy_reg);/* Program DPHY data lanes timings */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DPHY_DATA_TIMING_PARAM (port), +intel_de_write (display,DPHY_DATA_TIMING_PARAM (port), intel_dsi->dphy_data_lane_reg);/* @@ -547,10 +553,10 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,* a value '0' inside TA_PARAM_REGISTERS otherwise * leave all fields at HW default values. */ -if (DISPLAY_VER (dev_priv) ==11 ) { +if (DISPLAY_VER (display) ==11 ) {if (afe_clk (encoder, crtc_state) <=800000 ) {for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,DPHY_TA_TIMING_PARAM (port), +intel_de_rmw (display,DPHY_TA_TIMING_PARAM (port),TA_SURE_MASK ,TA_SURE_OVERRIDE |TA_SURE (0 )); }@@ -558,7 +564,7 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,if (IS_JASPERLAKE (dev_priv) ||IS_ELKHARTLAKE (dev_priv)) {for_each_dsi_phy (phy, intel_dsi->phys) -intel_de_rmw (dev_priv,ICL_DPHY_CHKN (phy), +intel_de_rmw (display,ICL_DPHY_CHKN (phy),0 ,ICL_DPHY_CHKN_AFE_OVER_PPI_STRAP ); } }@@ -567,30 +573,30 @@ static void gen11_dsi_setup_timings(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;/* Program T-INIT master registers */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,ICL_DSI_T_INIT_MASTER (port), +intel_de_rmw (display,ICL_DSI_T_INIT_MASTER (port),DSI_T_INIT_MASTER_MASK , intel_dsi->init_count);/* shadow register inside display core */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DSI_CLK_TIMING_PARAM (port), +intel_de_write (display,DSI_CLK_TIMING_PARAM (port), intel_dsi->dphy_reg);/* shadow register inside display core */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_write (dev_priv,DSI_DATA_TIMING_PARAM (port), +intel_de_write (display,DSI_DATA_TIMING_PARAM (port), intel_dsi->dphy_data_lane_reg);/* shadow register inside display core */ -if (DISPLAY_VER (dev_priv) ==11 ) { +if (DISPLAY_VER (display) ==11 ) {if (afe_clk (encoder, crtc_state) <=800000 ) {for_each_dsi_port (port, intel_dsi->ports) { -intel_de_rmw (dev_priv,DSI_TA_TIMING_PARAM (port), +intel_de_rmw (display,DSI_TA_TIMING_PARAM (port),TA_SURE_MASK ,TA_SURE_OVERRIDE |TA_SURE (0 )); }@@ -600,45 +606,45 @@ gen11_dsi_setup_timings(struct intel_encoder *encoder,static void gen11_dsi_gate_clocks (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;enum phy phy; -mutex_lock (&dev_priv->display.dpll.lock); - tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); +mutex_lock (&display->dpll.lock); + tmp =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) tmp |=ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , tmp); -mutex_unlock (&dev_priv->display.dpll.lock); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , tmp); +mutex_unlock (&display->dpll.lock); }static void gen11_dsi_ungate_clocks (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;enum phy phy; -mutex_lock (&dev_priv->display.dpll.lock); - tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); +mutex_lock (&display->dpll.lock); + tmp =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) tmp &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , tmp); -mutex_unlock (&dev_priv->display.dpll.lock); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , tmp); +mutex_unlock (&display->dpll.lock); }static bool gen11_dsi_is_clock_enabled (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);bool clock_enabled = false;enum phy phy;u32 tmp; - tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); + tmp =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) {if (!(tmp &ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy)))@@ -651,36 +657,36 @@ static bool gen11_dsi_is_clock_enabled(struct intel_encoder *encoder)static void gen11_dsi_map_pll (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct intel_shared_dpll *pll = crtc_state->shared_dpll;enum phy phy;u32 val; -mutex_lock (&dev_priv->display.dpll.lock); +mutex_lock (&display->dpll.lock); - val =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); + val =intel_de_read (display,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) { val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); val |=ICL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll->info->id, phy); } -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , val);for_each_dsi_phy (phy, intel_dsi->phys) { val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); } -intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val); +intel_de_write (display,ICL_DPCLKA_CFGCR0 , val); -intel_de_posting_read (dev_priv,ICL_DPCLKA_CFGCR0 ); +intel_de_posting_read (display,ICL_DPCLKA_CFGCR0 ); -mutex_unlock (&dev_priv->display.dpll.lock); +mutex_unlock (&display->dpll.lock); }static void gen11_dsi_configure_transcoder (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc);enum pipe pipe = crtc->pipe;@@ -690,7 +696,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =intel_de_read (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans)); + tmp =intel_de_read (display,DSI_TRANS_FUNC_CONF (dsi_trans));if (intel_dsi->eotp_pkt) tmp &= ~EOTP_DISABLED ;@@ -746,7 +752,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, } } -if (DISPLAY_VER (dev_priv) >=12 ) { +if (DISPLAY_VER (display) >=12 ) {if (is_vid_mode (intel_dsi)) tmp |=BLANKING_PACKET_ENABLE ; }@@ -779,15 +785,15 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, tmp |=TE_SOURCE_GPIO ; } -intel_de_write (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans), tmp); +intel_de_write (display,DSI_TRANS_FUNC_CONF (dsi_trans), tmp); }/* enable port sync mode if dual link */ if (intel_dsi->dual_link) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv, -TRANS_DDI_FUNC_CTL2 (dev_priv, dsi_trans), +intel_de_rmw (display, +TRANS_DDI_FUNC_CTL2 (display, dsi_trans),0 ,PORT_SYNC_MODE_ENABLE ); }@@ -799,8 +805,8 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, dsi_trans =dsi_port_to_transcoder (port);/* select data lane width */ - tmp =intel_de_read (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans)); + tmp =intel_de_read (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans)); tmp &= ~DDI_PORT_WIDTH_MASK ; tmp |=DDI_PORT_WIDTH (intel_dsi->lane_count);@@ -826,16 +832,16 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,/* enable DDI buffer */ tmp |=TRANS_DDI_FUNC_ENABLE ; -intel_de_write (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans), tmp); +intel_de_write (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans), tmp); }/* wait for link ready */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -if (wait_for_us ((intel_de_read (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans)) & +if (wait_for_us ((intel_de_read (display,DSI_TRANS_FUNC_CONF (dsi_trans)) &LINK_READY ),2500 )) -drm_err (&dev_priv->drm,"DSI link not ready\n" ); +drm_err (display->drm,"DSI link not ready\n" ); } }@@ -843,7 +849,7 @@ static void gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state) { - struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;@@ -910,17 +916,17 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,/* minimum hactive as per bspec: 256 pixels */ if (adjusted_mode->crtc_hdisplay <256 ) -drm_err (&dev_priv->drm,"hactive is less then 256 pixels\n" ); +drm_err (display->drm,"hactive is less then 256 pixels\n" );/* if RGB666 format, then hactive must be multiple of 4 pixels */ if (intel_dsi->pixel_format ==MIPI_DSI_FMT_RGB666 && hactive %4 !=0 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"hactive pixels are not multiple of 4\n" );/* program TRANS_HTOTAL register */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv,TRANS_HTOTAL (dev_priv, dsi_trans), +intel_de_write (display,TRANS_HTOTAL (display, dsi_trans),HACTIVE (hactive -1 ) |HTOTAL (htotal -1 )); }@@ -929,12 +935,12 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (intel_dsi->video_mode ==NON_BURST_SYNC_PULSE ) {/* BSPEC: hsync size should be atleast 16 pixels */ if (hsync_size <16 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"hsync size < 16 pixels\n" ); }if (hback_porch <16 ) -drm_err (&dev_priv->drm,"hback porch < 16 pixels\n" ); +drm_err (display->drm,"hback porch < 16 pixels\n" );if (intel_dsi->dual_link) { hsync_start /=2 ;@@ -943,8 +949,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_HSYNC (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_HSYNC (display, dsi_trans),HSYNC_START (hsync_start -1 ) |HSYNC_END (hsync_end -1 )); } }@@ -958,22 +964,22 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,* struct drm_display_mode. * For interlace mode: program required pixel minus 2 */ -intel_de_write (dev_priv,TRANS_VTOTAL (dev_priv, dsi_trans), +intel_de_write (display,TRANS_VTOTAL (display, dsi_trans),VACTIVE (vactive -1 ) |VTOTAL (vtotal -1 )); }if (vsync_end < vsync_start || vsync_end > vtotal) -drm_err (&dev_priv->drm,"Invalid vsync_end value\n" ); +drm_err (display->drm,"Invalid vsync_end value\n" );if (vsync_start < vactive) -drm_err (&dev_priv->drm,"vsync_start less than vactive\n" ); +drm_err (display->drm,"vsync_start less than vactive\n" );/* program TRANS_VSYNC register for video mode only */ if (is_vid_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_VSYNC (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_VSYNC (display, dsi_trans),VSYNC_START (vsync_start -1 ) |VSYNC_END (vsync_end -1 )); } }@@ -987,8 +993,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,if (is_vid_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_VSYNCSHIFT (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_VSYNCSHIFT (display, dsi_trans), vsync_shift); } }@@ -999,11 +1005,11 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,* FIXME get rid of these local hacks and do it right, * this will not handle eg. delayed vblank correctly. */ -if (DISPLAY_VER (dev_priv) >=12 ) { +if (DISPLAY_VER (display) >=12 ) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_write (dev_priv, -TRANS_VBLANK (dev_priv, dsi_trans), +intel_de_write (display, +TRANS_VBLANK (display, dsi_trans),VBLANK_START (vactive -1 ) |VBLANK_END (vtotal -1 )); } }@@ -1011,20 +1017,20 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,static void gen11_dsi_enable_transcoder (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv,TRANSCONF (dev_priv, dsi_trans),0 , +intel_de_rmw (display,TRANSCONF (display, dsi_trans),0 ,TRANSCONF_ENABLE );/* wait for transcoder to be enabled */ -if (intel_de_wait_for_set (dev_priv,TRANSCONF (dev_priv, dsi_trans), +if (intel_de_wait_for_set (display,TRANSCONF (display, dsi_trans),TRANSCONF_STATE_ENABLE ,10 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DSI transcoder not enabled\n" ); } }@@ -1032,7 +1038,7 @@ static void gen11_dsi_enable_transcoder(struct intel_encoder *encoder)static void gen11_dsi_setup_timeouts (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;@@ -1056,21 +1062,21 @@ static void gen11_dsi_setup_timeouts(struct intel_encoder *encoder, dsi_trans =dsi_port_to_transcoder (port);/* program hst_tx_timeout */ -intel_de_rmw (dev_priv,DSI_HSTX_TO (dsi_trans), +intel_de_rmw (display,DSI_HSTX_TO (dsi_trans),HSTX_TIMEOUT_VALUE_MASK ,HSTX_TIMEOUT_VALUE (hs_tx_timeout));/* FIXME: DSI_CALIB_TO */ /* program lp_rx_host timeout */ -intel_de_rmw (dev_priv,DSI_LPRX_HOST_TO (dsi_trans), +intel_de_rmw (display,DSI_LPRX_HOST_TO (dsi_trans),LPRX_TIMEOUT_VALUE_MASK ,LPRX_TIMEOUT_VALUE (lp_rx_timeout));/* FIXME: DSI_PWAIT_TO */ /* program turn around timeout */ -intel_de_rmw (dev_priv,DSI_TA_TO (dsi_trans), +intel_de_rmw (display,DSI_TA_TO (dsi_trans),TA_TIMEOUT_VALUE_MASK ,TA_TIMEOUT_VALUE (ta_timeout)); }@@ -1079,7 +1085,7 @@ static void gen11_dsi_setup_timeouts(struct intel_encoder *encoder,static void gen11_dsi_config_util_pin (struct intel_encoder *encoder,bool enable) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 tmp;@@ -1091,7 +1097,7 @@ static void gen11_dsi_config_util_pin(struct intel_encoder *encoder,if (is_vid_mode (intel_dsi) || (intel_dsi->ports &BIT (PORT_B )))return ; - tmp =intel_de_read (dev_priv,UTIL_PIN_CTL ); + tmp =intel_de_read (display,UTIL_PIN_CTL );if (enable) { tmp |=UTIL_PIN_DIRECTION_INPUT ;@@ -1099,7 +1105,7 @@ static void gen11_dsi_config_util_pin(struct intel_encoder *encoder, }else { tmp &= ~UTIL_PIN_ENABLE ; } -intel_de_write (dev_priv,UTIL_PIN_CTL , tmp); +intel_de_write (display,UTIL_PIN_CTL , tmp); } static void@@ -1137,7 +1143,7 @@ gen11_dsi_enable_port_and_phy(struct intel_encoder *encoder,static void gen11_dsi_powerup_panel (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct mipi_dsi_device *dsi;enum port port;@@ -1153,14 +1159,14 @@ static void gen11_dsi_powerup_panel(struct intel_encoder *encoder)* FIXME: This uses the number of DW's currently in the payload * receive queue. This is probably not what we want here. */ - tmp =intel_de_read (dev_priv,DSI_CMD_RXCTL (dsi_trans)); + tmp =intel_de_read (display,DSI_CMD_RXCTL (dsi_trans)); tmp &=NUMBER_RX_PLOAD_DW_MASK ;/* multiply "Number Rx Payload DW" by 4 to get max value */ tmp = tmp *4 ; dsi = intel_dsi->dsi_hosts[port]->device; ret =mipi_dsi_set_maximum_return_packet_size (dsi, tmp);if (ret <0 ) -drm_err (&dev_priv->drm, +drm_err (display->drm,"error setting max return pkt size%d\n" , tmp); }@@ -1220,10 +1226,10 @@ static void gen11_dsi_pre_enable(struct intel_atomic_state *state,static void icl_apply_kvmr_pipe_a_wa (struct intel_encoder *encoder,enum pipe pipe,bool enable) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder); -if (DISPLAY_VER (dev_priv) ==11 && pipe ==PIPE_B ) -intel_de_rmw (dev_priv,CHICKEN_PAR1_1 , +if (DISPLAY_VER (display) ==11 && pipe ==PIPE_B ) +intel_de_rmw (display,CHICKEN_PAR1_1 ,IGNORE_KVMR_PIPE_A , enable ?IGNORE_KVMR_PIPE_A :0 ); }@@ -1236,13 +1242,13 @@ static void icl_apply_kvmr_pipe_a_wa(struct intel_encoder *encoder,*/ static void adlp_set_lp_hs_wakeup_gb (struct intel_encoder *encoder) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port; -if (DISPLAY_VER (i915) ==13 ) { +if (DISPLAY_VER (display) ==13 ) {for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (i915,TGL_DSI_CHKN_REG (port), +intel_de_rmw (display,TGL_DSI_CHKN_REG (port),TGL_DSI_CHKN_LSHS_GB_MASK ,TGL_DSI_CHKN_LSHS_GB (4 )); }@@ -1276,7 +1282,7 @@ static void gen11_dsi_enable(struct intel_atomic_state *state,static void gen11_dsi_disable_transcoder (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;@@ -1285,13 +1291,13 @@ static void gen11_dsi_disable_transcoder(struct intel_encoder *encoder) dsi_trans =dsi_port_to_transcoder (port);/* disable transcoder */ -intel_de_rmw (dev_priv,TRANSCONF (dev_priv, dsi_trans), +intel_de_rmw (display,TRANSCONF (display, dsi_trans),TRANSCONF_ENABLE ,0 );/* wait for transcoder to be disabled */ -if (intel_de_wait_for_clear (dev_priv,TRANSCONF (dev_priv, dsi_trans), +if (intel_de_wait_for_clear (display,TRANSCONF (display, dsi_trans),TRANSCONF_STATE_ENABLE ,50 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DSI trancoder not disabled\n" ); } }@@ -1308,7 +1314,7 @@ static void gen11_dsi_powerdown_panel(struct intel_encoder *encoder)static void gen11_dsi_deconfigure_trancoder (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;enum transcoder dsi_trans;@@ -1317,29 +1323,29 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)/* disable periodic update mode */ if (is_cmd_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,DSI_CMD_FRMCTL (port), +intel_de_rmw (display,DSI_CMD_FRMCTL (port),DSI_PERIODIC_FRAME_UPDATE_ENABLE ,0 ); }/* put dsi link in ULPS */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)); + tmp =intel_de_read (display,DSI_LP_MSG (dsi_trans)); tmp |=LINK_ENTER_ULPS ; tmp &= ~LINK_ULPS_TYPE_LP11 ; -intel_de_write (dev_priv,DSI_LP_MSG (dsi_trans), tmp); +intel_de_write (display,DSI_LP_MSG (dsi_trans), tmp); -if (wait_for_us ((intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)) & +if (wait_for_us ((intel_de_read (display,DSI_LP_MSG (dsi_trans)) &LINK_IN_ULPS ),10 )) -drm_err (&dev_priv->drm,"DSI link not in ULPS\n" ); +drm_err (display->drm,"DSI link not in ULPS\n" ); }/* disable ddi function */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans), +intel_de_rmw (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans),TRANS_DDI_FUNC_ENABLE ,0 ); }@@ -1347,8 +1353,8 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)if (intel_dsi->dual_link) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -intel_de_rmw (dev_priv, -TRANS_DDI_FUNC_CTL2 (dev_priv, dsi_trans), +intel_de_rmw (display, +TRANS_DDI_FUNC_CTL2 (display, dsi_trans),PORT_SYNC_MODE_ENABLE ,0 ); } }@@ -1356,18 +1362,18 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)static void gen11_dsi_disable_port (struct intel_encoder *encoder) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;gen11_dsi_ungate_clocks (encoder);for_each_dsi_port (port, intel_dsi->ports) { -intel_de_rmw (dev_priv,DDI_BUF_CTL (port),DDI_BUF_CTL_ENABLE ,0 ); +intel_de_rmw (display,DDI_BUF_CTL (port),DDI_BUF_CTL_ENABLE ,0 ); -if (wait_for_us ((intel_de_read (dev_priv,DDI_BUF_CTL (port)) & +if (wait_for_us ((intel_de_read (display,DDI_BUF_CTL (port)) &DDI_BUF_IS_IDLE ),8 )) -drm_err (&dev_priv->drm, +drm_err (display->drm,"DDI port:%c buffer not idle\n" ,port_name (port)); }@@ -1376,6 +1382,7 @@ static void gen11_dsi_disable_port(struct intel_encoder *encoder)static void gen11_dsi_disable_io_power (struct intel_encoder *encoder) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port;@@ -1393,7 +1400,7 @@ static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)/* set mode to DDI */ for_each_dsi_port (port, intel_dsi->ports) -intel_de_rmw (dev_priv,ICL_DSI_IO_MODECTL (port), +intel_de_rmw (display,ICL_DSI_IO_MODECTL (port),COMBO_PHY_MODE_DSI ,0 ); }@@ -1505,8 +1512,7 @@ static void gen11_dsi_get_timings(struct intel_encoder *encoder,static bool gen11_dsi_is_periodic_cmd_mode (struct intel_dsi *intel_dsi) { -struct drm_device *dev = intel_dsi->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);enum transcoder dsi_trans;u32 val;@@ -1515,7 +1521,7 @@ static bool gen11_dsi_is_periodic_cmd_mode(struct intel_dsi *intel_dsi)else dsi_trans =TRANSCODER_DSI_0 ; - val =intel_de_read (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans)); + val =intel_de_read (display,DSI_TRANS_FUNC_CONF (dsi_trans));return (val &DSI_PERIODIC_FRAME_UPDATE_ENABLE ); }@@ -1558,7 +1564,7 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder,static void gen11_dsi_sync_state (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct intel_crtc *intel_crtc;enum pipe pipe;@@ -1569,9 +1575,9 @@ static void gen11_dsi_sync_state(struct intel_encoder *encoder, pipe = intel_crtc->pipe;/* wa verify 1409054076:icl,jsl,ehl */ -if (DISPLAY_VER (dev_priv) ==11 && pipe ==PIPE_B && - !(intel_de_read (dev_priv,CHICKEN_PAR1_1 ) &IGNORE_KVMR_PIPE_A )) -drm_dbg_kms (&dev_priv->drm, +if (DISPLAY_VER (display) ==11 && pipe ==PIPE_B && + !(intel_de_read (display,CHICKEN_PAR1_1 ) &IGNORE_KVMR_PIPE_A )) +drm_dbg_kms (display->drm,"[ENCODER:%d:%s] BIOS left IGNORE_KVMR_PIPE_A cleared with pipe B enabled\n" , encoder->base.base.id, encoder->base.name);@@ -1580,9 +1586,9 @@ static void gen11_dsi_sync_state(struct intel_encoder *encoder,static int gen11_dsi_dsc_compute_config (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { -struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +struct intel_display *display =to_intel_display (encoder);struct drm_dsc_config *vdsc_cfg = &crtc_state->dsc.config; -int dsc_max_bpc =DISPLAY_VER (dev_priv) >=12 ?12 :10 ; +int dsc_max_bpc =DISPLAY_VER (display) >=12 ?12 :10 ;bool use_dsc;int ret;@@ -1607,12 +1613,12 @@ static int gen11_dsi_dsc_compute_config(struct intel_encoder *encoder,return ret;/* DSI specific sanity checks on the common code */ -drm_WARN_ON (&dev_priv->drm, vdsc_cfg->vbr_enable); -drm_WARN_ON (&dev_priv->drm, vdsc_cfg->simple_422); -drm_WARN_ON (&dev_priv->drm, +drm_WARN_ON (display->drm, vdsc_cfg->vbr_enable); +drm_WARN_ON (display->drm, vdsc_cfg->simple_422); +drm_WARN_ON (display->drm, vdsc_cfg->pic_width % vdsc_cfg->slice_width); -drm_WARN_ON (&dev_priv->drm, vdsc_cfg->slice_height <8 ); -drm_WARN_ON (&dev_priv->drm, +drm_WARN_ON (display->drm, vdsc_cfg->slice_height <8 ); +drm_WARN_ON (display->drm, vdsc_cfg->pic_height % vdsc_cfg->slice_height); ret =drm_dsc_compute_rc_parameters (vdsc_cfg);@@ -1628,7 +1634,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct drm_i915_private *i915 = to_i915(encoder->base.dev); + struct intel_display *display = to_intel_display(encoder);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);struct intel_connector *intel_connector = intel_dsi->attached_connector; struct drm_display_mode *adjusted_mode =@@ -1662,7 +1668,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, pipe_config->clock_set = true;if (gen11_dsi_dsc_compute_config (encoder, pipe_config)) -drm_dbg_kms (&i915->drm,"Attempting to use DSC failed\n" ); +drm_dbg_kms (display->drm,"Attempting to use DSC failed\n" ); pipe_config->port_clock =afe_clk (encoder, pipe_config) /5 ;@@ -1680,15 +1686,13 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder,static void gen11_dsi_get_power_domains (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { -struct drm_i915_private *i915 =to_i915 (encoder->base.dev); - -get_dsi_io_power_domains (i915, -enc_to_intel_dsi (encoder)); +get_dsi_io_power_domains (enc_to_intel_dsi (encoder)); }static bool gen11_dsi_get_hw_state (struct intel_encoder *encoder,enum pipe *pipe) { +struct intel_display *display =to_intel_display (encoder);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum transcoder dsi_trans;@@ -1704,8 +1708,8 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =intel_de_read (dev_priv, -TRANS_DDI_FUNC_CTL (dev_priv, dsi_trans)); + tmp =intel_de_read (display, +TRANS_DDI_FUNC_CTL (display, dsi_trans));switch (tmp &TRANS_DDI_EDP_INPUT_MASK ) {case TRANS_DDI_EDP_INPUT_A_ON : *pipe =PIPE_A ;@@ -1720,11 +1724,11 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder, *pipe =PIPE_D ;break ;default : -drm_err (&dev_priv->drm,"Invalid PIPE input\n" ); +drm_err (display->drm,"Invalid PIPE input\n" ); goto out; } - tmp =intel_de_read (dev_priv,TRANSCONF (dev_priv, dsi_trans)); + tmp =intel_de_read (display,TRANSCONF (display, dsi_trans)); ret = tmp &TRANSCONF_ENABLE ; } out:@@ -1834,8 +1838,7 @@ static const struct mipi_dsi_host_ops gen11_dsi_host_ops = {static void icl_dphy_param_init (struct intel_dsi *intel_dsi) { -struct drm_device *dev = intel_dsi->base.base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_display *display =to_intel_display (&intel_dsi->base);struct intel_connector *connector = intel_dsi->attached_connector;struct mipi_config *mipi_config = connector->panel.vbt.dsi.config;u32 tlpx_ns;@@ -1859,7 +1862,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)*/ prepare_cnt =DIV_ROUND_UP (ths_prepare_ns *4 , tlpx_ns);if (prepare_cnt >ICL_PREPARE_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm,"prepare_cnt out of range (%d)\n" , +drm_dbg_kms (display->drm,"prepare_cnt out of range (%d)\n" , prepare_cnt); prepare_cnt =ICL_PREPARE_CNT_MAX ; }@@ -1868,7 +1871,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi) clk_zero_cnt =DIV_ROUND_UP (mipi_config->tclk_prepare_clkzero - ths_prepare_ns, tlpx_ns);if (clk_zero_cnt >ICL_CLK_ZERO_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"clk_zero_cnt out of range (%d)\n" , clk_zero_cnt); clk_zero_cnt =ICL_CLK_ZERO_CNT_MAX ; }@@ -1876,7 +1879,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)/* trail cnt in escape clocks*/ trail_cnt =DIV_ROUND_UP (tclk_trail_ns, tlpx_ns);if (trail_cnt >ICL_TRAIL_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm,"trail_cnt out of range (%d)\n" , +drm_dbg_kms (display->drm,"trail_cnt out of range (%d)\n" , trail_cnt); trail_cnt =ICL_TRAIL_CNT_MAX ; }@@ -1884,7 +1887,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)/* tclk pre count in escape clocks */ tclk_pre_cnt =DIV_ROUND_UP (mipi_config->tclk_pre, tlpx_ns);if (tclk_pre_cnt >ICL_TCLK_PRE_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"tclk_pre_cnt out of range (%d)\n" , tclk_pre_cnt); tclk_pre_cnt =ICL_TCLK_PRE_CNT_MAX ; }@@ -1893,7 +1896,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi) hs_zero_cnt =DIV_ROUND_UP (mipi_config->ths_prepare_hszero - ths_prepare_ns, tlpx_ns);if (hs_zero_cnt >ICL_HS_ZERO_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm,"hs_zero_cnt out of range (%d)\n" , +drm_dbg_kms (display->drm,"hs_zero_cnt out of range (%d)\n" , hs_zero_cnt); hs_zero_cnt =ICL_HS_ZERO_CNT_MAX ; }@@ -1901,7 +1904,7 @@ static void icl_dphy_param_init(struct intel_dsi *intel_dsi)/* hs exit zero cnt in escape clocks */ exit_zero_cnt =DIV_ROUND_UP (mipi_config->ths_exit, tlpx_ns);if (exit_zero_cnt >ICL_EXIT_ZERO_CNT_MAX ) { -drm_dbg_kms (&dev_priv->drm, +drm_dbg_kms (display->drm,"exit_zero_cnt out of range (%d)\n" , exit_zero_cnt); exit_zero_cnt =ICL_EXIT_ZERO_CNT_MAX ;@@ -1943,10 +1946,9 @@ static void icl_dsi_add_properties(struct intel_connector *connector) fixed_mode->vdisplay); } -void icl_dsi_init (struct drm_i915_private *dev_priv, +void icl_dsi_init (struct intel_display *display,const struct intel_bios_encoder_data *devdata) { -struct intel_display *display = &dev_priv->display;struct intel_dsi *intel_dsi;struct intel_encoder *encoder;struct intel_connector *intel_connector;@@ -1974,7 +1976,8 @@ void icl_dsi_init(struct drm_i915_private *dev_priv, encoder->devdata = devdata;/* register DSI encoder with DRM subsystem */ -drm_encoder_init (&dev_priv->drm, &encoder->base, &gen11_dsi_encoder_funcs, +drm_encoder_init (display->drm, &encoder->base, + &gen11_dsi_encoder_funcs,DRM_MODE_ENCODER_DSI ,"DSI %c" ,port_name (port)); encoder->pre_pll_enable = gen11_dsi_pre_pll_enable;@@ -1999,7 +2002,8 @@ void icl_dsi_init(struct drm_i915_private *dev_priv, encoder->shutdown = intel_dsi_shutdown;/* register DSI connector with DRM subsystem */ -drm_connector_init (&dev_priv->drm, connector, &gen11_dsi_connector_funcs, +drm_connector_init (display->drm, connector, + &gen11_dsi_connector_funcs,DRM_MODE_CONNECTOR_DSI );drm_connector_helper_add (connector, &gen11_dsi_connector_helper_funcs); connector->display_info.subpixel_order = SubPixelHorizontalRGB;@@ -2012,12 +2016,12 @@ void icl_dsi_init(struct drm_i915_private *dev_priv,intel_bios_init_panel_late (display, &intel_connector->panel, encoder->devdata,NULL ); -mutex_lock (&dev_priv->drm.mode_config.mutex); +mutex_lock (&display->drm->mode_config.mutex);intel_panel_add_vbt_lfp_fixed_mode (intel_connector); -mutex_unlock (&dev_priv->drm.mode_config.mutex); +mutex_unlock (&display->drm->mode_config.mutex);if (!intel_panel_preferred_fixed_mode (intel_connector)) { -drm_err (&dev_priv->drm,"DSI fixed mode info missing\n" ); +drm_err (display->drm,"DSI fixed mode info missing\n" ); goto err; }@@ -2030,10 +2034,10 @@ void icl_dsi_init(struct drm_i915_private *dev_priv,else intel_dsi->ports =BIT (port); -if (drm_WARN_ON (&dev_priv->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) +if (drm_WARN_ON (display->drm, intel_connector->panel.vbt.dsi.bl_ports & ~intel_dsi->ports)) intel_connector->panel.vbt.dsi.bl_ports &= intel_dsi->ports; -if (drm_WARN_ON (&dev_priv->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) +if (drm_WARN_ON (display->drm, intel_connector->panel.vbt.dsi.cabc_ports & ~intel_dsi->ports)) intel_connector->panel.vbt.dsi.cabc_ports &= intel_dsi->ports;for_each_dsi_port (port, intel_dsi->ports) {@@ -2047,7 +2051,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv, }if (!intel_dsi_vbt_init (intel_dsi,MIPI_DSI_GENERIC_PANEL_ID )) { -drm_dbg_kms (&dev_priv->drm,"no device found\n" ); +drm_dbg_kms (display->drm,"no device found\n" ); goto err; }drivers/gpu/drm/i915/display/icl_dsi.h +2
-2@@ -6,11 +6,11 @@#ifndef __ICL_DSI_H__#define __ICL_DSI_H__ -struct drm_i915_private ;struct intel_bios_encoder_data ;struct intel_crtc_state ; +struct intel_display ; -void icl_dsi_init (struct drm_i915_private *dev_priv, +void icl_dsi_init (struct intel_display *display,const struct intel_bios_encoder_data *devdata);void icl_dsi_frame_update (struct intel_crtc_state *crtc_state);drivers/gpu/drm/i915/display/intel_ddi.c +1
-1@@ -4885,7 +4885,7 @@ void intel_ddi_init(struct intel_display *display,if (!assert_has_icl_dsi (dev_priv))return ; -icl_dsi_init (dev_priv, devdata); +icl_dsi_init (display, devdata);return ; }Signature · 1 line
2.39.5
Re: [PATCH 11/11] drm/i915/de: remove unnecessary generic wrappers
In reply to Jani NikulaQuoted 4 lines · Jani Nikula
With many of the intel_de_* callers switched over to struct
intel_display, we can remove some of the unnecessary generic wrappers.Signed-off-by Jani Nikula <[email protected]>
trusting more your compiler then my tired eyes,
Quoted 143 lines
--- drivers/gpu/drm/i915/display/intel_de.h | 46 ++++++++++--------------- 1 file changed, 18 insertions(+), 28 deletions(-)drivers/gpu/drm/i915/display/intel_de.h +18
-28@@ -32,7 +32,7 @@ __intel_de_read(struct intel_display *display, i915_reg_t reg)#define intel_de_read (p,...) __intel_de_read(__to_intel_display(p), __VA_ARGS__)static inline u8 -__intel_de_read8 (struct intel_display *display,i915_reg_t reg) +intel_de_read8 (struct intel_display *display,i915_reg_t reg) {u8 val;@@ -44,11 +44,10 @@ __intel_de_read8(struct intel_display *display, i915_reg_t reg)return val; } -#define intel_de_read8 (p,...) __intel_de_read8(__to_intel_display(p), __VA_ARGS__)static inline u64 -__intel_de_read64_2x32 (struct intel_display *display, -i915_reg_t lower_reg,i915_reg_t upper_reg) +intel_de_read64_2x32 (struct intel_display *display, +i915_reg_t lower_reg,i915_reg_t upper_reg) {u64 val;@@ -63,7 +62,6 @@ __intel_de_read64_2x32(struct intel_display *display,return val; } -#define intel_de_read64_2x32 (p,...) __intel_de_read64_2x32(__to_intel_display(p), __VA_ARGS__)static inline void __intel_de_posting_read (struct intel_display *display,i915_reg_t reg)@@ -88,12 +86,11 @@ __intel_de_write(struct intel_display *display, i915_reg_t reg, u32 val)#define intel_de_write (p,...) __intel_de_write(__to_intel_display(p), __VA_ARGS__)static inline u32 -____intel_de_rmw_nowl (struct intel_display *display,i915_reg_t reg, -u32 clear,u32 set) +__intel_de_rmw_nowl (struct intel_display *display,i915_reg_t reg, +u32 clear,u32 set) {return intel_uncore_rmw (__to_uncore (display), reg, clear, set); } -#define __intel_de_rmw_nowl (p,...) ____intel_de_rmw_nowl(__to_intel_display(p), __VA_ARGS__) static inline u32 __intel_de_rmw(struct intel_display *display, i915_reg_t reg, u32 clear,@@ -112,18 +109,17 @@ __intel_de_rmw(struct intel_display *display, i915_reg_t reg, u32 clear,#define intel_de_rmw (p,...) __intel_de_rmw(__to_intel_display(p), __VA_ARGS__)static inline int -____intel_de_wait_for_register_nowl (struct intel_display *display, -i915_reg_t reg, -u32 mask,u32 value,unsigned int timeout) +__intel_de_wait_for_register_nowl (struct intel_display *display, +i915_reg_t reg, +u32 mask,u32 value,unsigned int timeout) {return intel_wait_for_register (__to_uncore (display), reg, mask, value, timeout); } -#define __intel_de_wait_for_register_nowl (p,...) ____intel_de_wait_for_register_nowl(__to_intel_display(p), __VA_ARGS__)static inline int -__intel_de_wait (struct intel_display *display,i915_reg_t reg, -u32 mask,u32 value,unsigned int timeout) +intel_de_wait (struct intel_display *display,i915_reg_t reg, +u32 mask,u32 value,unsigned int timeout) {int ret;@@ -136,11 +132,10 @@ __intel_de_wait(struct intel_display *display, i915_reg_t reg,return ret; } -#define intel_de_wait (p,...) __intel_de_wait(__to_intel_display(p), __VA_ARGS__)static inline int -__intel_de_wait_fw (struct intel_display *display,i915_reg_t reg, -u32 mask,u32 value,unsigned int timeout) +intel_de_wait_fw (struct intel_display *display,i915_reg_t reg, +u32 mask,u32 value,unsigned int timeout) {int ret;@@ -153,13 +148,12 @@ __intel_de_wait_fw(struct intel_display *display, i915_reg_t reg,return ret; } -#define intel_de_wait_fw (p,...) __intel_de_wait_fw(__to_intel_display(p), __VA_ARGS__)static inline int -__intel_de_wait_custom (struct intel_display *display,i915_reg_t reg, -u32 mask,u32 value, -unsigned int fast_timeout_us, -unsigned int slow_timeout_ms,u32 *out_value) +intel_de_wait_custom (struct intel_display *display,i915_reg_t reg, +u32 mask,u32 value, +unsigned int fast_timeout_us, +unsigned int slow_timeout_ms,u32 *out_value) {int ret;@@ -173,7 +167,6 @@ __intel_de_wait_custom(struct intel_display *display, i915_reg_t reg,return ret; } -#define intel_de_wait_custom (p,...) __intel_de_wait_custom(__to_intel_display(p), __VA_ARGS__) static inline int __intel_de_wait_for_set(struct intel_display *display, i915_reg_t reg,@@ -220,19 +213,16 @@ __intel_de_write_fw(struct intel_display *display, i915_reg_t reg, u32 val)#define intel_de_write_fw (p,...) __intel_de_write_fw(__to_intel_display(p), __VA_ARGS__)static inline u32 -__intel_de_read_notrace (struct intel_display *display,i915_reg_t reg) +intel_de_read_notrace (struct intel_display *display,i915_reg_t reg) {return intel_uncore_read_notrace (__to_uncore (display), reg); } -#define intel_de_read_notrace (p,...) __intel_de_read_notrace(__to_intel_display(p), __VA_ARGS__)static inline void -__intel_de_write_notrace (struct intel_display *display,i915_reg_t reg, -u32 val) +intel_de_write_notrace (struct intel_display *display,i915_reg_t reg,u32 val) {intel_uncore_write_notrace (__to_uncore (display), reg, val); } -#define intel_de_write_notrace (p,...) __intel_de_write_notrace(__to_intel_display(p), __VA_ARGS__) static __always_inline void intel_de_write_dsb(struct intel_display *display, struct intel_dsb *dsb,Signature · 1 line
2.39.5