drm/i915/display: mass conversion to intel_de_*() register accessors
Subsystems (3)
v2 cover drm/i915/display: mass conversion to intel_de_*() register accessors
Rebase of the patches from [1] that failed to apply.
BR,
Jani.
[1] https://patchwork.freedesktop.org/series/72533/
Jani Nikula (8):
drm/i915/icl_dsi: use intel_de_*() functions for register access drm/i915/combo_phy: use intel_de_*() functions for register access drm/i915/ddi: use intel_de_*() functions for register access drm/i915/display: use intel_de_*() functions for register access drm/i915/display_power: use intel_de_*() functions for register access drm/i915/dp: use intel_de_*() functions for register access drm/i915/hdcp: use intel_de_*() functions for register access drm/i915/psr: use intel_de_*() functions for register access
drivers/gpu/drm/i915/display/icl_dsi.c | 271 ++-- .../gpu/drm/i915/display/intel_combo_phy.c | 66 +- drivers/gpu/drm/i915/display/intel_ddi.c | 464 +++---- drivers/gpu/drm/i915/display/intel_display.c | 1171 +++++++++-------- .../drm/i915/display/intel_display_power.c | 292 ++-- drivers/gpu/drm/i915/display/intel_dp.c | 234 ++-- drivers/gpu/drm/i915/display/intel_hdcp.c | 142 +- drivers/gpu/drm/i915/display/intel_psr.c | 4 +- 8 files changed, 1397 insertions(+), 1247 deletions(-)
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/8 drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain point in the register access macros I915_READ(), I915_WRITE(), POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register accessors intel_de_read(), intel_de_write(), intel_de_posting_read(), intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
--- drivers/gpu/drm/i915/display/intel_ddi.c | 464 ++++++++++++----------- 1 file changed, 240 insertions(+), 224 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +240 -224
@@ -846,7 +846,7 @@ bxt_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries)static const struct cnl_ddi_buf_trans *cnl_get_buf_trans_hdmi (struct drm_i915_private *dev_priv,int *n_entries) { -u32 voltage =I915_READ (CNL_PORT_COMP_DW3 ) &VOLTAGE_INFO_MASK ; +u32 voltage =intel_de_read (dev_priv,CNL_PORT_COMP_DW3 ) &VOLTAGE_INFO_MASK ;if (voltage ==VOLTAGE_INFO_0_85V ) { *n_entries =ARRAY_SIZE (cnl_ddi_translations_hdmi_0_85V);
@@ -867,7 +867,7 @@ cnl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries)static const struct cnl_ddi_buf_trans *cnl_get_buf_trans_dp (struct drm_i915_private *dev_priv,int *n_entries) { -u32 voltage =I915_READ (CNL_PORT_COMP_DW3 ) &VOLTAGE_INFO_MASK ; +u32 voltage =intel_de_read (dev_priv,CNL_PORT_COMP_DW3 ) &VOLTAGE_INFO_MASK ;if (voltage ==VOLTAGE_INFO_0_85V ) { *n_entries =ARRAY_SIZE (cnl_ddi_translations_dp_0_85V);
@@ -888,7 +888,7 @@ cnl_get_buf_trans_dp(struct drm_i915_private *dev_priv, int *n_entries)static const struct cnl_ddi_buf_trans *cnl_get_buf_trans_edp (struct drm_i915_private *dev_priv,int *n_entries) { -u32 voltage =I915_READ (CNL_PORT_COMP_DW3 ) &VOLTAGE_INFO_MASK ; +u32 voltage =intel_de_read (dev_priv,CNL_PORT_COMP_DW3 ) &VOLTAGE_INFO_MASK ;if (dev_priv->vbt.edp.low_vswing) {if (voltage ==VOLTAGE_INFO_0_85V ) {
@@ -1026,10 +1026,10 @@ static void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder, iboost_bit =DDI_BUF_BALANCE_LEG_ENABLE ;for (i =0 ; i < n_entries; i++) { -I915_WRITE (DDI_BUF_TRANS_LO (port, i), - ddi_translations[i].trans1 | iboost_bit); -I915_WRITE (DDI_BUF_TRANS_HI (port, i), - ddi_translations[i].trans2); +intel_de_write (dev_priv,DDI_BUF_TRANS_LO (port, i), + ddi_translations[i].trans1 | iboost_bit); +intel_de_write (dev_priv,DDI_BUF_TRANS_HI (port, i), + ddi_translations[i].trans2); } }
@@ -1059,10 +1059,10 @@ static void intel_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder, iboost_bit =DDI_BUF_BALANCE_LEG_ENABLE ;/* Entry 9 is for HDMI: */ -I915_WRITE (DDI_BUF_TRANS_LO (port,9 ), - ddi_translations[level].trans1 | iboost_bit); -I915_WRITE (DDI_BUF_TRANS_HI (port,9 ), - ddi_translations[level].trans2); +intel_de_write (dev_priv,DDI_BUF_TRANS_LO (port,9 ), + ddi_translations[level].trans1 | iboost_bit); +intel_de_write (dev_priv,DDI_BUF_TRANS_HI (port,9 ), + ddi_translations[level].trans2); } static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,
@@ -1073,7 +1073,7 @@ static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,for (i =0 ; i <16 ; i++) {udelay (1 ); -if (I915_READ (reg) &DDI_BUF_IS_IDLE ) +if (intel_de_read (dev_priv, reg) &DDI_BUF_IS_IDLE )return ; }DRM_ERROR ("Timeout waiting for DDI BUF %c idle bit\n" ,port_name (port));
@@ -1164,70 +1164,64 @@ void hsw_fdi_link_train(struct intel_encoder *encoder,* * WaFDIAutoLinkSetTimingOverrride:hsw */ -I915_WRITE (FDI_RX_MISC (PIPE_A ),FDI_RX_PWRDN_LANE1_VAL (2 ) | -FDI_RX_PWRDN_LANE0_VAL (2 ) | -FDI_RX_TP1_TO_TP2_48 |FDI_RX_FDI_DELAY_90 ); +intel_de_write (dev_priv,FDI_RX_MISC (PIPE_A ), +FDI_RX_PWRDN_LANE1_VAL (2 ) |FDI_RX_PWRDN_LANE0_VAL (2 ) |FDI_RX_TP1_TO_TP2_48 |FDI_RX_FDI_DELAY_90 );/* Enable the PCH Receiver FDI PLL */ rx_ctl_val = dev_priv->fdi_rx_config |FDI_RX_ENHANCE_FRAME_ENABLE |FDI_RX_PLL_ENABLE |FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); -I915_WRITE (FDI_RX_CTL (PIPE_A ), rx_ctl_val); -POSTING_READ (FDI_RX_CTL (PIPE_A )); +intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), rx_ctl_val); +intel_de_posting_read (dev_priv,FDI_RX_CTL (PIPE_A ));udelay (220 );/* Switch from Rawclk to PCDclk */ rx_ctl_val |=FDI_PCDCLK ; -I915_WRITE (FDI_RX_CTL (PIPE_A ), rx_ctl_val); +intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), rx_ctl_val);/* Configure Port Clock Select */ ddi_pll_sel =hsw_pll_to_ddi_pll_sel (crtc_state->shared_dpll); -I915_WRITE (PORT_CLK_SEL (PORT_E ), ddi_pll_sel); +intel_de_write (dev_priv,PORT_CLK_SEL (PORT_E ), ddi_pll_sel);WARN_ON (ddi_pll_sel !=PORT_CLK_SEL_SPLL );/* Start the training iterating through available voltages and emphasis, * testing each value twice. */ for (i =0 ; i <ARRAY_SIZE (hsw_ddi_translations_fdi) *2 ; i++) {/* Configure DP_TP_CTL with auto-training */ -I915_WRITE (DP_TP_CTL (PORT_E ), -DP_TP_CTL_FDI_AUTOTRAIN | -DP_TP_CTL_ENHANCED_FRAME_ENABLE | -DP_TP_CTL_LINK_TRAIN_PAT1 | -DP_TP_CTL_ENABLE ); +intel_de_write (dev_priv,DP_TP_CTL (PORT_E ), +DP_TP_CTL_FDI_AUTOTRAIN |DP_TP_CTL_ENHANCED_FRAME_ENABLE |DP_TP_CTL_LINK_TRAIN_PAT1 |DP_TP_CTL_ENABLE );/* Configure and enable DDI_BUF_CTL for DDI E with next voltage. * DDI E does not support port reversal, the functionality is * achieved on the PCH side in FDI_RX_CTL, so no need to set the * port reversal bit */ -I915_WRITE (DDI_BUF_CTL (PORT_E ), -DDI_BUF_CTL_ENABLE | - ((crtc_state->fdi_lanes -1 ) <<1 ) | -DDI_BUF_TRANS_SELECT (i /2 )); -POSTING_READ (DDI_BUF_CTL (PORT_E )); +intel_de_write (dev_priv,DDI_BUF_CTL (PORT_E ), +DDI_BUF_CTL_ENABLE | ((crtc_state->fdi_lanes -1 ) <<1 ) |DDI_BUF_TRANS_SELECT (i /2 )); +intel_de_posting_read (dev_priv,DDI_BUF_CTL (PORT_E ));udelay (600 );/* Program PCH FDI Receiver TU */ -I915_WRITE (FDI_RX_TUSIZE1 (PIPE_A ),TU_SIZE (64 )); +intel_de_write (dev_priv,FDI_RX_TUSIZE1 (PIPE_A ),TU_SIZE (64 ));/* Enable PCH FDI Receiver with auto-training */ rx_ctl_val |=FDI_RX_ENABLE |FDI_LINK_TRAIN_AUTO ; -I915_WRITE (FDI_RX_CTL (PIPE_A ), rx_ctl_val); -POSTING_READ (FDI_RX_CTL (PIPE_A )); +intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), rx_ctl_val); +intel_de_posting_read (dev_priv,FDI_RX_CTL (PIPE_A ));/* Wait for FDI receiver lane calibration */ udelay (30 );/* Unset FDI_RX_MISC pwrdn lanes */ - temp =I915_READ (FDI_RX_MISC (PIPE_A )); + temp =intel_de_read (dev_priv,FDI_RX_MISC (PIPE_A )); temp &= ~(FDI_RX_PWRDN_LANE1_MASK |FDI_RX_PWRDN_LANE0_MASK ); -I915_WRITE (FDI_RX_MISC (PIPE_A ), temp); -POSTING_READ (FDI_RX_MISC (PIPE_A )); +intel_de_write (dev_priv,FDI_RX_MISC (PIPE_A ), temp); +intel_de_posting_read (dev_priv,FDI_RX_MISC (PIPE_A ));/* Wait for FDI auto training time */ udelay (5 ); - temp =I915_READ (DP_TP_STATUS (PORT_E )); + temp =intel_de_read (dev_priv,DP_TP_STATUS (PORT_E ));if (temp &DP_TP_STATUS_AUTOTRAIN_DONE ) {DRM_DEBUG_KMS ("FDI link training done on step %d\n" , i);break ;
@@ -1243,37 +1237,34 @@ void hsw_fdi_link_train(struct intel_encoder *encoder, } rx_ctl_val &= ~FDI_RX_ENABLE ; -I915_WRITE (FDI_RX_CTL (PIPE_A ), rx_ctl_val); -POSTING_READ (FDI_RX_CTL (PIPE_A )); +intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), rx_ctl_val); +intel_de_posting_read (dev_priv,FDI_RX_CTL (PIPE_A )); - temp =I915_READ (DDI_BUF_CTL (PORT_E )); + temp =intel_de_read (dev_priv,DDI_BUF_CTL (PORT_E )); temp &= ~DDI_BUF_CTL_ENABLE ; -I915_WRITE (DDI_BUF_CTL (PORT_E ), temp); -POSTING_READ (DDI_BUF_CTL (PORT_E )); +intel_de_write (dev_priv,DDI_BUF_CTL (PORT_E ), temp); +intel_de_posting_read (dev_priv,DDI_BUF_CTL (PORT_E ));/* Disable DP_TP_CTL and FDI_RX_CTL and retry */ - temp =I915_READ (DP_TP_CTL (PORT_E )); + temp =intel_de_read (dev_priv,DP_TP_CTL (PORT_E )); temp &= ~(DP_TP_CTL_ENABLE |DP_TP_CTL_LINK_TRAIN_MASK ); temp |=DP_TP_CTL_LINK_TRAIN_PAT1 ; -I915_WRITE (DP_TP_CTL (PORT_E ), temp); -POSTING_READ (DP_TP_CTL (PORT_E )); +intel_de_write (dev_priv,DP_TP_CTL (PORT_E ), temp); +intel_de_posting_read (dev_priv,DP_TP_CTL (PORT_E ));intel_wait_ddi_buf_idle (dev_priv,PORT_E );/* Reset FDI_RX_MISC pwrdn lanes */ - temp =I915_READ (FDI_RX_MISC (PIPE_A )); + temp =intel_de_read (dev_priv,FDI_RX_MISC (PIPE_A )); temp &= ~(FDI_RX_PWRDN_LANE1_MASK |FDI_RX_PWRDN_LANE0_MASK ); temp |=FDI_RX_PWRDN_LANE1_VAL (2 ) |FDI_RX_PWRDN_LANE0_VAL (2 ); -I915_WRITE (FDI_RX_MISC (PIPE_A ), temp); -POSTING_READ (FDI_RX_MISC (PIPE_A )); +intel_de_write (dev_priv,FDI_RX_MISC (PIPE_A ), temp); +intel_de_posting_read (dev_priv,FDI_RX_MISC (PIPE_A )); }/* Enable normal pixel sending for FDI */ -I915_WRITE (DP_TP_CTL (PORT_E ), -DP_TP_CTL_FDI_AUTOTRAIN | -DP_TP_CTL_LINK_TRAIN_NORMAL | -DP_TP_CTL_ENHANCED_FRAME_ENABLE | -DP_TP_CTL_ENABLE ); +intel_de_write (dev_priv,DP_TP_CTL (PORT_E ), +DP_TP_CTL_FDI_AUTOTRAIN |DP_TP_CTL_LINK_TRAIN_NORMAL |DP_TP_CTL_ENHANCED_FRAME_ENABLE |DP_TP_CTL_ENABLE ); }static void intel_ddi_init_dp_buf_reg (struct intel_encoder *encoder)
@@ -1314,7 +1305,7 @@ static int hsw_ddi_calc_wrpll_link(struct drm_i915_private *dev_priv,int n, p, r;u32 wrpll; - wrpll =I915_READ (reg); + wrpll =intel_de_read (dev_priv, reg);switch (wrpll &WRPLL_REF_MASK ) {case WRPLL_REF_SPECIAL_HSW :/*
@@ -1323,7 +1314,7 @@ static int hsw_ddi_calc_wrpll_link(struct drm_i915_private *dev_priv,* for the non-SSC reference frequency. */ if (IS_HASWELL (dev_priv) && !IS_HSW_ULT (dev_priv)) { -if (I915_READ (FUSE_STRAP3 ) &HSW_REF_CLK_SELECT ) +if (intel_de_read (dev_priv,FUSE_STRAP3 ) &HSW_REF_CLK_SELECT ) refclk =24 ;else refclk =135 ;
@@ -1468,7 +1459,7 @@ int cnl_calc_wrpll_link(struct drm_i915_private *dev_priv,static int icl_calc_tbt_pll_link (struct drm_i915_private *dev_priv,enum port port) { -u32 val =I915_READ (DDI_CLK_SEL (port)) &DDI_CLK_SEL_MASK ; +u32 val =intel_de_read (dev_priv,DDI_CLK_SEL (port)) &DDI_CLK_SEL_MASK ;switch (val) {case DDI_CLK_SEL_NONE :
@@ -1731,7 +1722,7 @@ static void hsw_ddi_clock_get(struct intel_encoder *encoder, link_clock =hsw_ddi_calc_wrpll_link (dev_priv,WRPLL_CTL (1 ));break ;case PORT_CLK_SEL_SPLL : - pll =I915_READ (SPLL_CTL ) &SPLL_FREQ_MASK ; + pll =intel_de_read (dev_priv,SPLL_CTL ) &SPLL_FREQ_MASK ;if (pll == SPLL_FREQ_810MHz) link_clock =81000 ;else if (pll == SPLL_FREQ_1350MHz)
@@ -1851,7 +1842,7 @@ void intel_ddi_set_dp_msa(const struct intel_crtc_state *crtc_state,if (intel_dp_needs_vsc_sdp (crtc_state, conn_state)) temp |=DP_MSA_MISC_COLOR_VSC_SDP ; -I915_WRITE (TRANS_MSA_MISC (cpu_transcoder), temp); +intel_de_write (dev_priv,TRANS_MSA_MISC (cpu_transcoder), temp); }/*
@@ -1966,7 +1957,7 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state) temp =intel_ddi_transcoder_func_reg_val_get (crtc_state);if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DP_MST )) temp |=TRANS_DDI_DP_VC_PAYLOAD_ALLOC ; -I915_WRITE (TRANS_DDI_FUNC_CTL (cpu_transcoder), temp); +intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder), temp); }/*
@@ -1983,7 +1974,7 @@ intel_ddi_config_transcoder_func(const struct intel_crtc_state *crtc_state) temp =intel_ddi_transcoder_func_reg_val_get (crtc_state); temp &= ~TRANS_DDI_FUNC_ENABLE ; -I915_WRITE (TRANS_DDI_FUNC_CTL (cpu_transcoder), temp); +intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder), temp); }void intel_ddi_disable_transcoder_func (const struct intel_crtc_state *crtc_state)
@@ -1993,7 +1984,7 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_stateenum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 val; - val =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder)); + val =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder)); val &= ~TRANS_DDI_FUNC_ENABLE ;if (INTEL_GEN (dev_priv) >=12 ) {
@@ -2002,7 +1993,7 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state }else { val &= ~TRANS_DDI_PORT_MASK ; } -I915_WRITE (TRANS_DDI_FUNC_CTL (cpu_transcoder), val); +intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder), val);if (dev_priv->quirks &QUIRK_INCREASE_DDI_DISABLED_TIME &&intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) {
@@ -2032,12 +2023,12 @@ int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder, goto out; } - tmp =I915_READ (TRANS_DDI_FUNC_CTL (pipe)); + tmp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (pipe));if (enable) tmp |=TRANS_DDI_HDCP_SIGNALLING ;else tmp &= ~TRANS_DDI_HDCP_SIGNALLING ; -I915_WRITE (TRANS_DDI_FUNC_CTL (pipe), tmp); +intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (pipe), tmp); out:intel_display_power_put (dev_priv, intel_encoder->power_domain, wakeref);return ret;
@@ -2071,7 +2062,7 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)else cpu_transcoder = (enum transcoder ) pipe; - tmp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder)); + tmp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder));switch (tmp &TRANS_DDI_MODE_SELECT_MASK ) {case TRANS_DDI_MODE_SELECT_HDMI :
@@ -2124,12 +2115,13 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,if (!wakeref)return ; - tmp =I915_READ (DDI_BUF_CTL (port)); + tmp =intel_de_read (dev_priv,DDI_BUF_CTL (port));if (!(tmp &DDI_BUF_CTL_ENABLE )) goto out;if (HAS_TRANSCODER_EDP (dev_priv) && port ==PORT_A ) { - tmp =I915_READ (TRANS_DDI_FUNC_CTL (TRANSCODER_EDP )); + tmp =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (TRANSCODER_EDP ));switch (tmp &TRANS_DDI_EDP_INPUT_MASK ) {default :
@@ -2169,7 +2161,8 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, ddi_select =TRANS_DDI_SELECT_PORT (port); } - tmp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder)); + tmp =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (cpu_transcoder));intel_display_power_put (dev_priv,POWER_DOMAIN_TRANSCODER (cpu_transcoder), trans_wakeref);
@@ -2203,7 +2196,7 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, out:if (*pipe_mask &&IS_GEN9_LP (dev_priv)) { - tmp =I915_READ (BXT_PHY_CTL (port)); + tmp =intel_de_read (dev_priv,BXT_PHY_CTL (port));if ((tmp & (BXT_PHY_CMNLANE_POWERDOWN_ACK |BXT_PHY_LANE_POWERDOWN_ACK |BXT_PHY_LANE_ENABLED )) !=BXT_PHY_LANE_ENABLED )
@@ -2295,11 +2288,13 @@ void intel_ddi_enable_pipe_clock(const struct intel_crtc_state *crtc_state)if (cpu_transcoder !=TRANSCODER_EDP ) {if (INTEL_GEN (dev_priv) >=12 ) -I915_WRITE (TRANS_CLK_SEL (cpu_transcoder), -TGL_TRANS_CLK_SEL_PORT (port)); +intel_de_write (dev_priv, +TRANS_CLK_SEL (cpu_transcoder), +TGL_TRANS_CLK_SEL_PORT (port));else -I915_WRITE (TRANS_CLK_SEL (cpu_transcoder), -TRANS_CLK_SEL_PORT (port)); +intel_de_write (dev_priv, +TRANS_CLK_SEL (cpu_transcoder), +TRANS_CLK_SEL_PORT (port)); } }
@@ -2310,11 +2305,13 @@ void intel_ddi_disable_pipe_clock(const struct intel_crtc_state *crtc_state)if (cpu_transcoder !=TRANSCODER_EDP ) {if (INTEL_GEN (dev_priv) >=12 ) -I915_WRITE (TRANS_CLK_SEL (cpu_transcoder), -TGL_TRANS_CLK_SEL_DISABLED ); +intel_de_write (dev_priv, +TRANS_CLK_SEL (cpu_transcoder), +TGL_TRANS_CLK_SEL_DISABLED );else -I915_WRITE (TRANS_CLK_SEL (cpu_transcoder), -TRANS_CLK_SEL_DISABLED ); +intel_de_write (dev_priv, +TRANS_CLK_SEL (cpu_transcoder), +TRANS_CLK_SEL_DISABLED ); } }
@@ -2323,13 +2320,13 @@ static void _skl_ddi_set_iboost(struct drm_i915_private *dev_priv, {u32 tmp; - tmp =I915_READ (DISPIO_CR_TX_BMU_CR0 ); + tmp =intel_de_read (dev_priv,DISPIO_CR_TX_BMU_CR0 ); tmp &= ~(BALANCE_LEG_MASK (port) |BALANCE_LEG_DISABLE (port));if (iboost) tmp |= iboost <<BALANCE_LEG_SHIFT (port);else tmp |=BALANCE_LEG_DISABLE (port); -I915_WRITE (DISPIO_CR_TX_BMU_CR0 , tmp); +intel_de_write (dev_priv,DISPIO_CR_TX_BMU_CR0 , tmp); } static void skl_ddi_set_iboost(struct intel_encoder *encoder,
@@ -2491,46 +2488,46 @@ static void cnl_ddi_vswing_program(struct intel_encoder *encoder, level = n_entries -1 ;/* Set PORT_TX_DW5 Scaling Mode Sel to 010b. */ - val =I915_READ (CNL_PORT_TX_DW5_LN0 (port)); + val =intel_de_read (dev_priv,CNL_PORT_TX_DW5_LN0 (port)); val &= ~SCALING_MODE_SEL_MASK ; val |=SCALING_MODE_SEL (2 ); -I915_WRITE (CNL_PORT_TX_DW5_GRP (port), val); +intel_de_write (dev_priv,CNL_PORT_TX_DW5_GRP (port), val);/* Program PORT_TX_DW2 */ - val =I915_READ (CNL_PORT_TX_DW2_LN0 (port)); + val =intel_de_read (dev_priv,CNL_PORT_TX_DW2_LN0 (port)); val &= ~(SWING_SEL_LOWER_MASK |SWING_SEL_UPPER_MASK |RCOMP_SCALAR_MASK ); val |=SWING_SEL_UPPER (ddi_translations[level].dw2_swing_sel); val |=SWING_SEL_LOWER (ddi_translations[level].dw2_swing_sel);/* Rcomp scalar is fixed as 0x98 for every table entry */ val |=RCOMP_SCALAR (0x98 ); -I915_WRITE (CNL_PORT_TX_DW2_GRP (port), val); +intel_de_write (dev_priv,CNL_PORT_TX_DW2_GRP (port), val);/* Program PORT_TX_DW4 */ /* We cannot write to GRP. It would overrite individual loadgen */ for (ln =0 ; ln <4 ; ln++) { - val =I915_READ (CNL_PORT_TX_DW4_LN (ln, port)); + val =intel_de_read (dev_priv,CNL_PORT_TX_DW4_LN (ln, port)); val &= ~(POST_CURSOR_1_MASK |POST_CURSOR_2_MASK |CURSOR_COEFF_MASK ); val |=POST_CURSOR_1 (ddi_translations[level].dw4_post_cursor_1); val |=POST_CURSOR_2 (ddi_translations[level].dw4_post_cursor_2); val |=CURSOR_COEFF (ddi_translations[level].dw4_cursor_coeff); -I915_WRITE (CNL_PORT_TX_DW4_LN (ln, port), val); +intel_de_write (dev_priv,CNL_PORT_TX_DW4_LN (ln, port), val); }/* Program PORT_TX_DW5 */ /* All DW5 values are fixed for every table entry */ - val =I915_READ (CNL_PORT_TX_DW5_LN0 (port)); + val =intel_de_read (dev_priv,CNL_PORT_TX_DW5_LN0 (port)); val &= ~RTERM_SELECT_MASK ; val |=RTERM_SELECT (6 ); val |=TAP3_DISABLE ; -I915_WRITE (CNL_PORT_TX_DW5_GRP (port), val); +intel_de_write (dev_priv,CNL_PORT_TX_DW5_GRP (port), val);/* Program PORT_TX_DW7 */ - val =I915_READ (CNL_PORT_TX_DW7_LN0 (port)); + val =intel_de_read (dev_priv,CNL_PORT_TX_DW7_LN0 (port)); val &= ~N_SCALAR_MASK ; val |=N_SCALAR (ddi_translations[level].dw7_n_scalar); -I915_WRITE (CNL_PORT_TX_DW7_GRP (port), val); +intel_de_write (dev_priv,CNL_PORT_TX_DW7_GRP (port), val); } static void cnl_ddi_vswing_sequence(struct intel_encoder *encoder,
@@ -2556,12 +2553,12 @@ static void cnl_ddi_vswing_sequence(struct intel_encoder *encoder,* set PORT_PCS_DW1 cmnkeeper_enable to 1b, * else clear to 0b. */ - val =I915_READ (CNL_PORT_PCS_DW1_LN0 (port)); + val =intel_de_read (dev_priv,CNL_PORT_PCS_DW1_LN0 (port));if (type !=INTEL_OUTPUT_HDMI ) val |=COMMON_KEEPER_EN ;else val &= ~COMMON_KEEPER_EN ; -I915_WRITE (CNL_PORT_PCS_DW1_GRP (port), val); +intel_de_write (dev_priv,CNL_PORT_PCS_DW1_GRP (port), val);/* 2. Program loadgen select */ /*
@@ -2571,33 +2568,33 @@ static void cnl_ddi_vswing_sequence(struct intel_encoder *encoder,* > 6 GHz (LN0=0, LN1=0, LN2=0, LN3=0) */ for (ln =0 ; ln <=3 ; ln++) { - val =I915_READ (CNL_PORT_TX_DW4_LN (ln, port)); + val =intel_de_read (dev_priv,CNL_PORT_TX_DW4_LN (ln, port)); val &= ~LOADGEN_SELECT ;if ((rate <=600000 && width ==4 && ln >=1 ) || (rate <=600000 && width <4 && (ln ==1 || ln ==2 ))) { val |=LOADGEN_SELECT ; } -I915_WRITE (CNL_PORT_TX_DW4_LN (ln, port), val); +intel_de_write (dev_priv,CNL_PORT_TX_DW4_LN (ln, port), val); }/* 3. Set PORT_CL_DW5 SUS Clock Config to 11b */ - val =I915_READ (CNL_PORT_CL1CM_DW5 ); + val =intel_de_read (dev_priv,CNL_PORT_CL1CM_DW5 ); val |=SUS_CLOCK_CONFIG ; -I915_WRITE (CNL_PORT_CL1CM_DW5 , val); +intel_de_write (dev_priv,CNL_PORT_CL1CM_DW5 , val);/* 4. Clear training enable to change swing values */ - val =I915_READ (CNL_PORT_TX_DW5_LN0 (port)); + val =intel_de_read (dev_priv,CNL_PORT_TX_DW5_LN0 (port)); val &= ~TX_TRAINING_EN ; -I915_WRITE (CNL_PORT_TX_DW5_GRP (port), val); +intel_de_write (dev_priv,CNL_PORT_TX_DW5_GRP (port), val);/* 5. Program swing and de-emphasis */ cnl_ddi_vswing_program (encoder, level, type);/* 6. Set training enable to trigger update */ - val =I915_READ (CNL_PORT_TX_DW5_LN0 (port)); + val =intel_de_read (dev_priv,CNL_PORT_TX_DW5_LN0 (port)); val |=TX_TRAINING_EN ; -I915_WRITE (CNL_PORT_TX_DW5_GRP (port), val); +intel_de_write (dev_priv,CNL_PORT_TX_DW5_GRP (port), val); } static void icl_ddi_combo_vswing_program(struct drm_i915_private *dev_priv,
@@ -2623,41 +2620,41 @@ static void icl_ddi_combo_vswing_program(struct drm_i915_private *dev_priv, }/* Set PORT_TX_DW5 */ - val =I915_READ (ICL_PORT_TX_DW5_LN0 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN0 (phy)); val &= ~(SCALING_MODE_SEL_MASK |RTERM_SELECT_MASK |TAP2_DISABLE |TAP3_DISABLE ); val |=SCALING_MODE_SEL (0x2 ); val |=RTERM_SELECT (0x6 ); val |=TAP3_DISABLE ; -I915_WRITE (ICL_PORT_TX_DW5_GRP (phy), val); +intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), val);/* Program PORT_TX_DW2 */ - val =I915_READ (ICL_PORT_TX_DW2_LN0 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_TX_DW2_LN0 (phy)); val &= ~(SWING_SEL_LOWER_MASK |SWING_SEL_UPPER_MASK |RCOMP_SCALAR_MASK ); val |=SWING_SEL_UPPER (ddi_translations[level].dw2_swing_sel); val |=SWING_SEL_LOWER (ddi_translations[level].dw2_swing_sel);/* Program Rcomp scalar for every table entry */ val |=RCOMP_SCALAR (0x98 ); -I915_WRITE (ICL_PORT_TX_DW2_GRP (phy), val); +intel_de_write (dev_priv,ICL_PORT_TX_DW2_GRP (phy), val);/* Program PORT_TX_DW4 */ /* We cannot write to GRP. It would overwrite individual loadgen. */ for (ln =0 ; ln <=3 ; ln++) { - val =I915_READ (ICL_PORT_TX_DW4_LN (ln, phy)); + val =intel_de_read (dev_priv,ICL_PORT_TX_DW4_LN (ln, phy)); val &= ~(POST_CURSOR_1_MASK |POST_CURSOR_2_MASK |CURSOR_COEFF_MASK ); val |=POST_CURSOR_1 (ddi_translations[level].dw4_post_cursor_1); val |=POST_CURSOR_2 (ddi_translations[level].dw4_post_cursor_2); val |=CURSOR_COEFF (ddi_translations[level].dw4_cursor_coeff); -I915_WRITE (ICL_PORT_TX_DW4_LN (ln, phy), val); +intel_de_write (dev_priv,ICL_PORT_TX_DW4_LN (ln, phy), val); }/* Program PORT_TX_DW7 */ - val =I915_READ (ICL_PORT_TX_DW7_LN0 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_TX_DW7_LN0 (phy)); val &= ~N_SCALAR_MASK ; val |=N_SCALAR (ddi_translations[level].dw7_n_scalar); -I915_WRITE (ICL_PORT_TX_DW7_GRP (phy), val); +intel_de_write (dev_priv,ICL_PORT_TX_DW7_GRP (phy), val); } static void icl_combo_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
@@ -2686,12 +2683,12 @@ static void icl_combo_phy_ddi_vswing_sequence(struct intel_encoder *encoder,* set PORT_PCS_DW1 cmnkeeper_enable to 1b, * else clear to 0b. */ - val =I915_READ (ICL_PORT_PCS_DW1_LN0 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_PCS_DW1_LN0 (phy));if (type ==INTEL_OUTPUT_HDMI ) val &= ~COMMON_KEEPER_EN ;else val |=COMMON_KEEPER_EN ; -I915_WRITE (ICL_PORT_PCS_DW1_GRP (phy), val); +intel_de_write (dev_priv,ICL_PORT_PCS_DW1_GRP (phy), val);/* 2. Program loadgen select */ /*
@@ -2701,33 +2698,33 @@ static void icl_combo_phy_ddi_vswing_sequence(struct intel_encoder *encoder,* > 6 GHz (LN0=0, LN1=0, LN2=0, LN3=0) */ for (ln =0 ; ln <=3 ; ln++) { - val =I915_READ (ICL_PORT_TX_DW4_LN (ln, phy)); + val =intel_de_read (dev_priv,ICL_PORT_TX_DW4_LN (ln, phy)); val &= ~LOADGEN_SELECT ;if ((rate <=600000 && width ==4 && ln >=1 ) || (rate <=600000 && width <4 && (ln ==1 || ln ==2 ))) { val |=LOADGEN_SELECT ; } -I915_WRITE (ICL_PORT_TX_DW4_LN (ln, phy), val); +intel_de_write (dev_priv,ICL_PORT_TX_DW4_LN (ln, phy), val); }/* 3. Set PORT_CL_DW5 SUS Clock Config to 11b */ - val =I915_READ (ICL_PORT_CL_DW5 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_CL_DW5 (phy)); val |=SUS_CLOCK_CONFIG ; -I915_WRITE (ICL_PORT_CL_DW5 (phy), val); +intel_de_write (dev_priv,ICL_PORT_CL_DW5 (phy), val);/* 4. Clear training enable to change swing values */ - val =I915_READ (ICL_PORT_TX_DW5_LN0 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN0 (phy)); val &= ~TX_TRAINING_EN ; -I915_WRITE (ICL_PORT_TX_DW5_GRP (phy), val); +intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), val);/* 5. Program swing and de-emphasis */ icl_ddi_combo_vswing_program (dev_priv, level, phy, type, rate);/* 6. Set training enable to trigger update */ - val =I915_READ (ICL_PORT_TX_DW5_LN0 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN0 (phy)); val |=TX_TRAINING_EN ; -I915_WRITE (ICL_PORT_TX_DW5_GRP (phy), val); +intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), val); } static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
@@ -2751,33 +2748,33 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,/* Set MG_TX_LINK_PARAMS cri_use_fs32 to 0. */ for (ln =0 ; ln <2 ; ln++) { - val =I915_READ (MG_TX1_LINK_PARAMS (ln, tc_port)); + val =intel_de_read (dev_priv,MG_TX1_LINK_PARAMS (ln, tc_port)); val &= ~CRI_USE_FS32 ; -I915_WRITE (MG_TX1_LINK_PARAMS (ln, tc_port), val); +intel_de_write (dev_priv,MG_TX1_LINK_PARAMS (ln, tc_port), val); - val =I915_READ (MG_TX2_LINK_PARAMS (ln, tc_port)); + val =intel_de_read (dev_priv,MG_TX2_LINK_PARAMS (ln, tc_port)); val &= ~CRI_USE_FS32 ; -I915_WRITE (MG_TX2_LINK_PARAMS (ln, tc_port), val); +intel_de_write (dev_priv,MG_TX2_LINK_PARAMS (ln, tc_port), val); }/* Program MG_TX_SWINGCTRL with values from vswing table */ for (ln =0 ; ln <2 ; ln++) { - val =I915_READ (MG_TX1_SWINGCTRL (ln, tc_port)); + val =intel_de_read (dev_priv,MG_TX1_SWINGCTRL (ln, tc_port)); val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK ; val |=CRI_TXDEEMPH_OVERRIDE_17_12 ( ddi_translations[level].cri_txdeemph_override_17_12); -I915_WRITE (MG_TX1_SWINGCTRL (ln, tc_port), val); +intel_de_write (dev_priv,MG_TX1_SWINGCTRL (ln, tc_port), val); - val =I915_READ (MG_TX2_SWINGCTRL (ln, tc_port)); + val =intel_de_read (dev_priv,MG_TX2_SWINGCTRL (ln, tc_port)); val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK ; val |=CRI_TXDEEMPH_OVERRIDE_17_12 ( ddi_translations[level].cri_txdeemph_override_17_12); -I915_WRITE (MG_TX2_SWINGCTRL (ln, tc_port), val); +intel_de_write (dev_priv,MG_TX2_SWINGCTRL (ln, tc_port), val); }/* Program MG_TX_DRVCTRL with values from vswing table */ for (ln =0 ; ln <2 ; ln++) { - val =I915_READ (MG_TX1_DRVCTRL (ln, tc_port)); + val =intel_de_read (dev_priv,MG_TX1_DRVCTRL (ln, tc_port)); val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK |CRI_TXDEEMPH_OVERRIDE_5_0_MASK ); val |= CRI_TXDEEMPH_OVERRIDE_5_0(
@@ -2785,9 +2782,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,CRI_TXDEEMPH_OVERRIDE_11_6 ( ddi_translations[level].cri_txdeemph_override_11_6) |CRI_TXDEEMPH_OVERRIDE_EN ; -I915_WRITE (MG_TX1_DRVCTRL (ln, tc_port), val); +intel_de_write (dev_priv,MG_TX1_DRVCTRL (ln, tc_port), val); - val =I915_READ (MG_TX2_DRVCTRL (ln, tc_port)); + val =intel_de_read (dev_priv,MG_TX2_DRVCTRL (ln, tc_port)); val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK |CRI_TXDEEMPH_OVERRIDE_5_0_MASK ); val |= CRI_TXDEEMPH_OVERRIDE_5_0(
@@ -2795,7 +2792,7 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,CRI_TXDEEMPH_OVERRIDE_11_6 ( ddi_translations[level].cri_txdeemph_override_11_6) |CRI_TXDEEMPH_OVERRIDE_EN ; -I915_WRITE (MG_TX2_DRVCTRL (ln, tc_port), val); +intel_de_write (dev_priv,MG_TX2_DRVCTRL (ln, tc_port), val);/* FIXME: Program CRI_LOADGEN_SEL after the spec is updated */ }
@@ -2806,17 +2803,17 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,* values from table for which TX1 and TX2 enabled. */ for (ln =0 ; ln <2 ; ln++) { - val =I915_READ (MG_CLKHUB (ln, tc_port)); + val =intel_de_read (dev_priv,MG_CLKHUB (ln, tc_port));if (link_clock <300000 ) val |=CFG_LOW_RATE_LKREN_EN ;else val &= ~CFG_LOW_RATE_LKREN_EN ; -I915_WRITE (MG_CLKHUB (ln, tc_port), val); +intel_de_write (dev_priv,MG_CLKHUB (ln, tc_port), val); }/* Program the MG_TX_DCC<LN, port being used> based on the link frequency */ for (ln =0 ; ln <2 ; ln++) { - val =I915_READ (MG_TX1_DCC (ln, tc_port)); + val =intel_de_read (dev_priv,MG_TX1_DCC (ln, tc_port)); val &= ~CFG_AMI_CK_DIV_OVERRIDE_VAL_MASK ;if (link_clock <=500000 ) { val &= ~CFG_AMI_CK_DIV_OVERRIDE_EN ;
@@ -2824,9 +2821,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, val |=CFG_AMI_CK_DIV_OVERRIDE_EN |CFG_AMI_CK_DIV_OVERRIDE_VAL (1 ); } -I915_WRITE (MG_TX1_DCC (ln, tc_port), val); +intel_de_write (dev_priv,MG_TX1_DCC (ln, tc_port), val); - val =I915_READ (MG_TX2_DCC (ln, tc_port)); + val =intel_de_read (dev_priv,MG_TX2_DCC (ln, tc_port)); val &= ~CFG_AMI_CK_DIV_OVERRIDE_VAL_MASK ;if (link_clock <=500000 ) { val &= ~CFG_AMI_CK_DIV_OVERRIDE_EN ;
@@ -2834,18 +2831,22 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, val |=CFG_AMI_CK_DIV_OVERRIDE_EN |CFG_AMI_CK_DIV_OVERRIDE_VAL (1 ); } -I915_WRITE (MG_TX2_DCC (ln, tc_port), val); +intel_de_write (dev_priv,MG_TX2_DCC (ln, tc_port), val); }/* Program MG_TX_PISO_READLOAD with values from vswing table */ for (ln =0 ; ln <2 ; ln++) { - val =I915_READ (MG_TX1_PISO_READLOAD (ln, tc_port)); + val =intel_de_read (dev_priv, +MG_TX1_PISO_READLOAD (ln, tc_port)); val |=CRI_CALCINIT ; -I915_WRITE (MG_TX1_PISO_READLOAD (ln, tc_port), val); +intel_de_write (dev_priv,MG_TX1_PISO_READLOAD (ln, tc_port), + val); - val =I915_READ (MG_TX2_PISO_READLOAD (ln, tc_port)); + val =intel_de_read (dev_priv, +MG_TX2_PISO_READLOAD (ln, tc_port)); val |=CRI_CALCINIT ; -I915_WRITE (MG_TX2_PISO_READLOAD (ln, tc_port), val); +intel_de_write (dev_priv,MG_TX2_PISO_READLOAD (ln, tc_port), + val); } }
@@ -2891,24 +2892,25 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, int link_clock, dpcnt_val |=DKL_TX_PRESHOOT_COEFF (ddi_translations[level].dkl_preshoot_control);for (ln =0 ; ln <2 ; ln++) { -I915_WRITE (HIP_INDEX_REG (tc_port),HIP_INDEX_VAL (tc_port, ln)); +intel_de_write (dev_priv,HIP_INDEX_REG (tc_port), +HIP_INDEX_VAL (tc_port, ln)); -I915_WRITE (DKL_TX_PMD_LANE_SUS (tc_port),0 ); +intel_de_write (dev_priv,DKL_TX_PMD_LANE_SUS (tc_port),0 );/* All the registers are RMW */ - val =I915_READ (DKL_TX_DPCNTL0 (tc_port)); + val =intel_de_read (dev_priv,DKL_TX_DPCNTL0 (tc_port)); val &= ~dpcnt_mask; val |= dpcnt_val; -I915_WRITE (DKL_TX_DPCNTL0 (tc_port), val); +intel_de_write (dev_priv,DKL_TX_DPCNTL0 (tc_port), val); - val =I915_READ (DKL_TX_DPCNTL1 (tc_port)); + val =intel_de_read (dev_priv,DKL_TX_DPCNTL1 (tc_port)); val &= ~dpcnt_mask; val |= dpcnt_val; -I915_WRITE (DKL_TX_DPCNTL1 (tc_port), val); +intel_de_write (dev_priv,DKL_TX_DPCNTL1 (tc_port), val); - val =I915_READ (DKL_TX_DPCNTL2 (tc_port)); + val =intel_de_read (dev_priv,DKL_TX_DPCNTL2 (tc_port)); val &= ~DKL_TX_DP20BITMODE ; -I915_WRITE (DKL_TX_DPCNTL2 (tc_port), val); +intel_de_write (dev_priv,DKL_TX_DPCNTL2 (tc_port), val); } }
@@ -3010,7 +3012,7 @@ static void icl_map_plls_to_ports(struct intel_encoder *encoder,mutex_lock (&dev_priv->dpll_lock); - val =I915_READ (ICL_DPCLKA_CFGCR0 ); + val =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 );WARN_ON ((val &icl_dpclka_cfgcr0_clk_off (dev_priv, phy)) ==0 );if (intel_phy_is_combo (dev_priv, phy)) {
@@ -3026,12 +3028,12 @@ static void icl_map_plls_to_ports(struct intel_encoder *encoder,*/ val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); val |=ICL_DPCLKA_CFGCR0_DDI_CLK_SEL (pll->info->id, phy); -I915_WRITE (ICL_DPCLKA_CFGCR0 , val); -POSTING_READ (ICL_DPCLKA_CFGCR0 ); +intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val); +intel_de_posting_read (dev_priv,ICL_DPCLKA_CFGCR0 ); } val &= ~icl_dpclka_cfgcr0_clk_off (dev_priv, phy); -I915_WRITE (ICL_DPCLKA_CFGCR0 , val); +intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val);mutex_unlock (&dev_priv->dpll_lock); }
@@ -3044,9 +3046,9 @@ static void icl_unmap_plls_to_ports(struct intel_encoder *encoder)mutex_lock (&dev_priv->dpll_lock); - val =I915_READ (ICL_DPCLKA_CFGCR0 ); + val =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ); val |=icl_dpclka_cfgcr0_clk_off (dev_priv, phy); -I915_WRITE (ICL_DPCLKA_CFGCR0 , val); +intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val);mutex_unlock (&dev_priv->dpll_lock); }
@@ -3057,7 +3059,7 @@ static void icl_sanitize_port_clk_off(struct drm_i915_private *dev_priv,enum port port;u32 val; - val =I915_READ (ICL_DPCLKA_CFGCR0 ); + val =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 );for_each_port_masked (port, port_mask) {enum phy phy =intel_port_to_phy (dev_priv, port); bool ddi_clk_off = val & icl_dpclka_cfgcr0_clk_off(dev_priv,
@@ -3076,7 +3078,7 @@ static void icl_sanitize_port_clk_off(struct drm_i915_private *dev_priv,DRM_NOTE ("PHY %c is disabled/in DSI mode with an ungated DDI clock, gate it\n" ,phy_name (phy)); val |=icl_dpclka_cfgcr0_clk_off (dev_priv, phy); -I915_WRITE (ICL_DPCLKA_CFGCR0 , val); +intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val); } }
@@ -3150,42 +3152,44 @@ static void intel_ddi_clk_select(struct intel_encoder *encoder,if (INTEL_GEN (dev_priv) >=11 ) {if (!intel_phy_is_combo (dev_priv, phy)) -I915_WRITE (DDI_CLK_SEL (port), -icl_pll_to_ddi_clk_sel (encoder, crtc_state)); +intel_de_write (dev_priv,DDI_CLK_SEL (port), +icl_pll_to_ddi_clk_sel (encoder, crtc_state));else if (IS_ELKHARTLAKE (dev_priv) && port >=PORT_C )/* * MG does not exist but the programming is required * to ungate DDIC and DDID */ -I915_WRITE (DDI_CLK_SEL (port),DDI_CLK_SEL_MG ); +intel_de_write (dev_priv,DDI_CLK_SEL (port), +DDI_CLK_SEL_MG ); }else if (IS_CANNONLAKE (dev_priv)) {/* Configure DPCLKA_CFGCR0 to map the DPLL to the DDI. */ - val =I915_READ (DPCLKA_CFGCR0 ); + val =intel_de_read (dev_priv,DPCLKA_CFGCR0 ); val &= ~DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (port); val |=DPCLKA_CFGCR0_DDI_CLK_SEL (pll->info->id, port); -I915_WRITE (DPCLKA_CFGCR0 , val); +intel_de_write (dev_priv,DPCLKA_CFGCR0 , val);/* * Configure DPCLKA_CFGCR0 to turn on the clock for the DDI. * This step and the step before must be done with separate * register writes. */ - val =I915_READ (DPCLKA_CFGCR0 ); + val =intel_de_read (dev_priv,DPCLKA_CFGCR0 ); val &= ~DPCLKA_CFGCR0_DDI_CLK_OFF (port); -I915_WRITE (DPCLKA_CFGCR0 , val); +intel_de_write (dev_priv,DPCLKA_CFGCR0 , val); }else if (IS_GEN9_BC (dev_priv)) {/* DDI -> PLL mapping */ - val =I915_READ (DPLL_CTRL2 ); + val =intel_de_read (dev_priv,DPLL_CTRL2 ); val &= ~(DPLL_CTRL2_DDI_CLK_OFF (port) |DPLL_CTRL2_DDI_CLK_SEL_MASK (port)); val |= (DPLL_CTRL2_DDI_CLK_SEL (pll->info->id, port) |DPLL_CTRL2_DDI_SEL_OVERRIDE (port)); -I915_WRITE (DPLL_CTRL2 , val); +intel_de_write (dev_priv,DPLL_CTRL2 , val); }else if (INTEL_GEN (dev_priv) <9 ) { -I915_WRITE (PORT_CLK_SEL (port),hsw_pll_to_ddi_pll_sel (pll)); +intel_de_write (dev_priv,PORT_CLK_SEL (port), +hsw_pll_to_ddi_pll_sel (pll)); }mutex_unlock (&dev_priv->dpll_lock);
@@ -3200,15 +3204,17 @@ static void intel_ddi_clk_disable(struct intel_encoder *encoder)if (INTEL_GEN (dev_priv) >=11 ) {if (!intel_phy_is_combo (dev_priv, phy) || (IS_ELKHARTLAKE (dev_priv) && port >=PORT_C )) -I915_WRITE (DDI_CLK_SEL (port),DDI_CLK_SEL_NONE ); +intel_de_write (dev_priv,DDI_CLK_SEL (port), +DDI_CLK_SEL_NONE ); }else if (IS_CANNONLAKE (dev_priv)) { -I915_WRITE (DPCLKA_CFGCR0 ,I915_READ (DPCLKA_CFGCR0 ) | -DPCLKA_CFGCR0_DDI_CLK_OFF (port)); +intel_de_write (dev_priv,DPCLKA_CFGCR0 , +intel_de_read (dev_priv,DPCLKA_CFGCR0 ) |DPCLKA_CFGCR0_DDI_CLK_OFF (port)); }else if (IS_GEN9_BC (dev_priv)) { -I915_WRITE (DPLL_CTRL2 ,I915_READ (DPLL_CTRL2 ) | -DPLL_CTRL2_DDI_CLK_OFF (port)); +intel_de_write (dev_priv,DPLL_CTRL2 , +intel_de_read (dev_priv,DPLL_CTRL2 ) |DPLL_CTRL2_DDI_CLK_OFF (port)); }else if (INTEL_GEN (dev_priv) <9 ) { -I915_WRITE (PORT_CLK_SEL (port),PORT_CLK_SEL_NONE ); +intel_de_write (dev_priv,PORT_CLK_SEL (port), +PORT_CLK_SEL_NONE ); } }
@@ -3225,13 +3231,15 @@ icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port,return ;if (INTEL_GEN (dev_priv) >=12 ) { -I915_WRITE (HIP_INDEX_REG (tc_port),HIP_INDEX_VAL (tc_port,0x0 )); - ln0 =I915_READ (DKL_DP_MODE (tc_port)); -I915_WRITE (HIP_INDEX_REG (tc_port),HIP_INDEX_VAL (tc_port,0x1 )); - ln1 =I915_READ (DKL_DP_MODE (tc_port)); +intel_de_write (dev_priv,HIP_INDEX_REG (tc_port), +HIP_INDEX_VAL (tc_port,0x0 )); + ln0 =intel_de_read (dev_priv,DKL_DP_MODE (tc_port)); +intel_de_write (dev_priv,HIP_INDEX_REG (tc_port), +HIP_INDEX_VAL (tc_port,0x1 )); + ln1 =intel_de_read (dev_priv,DKL_DP_MODE (tc_port)); }else { - ln0 =I915_READ (MG_DP_MODE (0 , tc_port)); - ln1 =I915_READ (MG_DP_MODE (1 , tc_port)); + ln0 =intel_de_read (dev_priv,MG_DP_MODE (0 , tc_port)); + ln1 =intel_de_read (dev_priv,MG_DP_MODE (1 , tc_port)); } ln0 &= ~(MG_DP_MODE_CFG_DP_X1_MODE |MG_DP_MODE_CFG_DP_X1_MODE );
@@ -3288,13 +3296,15 @@ icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port, }if (INTEL_GEN (dev_priv) >=12 ) { -I915_WRITE (HIP_INDEX_REG (tc_port),HIP_INDEX_VAL (tc_port,0x0 )); -I915_WRITE (DKL_DP_MODE (tc_port), ln0); -I915_WRITE (HIP_INDEX_REG (tc_port),HIP_INDEX_VAL (tc_port,0x1 )); -I915_WRITE (DKL_DP_MODE (tc_port), ln1); +intel_de_write (dev_priv,HIP_INDEX_REG (tc_port), +HIP_INDEX_VAL (tc_port,0x0 )); +intel_de_write (dev_priv,DKL_DP_MODE (tc_port), ln0); +intel_de_write (dev_priv,HIP_INDEX_REG (tc_port), +HIP_INDEX_VAL (tc_port,0x1 )); +intel_de_write (dev_priv,DKL_DP_MODE (tc_port), ln1); }else { -I915_WRITE (MG_DP_MODE (0 , tc_port), ln0); -I915_WRITE (MG_DP_MODE (1 , tc_port), ln1); +intel_de_write (dev_priv,MG_DP_MODE (0 , tc_port), ln0); +intel_de_write (dev_priv,MG_DP_MODE (1 , tc_port), ln1); } }
@@ -3319,9 +3329,9 @@ static void intel_ddi_enable_fec(struct intel_encoder *encoder,return ; intel_dp =enc_to_intel_dp (encoder); - val =I915_READ (intel_dp->regs.dp_tp_ctl); + val =intel_de_read (dev_priv, intel_dp->regs.dp_tp_ctl); val |=DP_TP_CTL_FEC_ENABLE ; -I915_WRITE (intel_dp->regs.dp_tp_ctl, val); +intel_de_write (dev_priv, intel_dp->regs.dp_tp_ctl, val);if (intel_de_wait_for_set (dev_priv, intel_dp->regs.dp_tp_status,DP_TP_STATUS_FEC_ENABLE_LIVE ,1 ))
@@ -3339,10 +3349,10 @@ static void intel_ddi_disable_fec_state(struct intel_encoder *encoder,return ; intel_dp =enc_to_intel_dp (encoder); - val =I915_READ (intel_dp->regs.dp_tp_ctl); + val =intel_de_read (dev_priv, intel_dp->regs.dp_tp_ctl); val &= ~DP_TP_CTL_FEC_ENABLE ; -I915_WRITE (intel_dp->regs.dp_tp_ctl, val); -POSTING_READ (intel_dp->regs.dp_tp_ctl); +intel_de_write (dev_priv, intel_dp->regs.dp_tp_ctl, val); +intel_de_posting_read (dev_priv, intel_dp->regs.dp_tp_ctl); } static void tgl_ddi_pre_enable_dp(struct intel_encoder *encoder,
@@ -3669,20 +3679,20 @@ static void intel_disable_ddi_buf(struct intel_encoder *encoder,bool wait = false;u32 val; - val =I915_READ (DDI_BUF_CTL (port)); + val =intel_de_read (dev_priv,DDI_BUF_CTL (port));if (val &DDI_BUF_CTL_ENABLE ) { val &= ~DDI_BUF_CTL_ENABLE ; -I915_WRITE (DDI_BUF_CTL (port), val); +intel_de_write (dev_priv,DDI_BUF_CTL (port), val); wait = true; }if (intel_crtc_has_dp_encoder (crtc_state)) {struct intel_dp *intel_dp =enc_to_intel_dp (encoder); - val =I915_READ (intel_dp->regs.dp_tp_ctl); + val =intel_de_read (dev_priv, intel_dp->regs.dp_tp_ctl); val &= ~(DP_TP_CTL_ENABLE |DP_TP_CTL_LINK_TRAIN_MASK ); val |=DP_TP_CTL_LINK_TRAIN_PAT1 ; -I915_WRITE (intel_dp->regs.dp_tp_ctl, val); +intel_de_write (dev_priv, intel_dp->regs.dp_tp_ctl, val); }/* Disable FEC in DP Sink */
@@ -3714,9 +3724,12 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder,enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;u32 val; - val =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder)); + val =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (cpu_transcoder)); val &= ~TGL_TRANS_DDI_PORT_MASK ; -I915_WRITE (TRANS_DDI_FUNC_CTL (cpu_transcoder), val); +intel_de_write (dev_priv, +TRANS_DDI_FUNC_CTL (cpu_transcoder), + val); } }else {if (!is_mst)
@@ -3778,7 +3791,8 @@ static void icl_disable_transcoder_port_sync(const struct intel_crtc_state *old_DRM_DEBUG_KMS ("Disabling Transcoder Port Sync on Slave Transcoder %s\n" ,transcoder_name (old_crtc_state->cpu_transcoder)); -I915_WRITE (TRANS_DDI_FUNC_CTL2 (old_crtc_state->cpu_transcoder),0 ); +intel_de_write (dev_priv, +TRANS_DDI_FUNC_CTL2 (old_crtc_state->cpu_transcoder),0 ); } static void intel_ddi_post_disable(struct intel_encoder *encoder,
@@ -3852,25 +3866,25 @@ void intel_ddi_fdi_post_disable(struct intel_encoder *encoder,* step 13 is the correct place for it. Step 18 is where it was * originally before the BUN. */ - val =I915_READ (FDI_RX_CTL (PIPE_A )); + val =intel_de_read (dev_priv,FDI_RX_CTL (PIPE_A )); val &= ~FDI_RX_ENABLE ; -I915_WRITE (FDI_RX_CTL (PIPE_A ), val); +intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), val);intel_disable_ddi_buf (encoder, old_crtc_state);intel_ddi_clk_disable (encoder); - val =I915_READ (FDI_RX_MISC (PIPE_A )); + val =intel_de_read (dev_priv,FDI_RX_MISC (PIPE_A )); val &= ~(FDI_RX_PWRDN_LANE1_MASK |FDI_RX_PWRDN_LANE0_MASK ); val |=FDI_RX_PWRDN_LANE1_VAL (2 ) |FDI_RX_PWRDN_LANE0_VAL (2 ); -I915_WRITE (FDI_RX_MISC (PIPE_A ), val); +intel_de_write (dev_priv,FDI_RX_MISC (PIPE_A ), val); - val =I915_READ (FDI_RX_CTL (PIPE_A )); + val =intel_de_read (dev_priv,FDI_RX_CTL (PIPE_A )); val &= ~FDI_PCDCLK ; -I915_WRITE (FDI_RX_CTL (PIPE_A ), val); +intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), val); - val =I915_READ (FDI_RX_CTL (PIPE_A )); + val =intel_de_read (dev_priv,FDI_RX_CTL (PIPE_A )); val &= ~FDI_RX_PLL_ENABLE ; -I915_WRITE (FDI_RX_CTL (PIPE_A ), val); +intel_de_write (dev_priv,FDI_RX_CTL (PIPE_A ), val); } static void intel_enable_ddi_dp(struct intel_encoder *encoder,
@@ -3940,7 +3954,7 @@ static void intel_enable_ddi_hdmi(struct intel_encoder *encoder,i915_reg_t reg =gen9_chicken_trans_reg_by_port (dev_priv, port);u32 val; - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg);if (port ==PORT_E ) val |= DDIE_TRAINING_OVERRIDE_ENABLE |
@@ -3949,8 +3963,8 @@ static void intel_enable_ddi_hdmi(struct intel_encoder *encoder, val |=DDI_TRAINING_OVERRIDE_ENABLE |DDI_TRAINING_OVERRIDE_VALUE ; -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg);udelay (1 );
@@ -3961,15 +3975,15 @@ static void intel_enable_ddi_hdmi(struct intel_encoder *encoder, val &= ~(DDI_TRAINING_OVERRIDE_ENABLE |DDI_TRAINING_OVERRIDE_VALUE ); -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val); }/* In HDMI/DVI mode, the port width, and swing/emphasis values * are ignored so nothing special needs to be done besides * enabling the port. */ -I915_WRITE (DDI_BUF_CTL (port), - dig_port->saved_port_bits |DDI_BUF_CTL_ENABLE ); +intel_de_write (dev_priv,DDI_BUF_CTL (port), + dig_port->saved_port_bits |DDI_BUF_CTL_ENABLE );if (crtc_state->has_audio)intel_audio_codec_enable (encoder, crtc_state, conn_state);
@@ -4159,20 +4173,20 @@ static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)u32 dp_tp_ctl, ddi_buf_ctl;bool wait = false; - dp_tp_ctl =I915_READ (intel_dp->regs.dp_tp_ctl); + dp_tp_ctl =intel_de_read (dev_priv, intel_dp->regs.dp_tp_ctl);if (dp_tp_ctl &DP_TP_CTL_ENABLE ) { - ddi_buf_ctl =I915_READ (DDI_BUF_CTL (port)); + ddi_buf_ctl =intel_de_read (dev_priv,DDI_BUF_CTL (port));if (ddi_buf_ctl &DDI_BUF_CTL_ENABLE ) { -I915_WRITE (DDI_BUF_CTL (port), - ddi_buf_ctl & ~DDI_BUF_CTL_ENABLE ); +intel_de_write (dev_priv,DDI_BUF_CTL (port), + ddi_buf_ctl & ~DDI_BUF_CTL_ENABLE ); wait = true; } dp_tp_ctl &= ~(DP_TP_CTL_ENABLE |DP_TP_CTL_LINK_TRAIN_MASK ); dp_tp_ctl |=DP_TP_CTL_LINK_TRAIN_PAT1 ; -I915_WRITE (intel_dp->regs.dp_tp_ctl, dp_tp_ctl); -POSTING_READ (intel_dp->regs.dp_tp_ctl); +intel_de_write (dev_priv, intel_dp->regs.dp_tp_ctl, dp_tp_ctl); +intel_de_posting_read (dev_priv, intel_dp->regs.dp_tp_ctl);if (wait)intel_wait_ddi_buf_idle (dev_priv, port);
@@ -4187,12 +4201,12 @@ static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)if (drm_dp_enhanced_frame_cap (intel_dp->dpcd)) dp_tp_ctl |=DP_TP_CTL_ENHANCED_FRAME_ENABLE ; } -I915_WRITE (intel_dp->regs.dp_tp_ctl, dp_tp_ctl); -POSTING_READ (intel_dp->regs.dp_tp_ctl); +intel_de_write (dev_priv, intel_dp->regs.dp_tp_ctl, dp_tp_ctl); +intel_de_posting_read (dev_priv, intel_dp->regs.dp_tp_ctl); intel_dp->DP |=DDI_BUF_CTL_ENABLE ; -I915_WRITE (DDI_BUF_CTL (port), intel_dp->DP); -POSTING_READ (DDI_BUF_CTL (port)); +intel_de_write (dev_priv,DDI_BUF_CTL (port), intel_dp->DP); +intel_de_posting_read (dev_priv,DDI_BUF_CTL (port));udelay (600 ); }
@@ -4206,7 +4220,7 @@ static bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,if (!intel_display_power_is_enabled (dev_priv,POWER_DOMAIN_AUDIO ))return false; -return I915_READ (HSW_AUD_PIN_ELD_CP_VLD ) & +return intel_de_read (dev_priv,HSW_AUD_PIN_ELD_CP_VLD ) &AUDIO_OUTPUT_ENABLE (cpu_transcoder); }
@@ -4233,7 +4247,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder,intel_dsc_get_config (encoder, pipe_config); - temp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder)); + temp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (cpu_transcoder));if (temp &TRANS_DDI_PHSYNC ) flags |=DRM_MODE_FLAG_PHSYNC ;else
@@ -4302,7 +4316,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder, dp_tp_ctl =TGL_DP_TP_CTL (pipe_config->cpu_transcoder); pipe_config->fec_enable = -I915_READ (dp_tp_ctl) &DP_TP_CTL_FEC_ENABLE ; +intel_de_read (dev_priv, dp_tp_ctl) &DP_TP_CTL_FEC_ENABLE ; DRM_DEBUG_KMS("[ENCODER:%d:%s] Fec status: %u\n", encoder->base.base.id, encoder->base.name,
@@ -4673,7 +4687,7 @@ intel_ddi_max_lanes(struct intel_digital_port *intel_dport)return max_lanes;if (port ==PORT_A || port ==PORT_E ) { -if (I915_READ (DDI_BUF_CTL (PORT_A )) &DDI_A_4_LANES ) +if (intel_de_read (dev_priv,DDI_BUF_CTL (PORT_A )) &DDI_A_4_LANES ) max_lanes = port ==PORT_A ?4 :0 ;else /* Both A and E share 2 lanes */
@@ -4753,10 +4767,12 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder->pipe_mask = ~0 ;if (INTEL_GEN (dev_priv) >=11 ) - intel_dig_port->saved_port_bits =I915_READ (DDI_BUF_CTL (port)) & + intel_dig_port->saved_port_bits =intel_de_read (dev_priv, +DDI_BUF_CTL (port)) &DDI_BUF_PORT_REVERSAL ;else - intel_dig_port->saved_port_bits =I915_READ (DDI_BUF_CTL (port)) & + intel_dig_port->saved_port_bits =intel_de_read (dev_priv, +DDI_BUF_CTL (port)) & (DDI_BUF_PORT_REVERSAL |DDI_A_4_LANES ); intel_dig_port->dp.output_reg =INVALID_MMIO_REG ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/8 drm/i915/display: use intel_de_*() functions for register access
In reply to Jani NikulaThe implicit "dev_priv" local variable use has been a long-standing pain point in the register access macros I915_READ(), I915_WRITE(), POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register accessors intel_de_read(), intel_de_write(), intel_de_posting_read(), intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
--- drivers/gpu/drm/i915/display/intel_display.c | 1171 ++++++++++-------- 1 file changed, 622 insertions(+), 549 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +622 -549
@@ -519,13 +519,11 @@ static void skl_wa_827(struct drm_i915_private *dev_priv, enum pipe pipe, bool enable) { if (enable) - I915_WRITE(CLKGATE_DIS_PSL(pipe), - I915_READ(CLKGATE_DIS_PSL(pipe)) | - DUPS1_GATING_DIS | DUPS2_GATING_DIS); + intel_de_write(dev_priv, CLKGATE_DIS_PSL(pipe), + intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) | DUPS1_GATING_DIS | DUPS2_GATING_DIS); else - I915_WRITE(CLKGATE_DIS_PSL(pipe), - I915_READ(CLKGATE_DIS_PSL(pipe)) & - ~(DUPS1_GATING_DIS | DUPS2_GATING_DIS)); +intel_de_write (dev_priv ,CLKGATE_DIS_PSL (pipe ), + intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) & ~(DUPS1_GATING_DIS | DUPS2_GATING_DIS)); }/* Wa_2006604312:icl */
@@ -534,11 +532,11 @@ icl_wa_scalerclkgating(struct drm_i915_private *dev_priv, enum pipe pipe, bool enable) {if (enable) -I915_WRITE (CLKGATE_DIS_PSL (pipe), -I915_READ (CLKGATE_DIS_PSL (pipe)) |DPFR_GATING_DIS ); +intel_de_write (dev_priv,CLKGATE_DIS_PSL (pipe), +intel_de_read (dev_priv,CLKGATE_DIS_PSL (pipe)) |DPFR_GATING_DIS );else -I915_WRITE (CLKGATE_DIS_PSL (pipe), -I915_READ (CLKGATE_DIS_PSL (pipe)) & ~DPFR_GATING_DIS ); +intel_de_write (dev_priv,CLKGATE_DIS_PSL (pipe), +intel_de_read (dev_priv,CLKGATE_DIS_PSL (pipe)) & ~DPFR_GATING_DIS ); } static bool
@@ -1050,9 +1048,9 @@ static bool pipe_scanline_is_moving(struct drm_i915_private *dev_priv,else line_mask =DSL_LINEMASK_GEN3 ; - line1 =I915_READ (reg) & line_mask; + line1 =intel_de_read (dev_priv, reg) & line_mask;msleep (5 ); - line2 =I915_READ (reg) & line_mask; + line2 =intel_de_read (dev_priv, reg) & line_mask;return line1 != line2; }
@@ -1105,7 +1103,7 @@ void assert_pll(struct drm_i915_private *dev_priv,u32 val;bool cur_state; - val =I915_READ (DPLL (pipe)); + val =intel_de_read (dev_priv,DPLL (pipe)); cur_state = !!(val &DPLL_VCO_ENABLE ); I915_STATE_WARN(cur_state != state, "PLL state assertion failure (expected %s, current %s)\n",
@@ -1141,10 +1139,11 @@ static void assert_fdi_tx(struct drm_i915_private *dev_priv,* so pipe->transcoder cast is fine here. */ enum transcoder cpu_transcoder = (enum transcoder )pipe; -u32 val =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder)); +u32 val =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (cpu_transcoder)); cur_state = !!(val &TRANS_DDI_FUNC_ENABLE ); }else { -u32 val =I915_READ (FDI_TX_CTL (pipe)); +u32 val =intel_de_read (dev_priv,FDI_TX_CTL (pipe)); cur_state = !!(val &FDI_TX_ENABLE ); } I915_STATE_WARN(cur_state != state,
@@ -1160,7 +1159,7 @@ static void assert_fdi_rx(struct drm_i915_private *dev_priv,u32 val;bool cur_state; - val =I915_READ (FDI_RX_CTL (pipe)); + val =intel_de_read (dev_priv,FDI_RX_CTL (pipe)); cur_state = !!(val &FDI_RX_ENABLE ); I915_STATE_WARN(cur_state != state, "FDI RX state assertion failure (expected %s, current %s)\n",
@@ -1182,7 +1181,7 @@ static void assert_fdi_tx_pll_enabled(struct drm_i915_private *dev_priv,if (HAS_DDI (dev_priv))return ; - val =I915_READ (FDI_TX_CTL (pipe)); + val =intel_de_read (dev_priv,FDI_TX_CTL (pipe));I915_STATE_WARN (!(val &FDI_TX_PLL_ENABLE ),"FDI TX PLL assertion failure, should be active but is disabled\n" ); }
@@ -1192,7 +1191,7 @@ void assert_fdi_rx_pll(struct drm_i915_private *dev_priv,u32 val;bool cur_state; - val =I915_READ (FDI_RX_CTL (pipe)); + val =intel_de_read (dev_priv,FDI_RX_CTL (pipe)); cur_state = !!(val &FDI_RX_PLL_ENABLE ); I915_STATE_WARN(cur_state != state, "FDI RX PLL assertion failure (expected %s, current %s)\n",
@@ -1213,7 +1212,7 @@ void assert_panel_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe)u32 port_sel; pp_reg =PP_CONTROL (0 ); - port_sel =I915_READ (PP_ON_DELAYS (0 )) &PANEL_PORT_SELECT_MASK ; + port_sel =intel_de_read (dev_priv,PP_ON_DELAYS (0 )) &PANEL_PORT_SELECT_MASK ;switch (port_sel) {case PANEL_PORT_SELECT_LVDS :
@@ -1240,13 +1239,13 @@ void assert_panel_unlocked(struct drm_i915_private *dev_priv, enum pipe pipe)u32 port_sel; pp_reg =PP_CONTROL (0 ); - port_sel =I915_READ (PP_ON_DELAYS (0 )) &PANEL_PORT_SELECT_MASK ; + port_sel =intel_de_read (dev_priv,PP_ON_DELAYS (0 )) &PANEL_PORT_SELECT_MASK ;WARN_ON (port_sel !=PANEL_PORT_SELECT_LVDS );intel_lvds_port_enabled (dev_priv,LVDS , &panel_pipe); } - val =I915_READ (pp_reg); + val =intel_de_read (dev_priv, pp_reg);if (!(val &PANEL_POWER_ON ) || ((val &PANEL_UNLOCK_MASK ) ==PANEL_UNLOCK_REGS )) locked = false;
@@ -1270,7 +1269,7 @@ void assert_pipe(struct drm_i915_private *dev_priv, power_domain =POWER_DOMAIN_TRANSCODER (cpu_transcoder); wakeref =intel_display_power_get_if_enabled (dev_priv, power_domain);if (wakeref) { -u32 val =I915_READ (PIPECONF (cpu_transcoder)); +u32 val =intel_de_read (dev_priv,PIPECONF (cpu_transcoder)); cur_state = !!(val &PIPECONF_ENABLE );intel_display_power_put (dev_priv, power_domain, wakeref);
@@ -1320,7 +1319,7 @@ void assert_pch_transcoder_disabled(struct drm_i915_private *dev_priv,u32 val;bool enabled; - val =I915_READ (PCH_TRANSCONF (pipe)); + val =intel_de_read (dev_priv,PCH_TRANSCONF (pipe)); enabled = !!(val &TRANS_ENABLE ); I915_STATE_WARN(enabled, "transcoder assertion failed, should be off on pipe %c but is still active\n",
@@ -1394,8 +1393,8 @@ static void _vlv_enable_pll(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -I915_WRITE (DPLL (pipe), pipe_config->dpll_hw_state.dpll); -POSTING_READ (DPLL (pipe)); +intel_de_write (dev_priv,DPLL (pipe), pipe_config->dpll_hw_state.dpll); +intel_de_posting_read (dev_priv,DPLL (pipe));udelay (150 );if (intel_de_wait_for_set (dev_priv,DPLL (pipe),DPLL_LOCK_VLV ,1 ))
@@ -1416,8 +1415,9 @@ static void vlv_enable_pll(struct intel_crtc *crtc,if (pipe_config->dpll_hw_state.dpll &DPLL_VCO_ENABLE )_vlv_enable_pll (crtc, pipe_config); -I915_WRITE (DPLL_MD (pipe), pipe_config->dpll_hw_state.dpll_md); -POSTING_READ (DPLL_MD (pipe)); +intel_de_write (dev_priv,DPLL_MD (pipe), + pipe_config->dpll_hw_state.dpll_md); +intel_de_posting_read (dev_priv,DPLL_MD (pipe)); }
@@ -1444,7 +1444,7 @@ static void _chv_enable_pll(struct intel_crtc *crtc,udelay (1 );/* Enable PLL */ -I915_WRITE (DPLL (pipe), pipe_config->dpll_hw_state.dpll); +intel_de_write (dev_priv,DPLL (pipe), pipe_config->dpll_hw_state.dpll);/* Check PLL is locked */ if (intel_de_wait_for_set (dev_priv,DPLL (pipe),DPLL_LOCK_VLV ,1 ))
@@ -1472,19 +1472,21 @@ static void chv_enable_pll(struct intel_crtc *crtc,* DPLLCMD is AWOL. Use chicken bits to propagate * the value from DPLLBMD to either pipe B or C. */ -I915_WRITE (CBR4_VLV ,CBR_DPLLBMD_PIPE (pipe)); -I915_WRITE (DPLL_MD (PIPE_B ), pipe_config->dpll_hw_state.dpll_md); -I915_WRITE (CBR4_VLV ,0 ); +intel_de_write (dev_priv,CBR4_VLV ,CBR_DPLLBMD_PIPE (pipe)); +intel_de_write (dev_priv,DPLL_MD (PIPE_B ), + pipe_config->dpll_hw_state.dpll_md); +intel_de_write (dev_priv,CBR4_VLV ,0 ); dev_priv->chv_dpll_md[pipe] = pipe_config->dpll_hw_state.dpll_md;/* * DPLLB VGA mode also seems to cause problems. * We should always have it disabled. */ -WARN_ON ((I915_READ (DPLL (PIPE_B )) &DPLL_VGA_MODE_DIS ) ==0 ); +WARN_ON ((intel_de_read (dev_priv,DPLL (PIPE_B )) &DPLL_VGA_MODE_DIS ) ==0 ); }else { -I915_WRITE (DPLL_MD (pipe), pipe_config->dpll_hw_state.dpll_md); -POSTING_READ (DPLL_MD (pipe)); +intel_de_write (dev_priv,DPLL_MD (pipe), + pipe_config->dpll_hw_state.dpll_md); +intel_de_posting_read (dev_priv,DPLL_MD (pipe)); } }
@@ -1515,29 +1517,29 @@ static void i9xx_enable_pll(struct intel_crtc *crtc,* the P1/P2 dividers. Otherwise the DPLL will keep using the old * dividers, even though the register value does change. */ -I915_WRITE (reg, dpll & ~DPLL_VGA_MODE_DIS ); -I915_WRITE (reg, dpll); +intel_de_write (dev_priv, reg, dpll & ~DPLL_VGA_MODE_DIS ); +intel_de_write (dev_priv, reg, dpll);/* Wait for the clocks to stabilize. */ -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (150 );if (INTEL_GEN (dev_priv) >=4 ) { -I915_WRITE (DPLL_MD (crtc->pipe), - crtc_state->dpll_hw_state.dpll_md); +intel_de_write (dev_priv,DPLL_MD (crtc->pipe), + crtc_state->dpll_hw_state.dpll_md); }else {/* The pixel multiplier can only be updated once the * DPLL is enabled and the clocks are stable. * * So write it again. */ -I915_WRITE (reg, dpll); +intel_de_write (dev_priv, reg, dpll); }/* We do this three times for luck */ for (i =0 ; i <3 ; i++) { -I915_WRITE (reg, dpll); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, dpll); +intel_de_posting_read (dev_priv, reg);udelay (150 );/* wait for warmup */ } }
@@ -1555,8 +1557,8 @@ static void i9xx_disable_pll(const struct intel_crtc_state *crtc_state)/* Make sure the pipe isn't still relying on us */ assert_pipe_disabled (dev_priv, crtc_state->cpu_transcoder); -I915_WRITE (DPLL (pipe),DPLL_VGA_MODE_DIS ); -POSTING_READ (DPLL (pipe)); +intel_de_write (dev_priv,DPLL (pipe),DPLL_VGA_MODE_DIS ); +intel_de_posting_read (dev_priv,DPLL (pipe)); }static void vlv_disable_pll (struct drm_i915_private *dev_priv,enum pipe pipe)
@@ -1571,8 +1573,8 @@ static void vlv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)if (pipe !=PIPE_A ) val |=DPLL_INTEGRATED_CRI_CLK_VLV ; -I915_WRITE (DPLL (pipe), val); -POSTING_READ (DPLL (pipe)); +intel_de_write (dev_priv,DPLL (pipe), val); +intel_de_posting_read (dev_priv,DPLL (pipe)); }static void chv_disable_pll (struct drm_i915_private *dev_priv,enum pipe pipe)
@@ -1588,8 +1590,8 @@ static void chv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe)if (pipe !=PIPE_A ) val |=DPLL_INTEGRATED_CRI_CLK_VLV ; -I915_WRITE (DPLL (pipe), val); -POSTING_READ (DPLL (pipe)); +intel_de_write (dev_priv,DPLL (pipe), val); +intel_de_posting_read (dev_priv,DPLL (pipe));vlv_dpio_get (dev_priv);
@@ -1630,7 +1632,8 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv, port_mask, expected_mask, 1000))WARN (1 ,"timed out waiting for [ENCODER:%d:%s] port ready: got 0x%x, expected 0x%x\n" , dport->base.base.base.id, dport->base.base.name, -I915_READ (dpll_reg) & port_mask, expected_mask); +intel_de_read (dev_priv, dpll_reg) & port_mask, + expected_mask); }static void ilk_enable_pch_transcoder (const struct intel_crtc_state *crtc_state)
@@ -1650,7 +1653,7 @@ static void ilk_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)if (HAS_PCH_CPT (dev_priv)) { reg =TRANS_CHICKEN2 (pipe); - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg);/* * Workaround: Set the timing override bit * before enabling the pch transcoder.
@@ -1659,12 +1662,12 @@ static void ilk_enable_pch_transcoder(const struct intel_crtc_state *crtc_state)/* Configure frame start delay to match the CPU */ val &= ~TRANS_CHICKEN2_FRAME_START_DELAY_MASK ; val |=TRANS_CHICKEN2_FRAME_START_DELAY (0 ); -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val); } reg =PCH_TRANSCONF (pipe); - val =I915_READ (reg); - pipeconf_val =I915_READ (PIPECONF (pipe)); + val =intel_de_read (dev_priv, reg); + pipeconf_val =intel_de_read (dev_priv,PIPECONF (pipe));if (HAS_PCH_IBX (dev_priv)) {/* Configure frame start delay to match the CPU */
@@ -1694,7 +1697,7 @@ static void ilk_enable_pch_transcoder(const struct intel_crtc_state *crtc_state) val |=TRANS_PROGRESSIVE ; } -I915_WRITE (reg, val |TRANS_ENABLE ); +intel_de_write (dev_priv, reg, val |TRANS_ENABLE );if (intel_de_wait_for_set (dev_priv, reg,TRANS_STATE_ENABLE ,100 ))drm_err (&dev_priv->drm,"failed to enable transcoder %c\n" ,pipe_name (pipe));
@@ -1709,16 +1712,16 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,assert_fdi_tx_enabled (dev_priv, (enum pipe ) cpu_transcoder);assert_fdi_rx_enabled (dev_priv,PIPE_A ); - val =I915_READ (TRANS_CHICKEN2 (PIPE_A )); + val =intel_de_read (dev_priv,TRANS_CHICKEN2 (PIPE_A ));/* Workaround: set timing override bit. */ val |=TRANS_CHICKEN2_TIMING_OVERRIDE ;/* Configure frame start delay to match the CPU */ val &= ~TRANS_CHICKEN2_FRAME_START_DELAY_MASK ; val |=TRANS_CHICKEN2_FRAME_START_DELAY (0 ); -I915_WRITE (TRANS_CHICKEN2 (PIPE_A ), val); +intel_de_write (dev_priv,TRANS_CHICKEN2 (PIPE_A ), val); val =TRANS_ENABLE ; - pipeconf_val =I915_READ (PIPECONF (cpu_transcoder)); + pipeconf_val =intel_de_read (dev_priv,PIPECONF (cpu_transcoder));if ((pipeconf_val &PIPECONF_INTERLACE_MASK_HSW ) ==PIPECONF_INTERLACED_ILK )
@@ -1726,7 +1729,7 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,else val |=TRANS_PROGRESSIVE ; -I915_WRITE (LPT_TRANSCONF , val); +intel_de_write (dev_priv,LPT_TRANSCONF , val);if (intel_de_wait_for_set (dev_priv,LPT_TRANSCONF ,TRANS_STATE_ENABLE ,100 ))drm_err (&dev_priv->drm,"Failed to enable PCH transcoder\n" );
@@ -1746,9 +1749,9 @@ static void ilk_disable_pch_transcoder(struct drm_i915_private *dev_priv,assert_pch_ports_disabled (dev_priv, pipe); reg =PCH_TRANSCONF (pipe); - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg); val &= ~TRANS_ENABLE ; -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val);/* wait for PCH transcoder off, transcoder state */ if (intel_de_wait_for_clear (dev_priv, reg,TRANS_STATE_ENABLE ,50 )) drm_err(&dev_priv->drm, "failed to disable transcoder %c\n",
@@ -1757,9 +1760,9 @@ static void ilk_disable_pch_transcoder(struct drm_i915_private *dev_priv,if (HAS_PCH_CPT (dev_priv)) {/* Workaround: Clear the timing override chicken bit again. */ reg =TRANS_CHICKEN2 (pipe); - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg); val &= ~TRANS_CHICKEN2_TIMING_OVERRIDE ; -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val); } }
@@ -1767,18 +1770,18 @@ void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv) {u32 val; - val =I915_READ (LPT_TRANSCONF ); + val =intel_de_read (dev_priv,LPT_TRANSCONF ); val &= ~TRANS_ENABLE ; -I915_WRITE (LPT_TRANSCONF , val); +intel_de_write (dev_priv,LPT_TRANSCONF , val);/* wait for PCH transcoder off, transcoder state */ if (intel_de_wait_for_clear (dev_priv,LPT_TRANSCONF ,TRANS_STATE_ENABLE ,50 ))drm_err (&dev_priv->drm,"Failed to disable PCH transcoder\n" );/* Workaround: clear timing override bit. */ - val =I915_READ (TRANS_CHICKEN2 (PIPE_A )); + val =intel_de_read (dev_priv,TRANS_CHICKEN2 (PIPE_A )); val &= ~TRANS_CHICKEN2_TIMING_OVERRIDE ; -I915_WRITE (TRANS_CHICKEN2 (PIPE_A ), val); +intel_de_write (dev_priv,TRANS_CHICKEN2 (PIPE_A ), val); }enum pipe intel_crtc_pch_transcoder (struct intel_crtc *crtc)
@@ -1866,15 +1869,15 @@ static void intel_enable_pipe(const struct intel_crtc_state *new_crtc_state)trace_intel_pipe_enable (crtc); reg =PIPECONF (cpu_transcoder); - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg);if (val &PIPECONF_ENABLE ) {/* we keep both pipes enabled on 830 */ WARN_ON (!IS_I830 (dev_priv));return ; } -I915_WRITE (reg, val |PIPECONF_ENABLE ); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val |PIPECONF_ENABLE ); +intel_de_posting_read (dev_priv, reg);/* * Until the pipe starts PIPEDSL reads will return a stale value,
@@ -1907,7 +1910,7 @@ void intel_disable_pipe(const struct intel_crtc_state *old_crtc_state)trace_intel_pipe_disable (crtc); reg =PIPECONF (cpu_transcoder); - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg);if ((val &PIPECONF_ENABLE ) ==0 )return ;
@@ -1922,7 +1925,7 @@ void intel_disable_pipe(const struct intel_crtc_state *old_crtc_state)if (!IS_I830 (dev_priv)) val &= ~PIPECONF_ENABLE ; -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val);if ((val &PIPECONF_ENABLE ) ==0 )intel_wait_for_pipe_off (old_crtc_state); }
@@ -4349,7 +4352,8 @@ static void i9xx_update_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -I915_WRITE_FW (DSPSTRIDE (i9xx_plane), plane_state->color_plane[0 ].stride); +intel_de_write_fw (dev_priv,DSPSTRIDE (i9xx_plane), + plane_state->color_plane[0 ].stride);if (INTEL_GEN (dev_priv) <4 ) {/*
@@ -4357,21 +4361,26 @@ static void i9xx_update_plane(struct intel_plane *plane,* generator but let's assume we still need to * program whatever is there. */ -I915_WRITE_FW (DSPPOS (i9xx_plane), (crtc_y <<16 ) | crtc_x); -I915_WRITE_FW (DSPSIZE (i9xx_plane), - ((crtc_h -1 ) <<16 ) | (crtc_w -1 )); +intel_de_write_fw (dev_priv,DSPPOS (i9xx_plane), + (crtc_y <<16 ) | crtc_x); +intel_de_write_fw (dev_priv,DSPSIZE (i9xx_plane), + ((crtc_h -1 ) <<16 ) | (crtc_w -1 )); }else if (IS_CHERRYVIEW (dev_priv) && i9xx_plane ==PLANE_B ) { -I915_WRITE_FW (PRIMPOS (i9xx_plane), (crtc_y <<16 ) | crtc_x); -I915_WRITE_FW (PRIMSIZE (i9xx_plane), - ((crtc_h -1 ) <<16 ) | (crtc_w -1 )); -I915_WRITE_FW (PRIMCNSTALPHA (i9xx_plane),0 ); +intel_de_write_fw (dev_priv,PRIMPOS (i9xx_plane), + (crtc_y <<16 ) | crtc_x); +intel_de_write_fw (dev_priv,PRIMSIZE (i9xx_plane), + ((crtc_h -1 ) <<16 ) | (crtc_w -1 )); +intel_de_write_fw (dev_priv,PRIMCNSTALPHA (i9xx_plane),0 ); }if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { -I915_WRITE_FW (DSPOFFSET (i9xx_plane), (y <<16 ) | x); +intel_de_write_fw (dev_priv,DSPOFFSET (i9xx_plane), + (y <<16 ) | x); }else if (INTEL_GEN (dev_priv) >=4 ) { -I915_WRITE_FW (DSPLINOFF (i9xx_plane), linear_offset); -I915_WRITE_FW (DSPTILEOFF (i9xx_plane), (y <<16 ) | x); +intel_de_write_fw (dev_priv,DSPLINOFF (i9xx_plane), + linear_offset); +intel_de_write_fw (dev_priv,DSPTILEOFF (i9xx_plane), + (y <<16 ) | x); }/*
@@ -4379,15 +4388,13 @@ static void i9xx_update_plane(struct intel_plane *plane,* disabled. Try to make the plane enable atomic by writing * the control register just before the surface register. */ -I915_WRITE_FW (DSPCNTR (i9xx_plane), dspcntr); +intel_de_write_fw (dev_priv,DSPCNTR (i9xx_plane), dspcntr);if (INTEL_GEN (dev_priv) >=4 ) -I915_WRITE_FW (DSPSURF (i9xx_plane), -intel_plane_ggtt_offset (plane_state) + - dspaddr_offset); +intel_de_write_fw (dev_priv,DSPSURF (i9xx_plane), +intel_plane_ggtt_offset (plane_state) + dspaddr_offset);else -I915_WRITE_FW (DSPADDR (i9xx_plane), -intel_plane_ggtt_offset (plane_state) + - dspaddr_offset); +intel_de_write_fw (dev_priv,DSPADDR (i9xx_plane), +intel_plane_ggtt_offset (plane_state) + dspaddr_offset);spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); }
@@ -4414,11 +4421,11 @@ static void i9xx_disable_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -I915_WRITE_FW (DSPCNTR (i9xx_plane), dspcntr); +intel_de_write_fw (dev_priv,DSPCNTR (i9xx_plane), dspcntr);if (INTEL_GEN (dev_priv) >=4 ) -I915_WRITE_FW (DSPSURF (i9xx_plane),0 ); +intel_de_write_fw (dev_priv,DSPSURF (i9xx_plane),0 );else -I915_WRITE_FW (DSPADDR (i9xx_plane),0 ); +intel_de_write_fw (dev_priv,DSPADDR (i9xx_plane),0 );spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); }
@@ -4443,7 +4450,7 @@ static bool i9xx_plane_get_hw_state(struct intel_plane *plane,if (!wakeref)return false; - val =I915_READ (DSPCNTR (i9xx_plane)); + val =intel_de_read (dev_priv,DSPCNTR (i9xx_plane)); ret = val &DISPLAY_PLANE_ENABLE ;
@@ -4463,9 +4470,9 @@ static void skl_detach_scaler(struct intel_crtc *intel_crtc, int id)struct drm_device *dev = intel_crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -I915_WRITE (SKL_PS_CTRL (intel_crtc->pipe, id),0 ); -I915_WRITE (SKL_PS_WIN_POS (intel_crtc->pipe, id),0 ); -I915_WRITE (SKL_PS_WIN_SZ (intel_crtc->pipe, id),0 ); +intel_de_write (dev_priv,SKL_PS_CTRL (intel_crtc->pipe, id),0 ); +intel_de_write (dev_priv,SKL_PS_WIN_POS (intel_crtc->pipe, id),0 ); +intel_de_write (dev_priv,SKL_PS_WIN_SZ (intel_crtc->pipe, id),0 ); }/*
@@ -4938,7 +4945,7 @@ static void icl_set_pipe_chicken(struct intel_crtc *crtc)enum pipe pipe = crtc->pipe;u32 tmp; - tmp =I915_READ (PIPE_CHICKEN (pipe)); + tmp =intel_de_read (dev_priv,PIPE_CHICKEN (pipe));/* * Display WA #1153: icl
@@ -4953,7 +4960,7 @@ static void icl_set_pipe_chicken(struct intel_crtc *crtc)* across pipe */ tmp |=PIXEL_ROUNDING_TRUNC_FB_PASSTHRU ; -I915_WRITE (PIPE_CHICKEN (pipe), tmp); +intel_de_write (dev_priv,PIPE_CHICKEN (pipe), tmp); }static void icl_enable_trans_port_sync (const struct intel_crtc_state *crtc_state)
@@ -4982,8 +4989,9 @@ static void icl_enable_trans_port_sync(const struct intel_crtc_state *crtc_state/* Enable Transcoder Port Sync */ trans_ddi_func_ctl2_val |=PORT_SYNC_MODE_ENABLE ; -I915_WRITE (TRANS_DDI_FUNC_CTL2 (crtc_state->cpu_transcoder), - trans_ddi_func_ctl2_val); +intel_de_write (dev_priv, +TRANS_DDI_FUNC_CTL2 (crtc_state->cpu_transcoder), + trans_ddi_func_ctl2_val); }static void intel_fdi_normal_train (struct intel_crtc *crtc)
@@ -4996,7 +5004,7 @@ static void intel_fdi_normal_train(struct intel_crtc *crtc)/* enable normal train */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);if (IS_IVYBRIDGE (dev_priv)) { temp &= ~FDI_LINK_TRAIN_NONE_IVB ; temp |=FDI_LINK_TRAIN_NONE_IVB |FDI_TX_ENHANCE_FRAME_ENABLE ;
@@ -5004,10 +5012,10 @@ static void intel_fdi_normal_train(struct intel_crtc *crtc) temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_NONE |FDI_TX_ENHANCE_FRAME_ENABLE ; } -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);if (HAS_PCH_CPT (dev_priv)) { temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; temp |=FDI_LINK_TRAIN_NORMAL_CPT ;
@@ -5015,16 +5023,16 @@ static void intel_fdi_normal_train(struct intel_crtc *crtc) temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_NONE ; } -I915_WRITE (reg, temp |FDI_RX_ENHANCE_FRAME_ENABLE ); +intel_de_write (dev_priv, reg, temp |FDI_RX_ENHANCE_FRAME_ENABLE );/* wait one idle pattern time */ -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (1000 );/* IVB wants error correction enabled */ if (IS_IVYBRIDGE (dev_priv)) -I915_WRITE (reg,I915_READ (reg) |FDI_FS_ERRC_ENABLE | -FDI_FE_ERRC_ENABLE ); +intel_de_write (dev_priv, reg, +intel_de_read (dev_priv, reg) |FDI_FS_ERRC_ENABLE |FDI_FE_ERRC_ENABLE ); }/* The FDI link training functions for ILK/Ibexpeak. */
@@ -5043,44 +5051,45 @@ static void ilk_fdi_link_train(struct intel_crtc *crtc,/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit for train result */ reg =FDI_RX_IMR (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_RX_SYMBOL_LOCK ; temp &= ~FDI_RX_BIT_LOCK ; -I915_WRITE (reg, temp); -I915_READ (reg); +intel_de_write (dev_priv, reg, temp); +intel_de_read (dev_priv, reg);udelay (150 );/* enable CPU FDI TX and PCH FDI RX */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_DP_PORT_WIDTH_MASK ; temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_1 ; -I915_WRITE (reg, temp |FDI_TX_ENABLE ); +intel_de_write (dev_priv, reg, temp |FDI_TX_ENABLE ); reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_1 ; -I915_WRITE (reg, temp |FDI_RX_ENABLE ); +intel_de_write (dev_priv, reg, temp |FDI_RX_ENABLE ); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (150 );/* Ironlake workaround, enable clock pointer after FDI enable*/ -I915_WRITE (FDI_RX_CHICKEN (pipe),FDI_RX_PHASE_SYNC_POINTER_OVR ); -I915_WRITE (FDI_RX_CHICKEN (pipe),FDI_RX_PHASE_SYNC_POINTER_OVR | -FDI_RX_PHASE_SYNC_POINTER_EN ); +intel_de_write (dev_priv,FDI_RX_CHICKEN (pipe), +FDI_RX_PHASE_SYNC_POINTER_OVR ); +intel_de_write (dev_priv,FDI_RX_CHICKEN (pipe), +FDI_RX_PHASE_SYNC_POINTER_OVR |FDI_RX_PHASE_SYNC_POINTER_EN ); reg =FDI_RX_IIR (pipe);for (tries =0 ; tries <5 ; tries++) { - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp);if ((temp &FDI_RX_BIT_LOCK )) {drm_dbg_kms (&dev_priv->drm,"FDI train 1 done.\n" ); -I915_WRITE (reg, temp |FDI_RX_BIT_LOCK ); +intel_de_write (dev_priv, reg, temp |FDI_RX_BIT_LOCK );break ; } }
@@ -5089,27 +5098,28 @@ static void ilk_fdi_link_train(struct intel_crtc *crtc,/* Train 2 */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_2 ; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_2 ; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (150 ); reg =FDI_RX_IIR (pipe);for (tries =0 ; tries <5 ; tries++) { - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp);if (temp &FDI_RX_SYMBOL_LOCK ) { -I915_WRITE (reg, temp |FDI_RX_SYMBOL_LOCK ); +intel_de_write (dev_priv, reg, + temp |FDI_RX_SYMBOL_LOCK );drm_dbg_kms (&dev_priv->drm,"FDI train 2 done.\n" );break ; }
@@ -5141,17 +5151,17 @@ static void gen6_fdi_link_train(struct intel_crtc *crtc,/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit for train result */ reg =FDI_RX_IMR (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_RX_SYMBOL_LOCK ; temp &= ~FDI_RX_BIT_LOCK ; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (150 );/* enable CPU FDI TX and PCH FDI RX */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_DP_PORT_WIDTH_MASK ; temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); temp &= ~FDI_LINK_TRAIN_NONE ;
@@ -5159,13 +5169,13 @@ static void gen6_fdi_link_train(struct intel_crtc *crtc, temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ;/* SNB-B */ temp |=FDI_LINK_TRAIN_400MV_0DB_SNB_B ; -I915_WRITE (reg, temp |FDI_TX_ENABLE ); +intel_de_write (dev_priv, reg, temp |FDI_TX_ENABLE ); -I915_WRITE (FDI_RX_MISC (pipe), -FDI_RX_TP1_TO_TP2_48 |FDI_RX_FDI_DELAY_90 ); +intel_de_write (dev_priv,FDI_RX_MISC (pipe), +FDI_RX_TP1_TO_TP2_48 |FDI_RX_FDI_DELAY_90 ); reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);if (HAS_PCH_CPT (dev_priv)) { temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; temp |=FDI_LINK_TRAIN_PATTERN_1_CPT ;
@@ -5173,27 +5183,28 @@ static void gen6_fdi_link_train(struct intel_crtc *crtc, temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_1 ; } -I915_WRITE (reg, temp |FDI_RX_ENABLE ); +intel_de_write (dev_priv, reg, temp |FDI_RX_ENABLE ); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (150 );for (i =0 ; i <4 ; i++) { reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; temp |= snb_b_fdi_train_param[i]; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (500 );for (retry =0 ; retry <5 ; retry++) { reg =FDI_RX_IIR (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp);if (temp &FDI_RX_BIT_LOCK ) { -I915_WRITE (reg, temp |FDI_RX_BIT_LOCK ); +intel_de_write (dev_priv, reg, + temp |FDI_RX_BIT_LOCK );drm_dbg_kms (&dev_priv->drm,"FDI train 1 done.\n" );break ;
@@ -5208,7 +5219,7 @@ static void gen6_fdi_link_train(struct intel_crtc *crtc,/* Train 2 */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_2 ;if (IS_GEN (dev_priv,6 )) {
@@ -5216,10 +5227,10 @@ static void gen6_fdi_link_train(struct intel_crtc *crtc,/* SNB-B */ temp |=FDI_LINK_TRAIN_400MV_0DB_SNB_B ; } -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);if (HAS_PCH_CPT (dev_priv)) { temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; temp |=FDI_LINK_TRAIN_PATTERN_2_CPT ;
@@ -5227,27 +5238,28 @@ static void gen6_fdi_link_train(struct intel_crtc *crtc, temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_2 ; } -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (150 );for (i =0 ; i <4 ; i++) { reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; temp |= snb_b_fdi_train_param[i]; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (500 );for (retry =0 ; retry <5 ; retry++) { reg =FDI_RX_IIR (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp);if (temp &FDI_RX_SYMBOL_LOCK ) { -I915_WRITE (reg, temp |FDI_RX_SYMBOL_LOCK ); +intel_de_write (dev_priv, reg, + temp |FDI_RX_SYMBOL_LOCK );drm_dbg_kms (&dev_priv->drm,"FDI train 2 done.\n" );break ;
@@ -5276,64 +5288,65 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc,/* Train 1: umask FDI RX Interrupt symbol_lock and bit_lock bit for train result */ reg =FDI_RX_IMR (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_RX_SYMBOL_LOCK ; temp &= ~FDI_RX_BIT_LOCK ; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (150 );drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR before link train 0x%x\n" , -I915_READ (FDI_RX_IIR (pipe))); +intel_de_read (dev_priv,FDI_RX_IIR (pipe)));/* Try each vswing and preemphasis setting twice before moving on */ for (j =0 ; j <ARRAY_SIZE (snb_b_fdi_train_param) *2 ; j++) {/* disable first in case we need to retry */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~(FDI_LINK_TRAIN_AUTO |FDI_LINK_TRAIN_NONE_IVB ); temp &= ~FDI_TX_ENABLE ; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_LINK_TRAIN_AUTO ; temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; temp &= ~FDI_RX_ENABLE ; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp);/* enable CPU FDI TX and PCH FDI RX */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_DP_PORT_WIDTH_MASK ; temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); temp |=FDI_LINK_TRAIN_PATTERN_1_IVB ; temp &= ~FDI_LINK_TRAIN_VOL_EMP_MASK ; temp |= snb_b_fdi_train_param[j/2 ]; temp |=FDI_COMPOSITE_SYNC ; -I915_WRITE (reg, temp |FDI_TX_ENABLE ); +intel_de_write (dev_priv, reg, temp |FDI_TX_ENABLE ); -I915_WRITE (FDI_RX_MISC (pipe), -FDI_RX_TP1_TO_TP2_48 |FDI_RX_FDI_DELAY_90 ); +intel_de_write (dev_priv,FDI_RX_MISC (pipe), +FDI_RX_TP1_TO_TP2_48 |FDI_RX_FDI_DELAY_90 ); reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp |=FDI_LINK_TRAIN_PATTERN_1_CPT ; temp |=FDI_COMPOSITE_SYNC ; -I915_WRITE (reg, temp |FDI_RX_ENABLE ); +intel_de_write (dev_priv, reg, temp |FDI_RX_ENABLE ); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (1 );/* should be 0.5us */ for (i =0 ; i <4 ; i++) { reg =FDI_RX_IIR (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp);if (temp &FDI_RX_BIT_LOCK || - (I915_READ (reg) &FDI_RX_BIT_LOCK )) { -I915_WRITE (reg, temp |FDI_RX_BIT_LOCK ); + (intel_de_read (dev_priv, reg) &FDI_RX_BIT_LOCK )) { +intel_de_write (dev_priv, reg, + temp |FDI_RX_BIT_LOCK );drm_dbg_kms (&dev_priv->drm,"FDI train 1 done, level %i.\n" , i);
@@ -5349,28 +5362,29 @@ static void ivb_manual_fdi_link_train(struct intel_crtc *crtc,/* Train 2 */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_LINK_TRAIN_NONE_IVB ; temp |=FDI_LINK_TRAIN_PATTERN_2_IVB ; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; temp |=FDI_LINK_TRAIN_PATTERN_2_CPT ; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (2 );/* should be 1.5us */ for (i =0 ; i <4 ; i++) { reg =FDI_RX_IIR (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);drm_dbg_kms (&dev_priv->drm,"FDI_RX_IIR 0x%x\n" , temp);if (temp &FDI_RX_SYMBOL_LOCK || - (I915_READ (reg) &FDI_RX_SYMBOL_LOCK )) { -I915_WRITE (reg, temp |FDI_RX_SYMBOL_LOCK ); + (intel_de_read (dev_priv, reg) &FDI_RX_SYMBOL_LOCK )) { +intel_de_write (dev_priv, reg, + temp |FDI_RX_SYMBOL_LOCK );drm_dbg_kms (&dev_priv->drm,"FDI train 2 done, level %i.\n" , i);
@@ -5397,29 +5411,29 @@ static void ilk_fdi_pll_enable(const struct intel_crtc_state *crtc_state)/* enable PCH FDI RX PLL, wait warmup plus DMI latency */ reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~(FDI_DP_PORT_WIDTH_MASK | (0x7 <<16 )); temp |=FDI_DP_PORT_WIDTH (crtc_state->fdi_lanes); - temp |= (I915_READ (PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; -I915_WRITE (reg, temp |FDI_RX_PLL_ENABLE ); + temp |= (intel_de_read (dev_priv,PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; +intel_de_write (dev_priv, reg, temp |FDI_RX_PLL_ENABLE ); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (200 );/* Switch from Rawclk to PCDclk */ - temp =I915_READ (reg); -I915_WRITE (reg, temp |FDI_PCDCLK ); + temp =intel_de_read (dev_priv, reg); +intel_de_write (dev_priv, reg, temp |FDI_PCDCLK ); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (200 );/* Enable CPU FDI TX PLL, always on for Ironlake */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);if ((temp &FDI_TX_PLL_ENABLE ) ==0 ) { -I915_WRITE (reg, temp |FDI_TX_PLL_ENABLE ); +intel_de_write (dev_priv, reg, temp |FDI_TX_PLL_ENABLE ); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (100 ); } }
@@ -5434,23 +5448,23 @@ static void ilk_fdi_pll_disable(struct intel_crtc *intel_crtc)/* Switch from PCDclk to Rawclk */ reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); -I915_WRITE (reg, temp & ~FDI_PCDCLK ); + temp =intel_de_read (dev_priv, reg); +intel_de_write (dev_priv, reg, temp & ~FDI_PCDCLK );/* Disable CPU FDI TX PLL */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); -I915_WRITE (reg, temp & ~FDI_TX_PLL_ENABLE ); + temp =intel_de_read (dev_priv, reg); +intel_de_write (dev_priv, reg, temp & ~FDI_TX_PLL_ENABLE ); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (100 ); reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); -I915_WRITE (reg, temp & ~FDI_RX_PLL_ENABLE ); + temp =intel_de_read (dev_priv, reg); +intel_de_write (dev_priv, reg, temp & ~FDI_RX_PLL_ENABLE );/* Wait for the clocks to turn off. */ -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (100 ); }
@@ -5463,32 +5477,33 @@ static void ilk_fdi_disable(struct intel_crtc *crtc)/* disable CPU FDI tx and PCH FDI rx */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); -I915_WRITE (reg, temp & ~FDI_TX_ENABLE ); -POSTING_READ (reg); + temp =intel_de_read (dev_priv, reg); +intel_de_write (dev_priv, reg, temp & ~FDI_TX_ENABLE ); +intel_de_posting_read (dev_priv, reg); reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~(0x7 <<16 ); - temp |= (I915_READ (PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; -I915_WRITE (reg, temp & ~FDI_RX_ENABLE ); + temp |= (intel_de_read (dev_priv,PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; +intel_de_write (dev_priv, reg, temp & ~FDI_RX_ENABLE ); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (100 );/* Ironlake workaround, disable clock pointer after downing FDI */ if (HAS_PCH_IBX (dev_priv)) -I915_WRITE (FDI_RX_CHICKEN (pipe),FDI_RX_PHASE_SYNC_POINTER_OVR ); +intel_de_write (dev_priv,FDI_RX_CHICKEN (pipe), +FDI_RX_PHASE_SYNC_POINTER_OVR );/* still set train pattern 1 */ reg =FDI_TX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~FDI_LINK_TRAIN_NONE ; temp |=FDI_LINK_TRAIN_PATTERN_1 ; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); reg =FDI_RX_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg);if (HAS_PCH_CPT (dev_priv)) { temp &= ~FDI_LINK_TRAIN_PATTERN_MASK_CPT ; temp |=FDI_LINK_TRAIN_PATTERN_1_CPT ;
@@ -5498,10 +5513,10 @@ static void ilk_fdi_disable(struct intel_crtc *crtc) }/* BPC in FDI rx is consistent with that in PIPECONF */ temp &= ~(0x07 <<16 ); - temp |= (I915_READ (PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; -I915_WRITE (reg, temp); + temp |= (intel_de_read (dev_priv,PIPECONF (pipe)) &PIPECONF_BPC_MASK ) <<11 ; +intel_de_write (dev_priv, reg, temp); -POSTING_READ (reg); +intel_de_posting_read (dev_priv, reg);udelay (100 ); }
@@ -5534,7 +5549,7 @@ void lpt_disable_iclkip(struct drm_i915_private *dev_priv) {u32 temp; -I915_WRITE (PIXCLK_GATE ,PIXCLK_GATE_GATE ); +intel_de_write (dev_priv,PIXCLK_GATE ,PIXCLK_GATE_GATE );mutex_lock (&dev_priv->sb_lock);
@@ -5618,7 +5633,7 @@ static void lpt_program_iclkip(const struct intel_crtc_state *crtc_state)/* Wait for initialization time */ udelay (24 ); -I915_WRITE (PIXCLK_GATE ,PIXCLK_GATE_UNGATE ); +intel_de_write (dev_priv,PIXCLK_GATE ,PIXCLK_GATE_UNGATE ); }int lpt_get_iclkip (struct drm_i915_private *dev_priv)
@@ -5629,7 +5644,7 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv)u32 desired_divisor;u32 temp; -if ((I915_READ (PIXCLK_GATE ) &PIXCLK_GATE_UNGATE ) ==0 ) +if ((intel_de_read (dev_priv,PIXCLK_GATE ) &PIXCLK_GATE_UNGATE ) ==0 )return 0 ;mutex_lock (&dev_priv->sb_lock);
@@ -5665,33 +5680,33 @@ static void ilk_pch_transcoder_set_timings(const struct intel_crtc_state *crtc_sstruct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; -I915_WRITE (PCH_TRANS_HTOTAL (pch_transcoder), -I915_READ (HTOTAL (cpu_transcoder))); -I915_WRITE (PCH_TRANS_HBLANK (pch_transcoder), -I915_READ (HBLANK (cpu_transcoder))); -I915_WRITE (PCH_TRANS_HSYNC (pch_transcoder), -I915_READ (HSYNC (cpu_transcoder))); +intel_de_write (dev_priv,PCH_TRANS_HTOTAL (pch_transcoder), +intel_de_read (dev_priv,HTOTAL (cpu_transcoder))); +intel_de_write (dev_priv,PCH_TRANS_HBLANK (pch_transcoder), +intel_de_read (dev_priv,HBLANK (cpu_transcoder))); +intel_de_write (dev_priv,PCH_TRANS_HSYNC (pch_transcoder), +intel_de_read (dev_priv,HSYNC (cpu_transcoder))); -I915_WRITE (PCH_TRANS_VTOTAL (pch_transcoder), -I915_READ (VTOTAL (cpu_transcoder))); -I915_WRITE (PCH_TRANS_VBLANK (pch_transcoder), -I915_READ (VBLANK (cpu_transcoder))); -I915_WRITE (PCH_TRANS_VSYNC (pch_transcoder), -I915_READ (VSYNC (cpu_transcoder))); -I915_WRITE (PCH_TRANS_VSYNCSHIFT (pch_transcoder), -I915_READ (VSYNCSHIFT (cpu_transcoder))); +intel_de_write (dev_priv,PCH_TRANS_VTOTAL (pch_transcoder), +intel_de_read (dev_priv,VTOTAL (cpu_transcoder))); +intel_de_write (dev_priv,PCH_TRANS_VBLANK (pch_transcoder), +intel_de_read (dev_priv,VBLANK (cpu_transcoder))); +intel_de_write (dev_priv,PCH_TRANS_VSYNC (pch_transcoder), +intel_de_read (dev_priv,VSYNC (cpu_transcoder))); +intel_de_write (dev_priv,PCH_TRANS_VSYNCSHIFT (pch_transcoder), +intel_de_read (dev_priv,VSYNCSHIFT (cpu_transcoder))); }static void cpt_set_fdi_bc_bifurcation (struct drm_i915_private *dev_priv,bool enable) {u32 temp; - temp =I915_READ (SOUTH_CHICKEN1 ); + temp =intel_de_read (dev_priv,SOUTH_CHICKEN1 );if (!!(temp &FDI_BC_BIFURCATION_SELECT ) == enable)return ; -WARN_ON (I915_READ (FDI_RX_CTL (PIPE_B )) &FDI_RX_ENABLE ); -WARN_ON (I915_READ (FDI_RX_CTL (PIPE_C )) &FDI_RX_ENABLE ); +WARN_ON (intel_de_read (dev_priv,FDI_RX_CTL (PIPE_B )) &FDI_RX_ENABLE ); +WARN_ON (intel_de_read (dev_priv,FDI_RX_CTL (PIPE_C )) &FDI_RX_ENABLE ); temp &= ~FDI_BC_BIFURCATION_SELECT ;if (enable)
@@ -5699,8 +5714,8 @@ static void cpt_set_fdi_bc_bifurcation(struct drm_i915_private *dev_priv, bool edrm_dbg_kms (&dev_priv->drm,"%sabling fdi C rx\n" , enable ?"en" :"dis" ); -I915_WRITE (SOUTH_CHICKEN1 , temp); -POSTING_READ (SOUTH_CHICKEN1 ); +intel_de_write (dev_priv,SOUTH_CHICKEN1 , temp); +intel_de_posting_read (dev_priv,SOUTH_CHICKEN1 ); }static void ivb_update_fdi_bc_bifurcation (const struct intel_crtc_state *crtc_state)
@@ -5781,8 +5796,8 @@ static void ilk_pch_enable(const struct intel_atomic_state *state,/* Write the TU size bits before fdi link training, so that error * detection works. */ -I915_WRITE (FDI_RX_TUSIZE1 (pipe), -I915_READ (PIPE_DATA_M1 (pipe)) &TU_SIZE_MASK ); +intel_de_write (dev_priv,FDI_RX_TUSIZE1 (pipe), +intel_de_read (dev_priv,PIPE_DATA_M1 (pipe)) &TU_SIZE_MASK );/* For PCH output, training FDI link */ dev_priv->display.fdi_link_train (crtc, crtc_state);
@@ -5792,7 +5807,7 @@ static void ilk_pch_enable(const struct intel_atomic_state *state,if (HAS_PCH_CPT (dev_priv)) {u32 sel; - temp =I915_READ (PCH_DPLL_SEL ); + temp =intel_de_read (dev_priv,PCH_DPLL_SEL ); temp |=TRANS_DPLL_ENABLE (pipe); sel =TRANS_DPLLB_SEL (pipe); if (crtc_state->shared_dpll ==
@@ -5800,7 +5815,7 @@ static void ilk_pch_enable(const struct intel_atomic_state *state, temp |= sel; else temp &= ~sel; -I915_WRITE (PCH_DPLL_SEL , temp); +intel_de_write (dev_priv,PCH_DPLL_SEL , temp); }/* XXX: pch pll's can be enabled any time before we enable the PCH
@@ -5823,11 +5838,11 @@ static void ilk_pch_enable(const struct intel_atomic_state *state, intel_crtc_has_dp_encoder(crtc_state)) {const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode; -u32 bpc = (I915_READ (PIPECONF (pipe)) &PIPECONF_BPC_MASK ) >>5 ; +u32 bpc = (intel_de_read (dev_priv,PIPECONF (pipe)) &PIPECONF_BPC_MASK ) >>5 ;i915_reg_t reg =TRANS_DP_CTL (pipe);enum port port; - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~(TRANS_DP_PORT_SEL_MASK |TRANS_DP_SYNC_MASK |TRANS_DP_BPC_MASK );
@@ -5843,7 +5858,7 @@ static void ilk_pch_enable(const struct intel_atomic_state *state,WARN_ON (port <PORT_B || port >PORT_D ); temp |=TRANS_DP_PORT_SEL (port); -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp); }ilk_enable_pch_transcoder (crtc_state);
@@ -5872,10 +5887,10 @@ static void cpt_verify_modeset(struct drm_i915_private *dev_priv,i915_reg_t dslreg =PIPEDSL (pipe);u32 temp; - temp =I915_READ (dslreg); + temp =intel_de_read (dev_priv, dslreg);udelay (500 ); -if (wait_for (I915_READ (dslreg) != temp,5 )) { -if (wait_for (I915_READ (dslreg) != temp,5 )) +if (wait_for (intel_de_read (dev_priv, dslreg) != temp,5 )) { +if (wait_for (intel_de_read (dev_priv, dslreg) != temp,5 ))drm_err (&dev_priv->drm,"mode set failed: pipe %c stuck\n" ,pipe_name (pipe));
@@ -6210,14 +6225,16 @@ static void skl_pfit_enable(const struct intel_crtc_state *crtc_state) uv_rgb_vphase =skl_scaler_calc_phase (1 , vscale, false); id = scaler_state->scaler_id; -I915_WRITE (SKL_PS_CTRL (pipe, id),PS_SCALER_EN | -PS_FILTER_MEDIUM | scaler_state->scalers[id].mode); -I915_WRITE_FW (SKL_PS_VPHASE (pipe, id), -PS_Y_PHASE (0 ) |PS_UV_RGB_PHASE (uv_rgb_vphase)); -I915_WRITE_FW (SKL_PS_HPHASE (pipe, id), -PS_Y_PHASE (0 ) |PS_UV_RGB_PHASE (uv_rgb_hphase)); -I915_WRITE (SKL_PS_WIN_POS (pipe, id), crtc_state->pch_pfit.pos); -I915_WRITE (SKL_PS_WIN_SZ (pipe, id), crtc_state->pch_pfit.size); +intel_de_write (dev_priv,SKL_PS_CTRL (pipe, id), +PS_SCALER_EN |PS_FILTER_MEDIUM | scaler_state->scalers[id].mode); +intel_de_write_fw (dev_priv,SKL_PS_VPHASE (pipe, id), +PS_Y_PHASE (0 ) |PS_UV_RGB_PHASE (uv_rgb_vphase)); +intel_de_write_fw (dev_priv,SKL_PS_HPHASE (pipe, id), +PS_Y_PHASE (0 ) |PS_UV_RGB_PHASE (uv_rgb_hphase)); +intel_de_write (dev_priv,SKL_PS_WIN_POS (pipe, id), + crtc_state->pch_pfit.pos); +intel_de_write (dev_priv,SKL_PS_WIN_SZ (pipe, id), + crtc_state->pch_pfit.size); } }
@@ -6233,12 +6250,15 @@ static void ilk_pfit_enable(const struct intel_crtc_state *crtc_state)* e.g. x201. */ if (IS_IVYBRIDGE (dev_priv) ||IS_HASWELL (dev_priv)) -I915_WRITE (PF_CTL (pipe),PF_ENABLE | PF_FILTER_MED_3x3 | -PF_PIPE_SEL_IVB (pipe)); +intel_de_write (dev_priv,PF_CTL (pipe), +PF_ENABLE | PF_FILTER_MED_3x3 |PF_PIPE_SEL_IVB (pipe));else -I915_WRITE (PF_CTL (pipe),PF_ENABLE | PF_FILTER_MED_3x3); -I915_WRITE (PF_WIN_POS (pipe), crtc_state->pch_pfit.pos); -I915_WRITE (PF_WIN_SZ (pipe), crtc_state->pch_pfit.size); +intel_de_write (dev_priv,PF_CTL (pipe), +PF_ENABLE | PF_FILTER_MED_3x3); +intel_de_write (dev_priv,PF_WIN_POS (pipe), + crtc_state->pch_pfit.pos); +intel_de_write (dev_priv,PF_WIN_SZ (pipe), + crtc_state->pch_pfit.size); } }
@@ -6267,7 +6287,7 @@ void hsw_enable_ips(const struct intel_crtc_state *crtc_state)* so we need to just enable it and continue on. */ }else { -I915_WRITE (IPS_CTL ,IPS_ENABLE ); +intel_de_write (dev_priv,IPS_CTL ,IPS_ENABLE );/* 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 * and don't wait for vblanks until the end of crtc_enable, then
@@ -6299,8 +6319,8 @@ void hsw_disable_ips(const struct intel_crtc_state *crtc_state)drm_err (&dev_priv->drm,"Timed out waiting for IPS disable\n" ); }else { -I915_WRITE (IPS_CTL ,0 ); -POSTING_READ (IPS_CTL ); +intel_de_write (dev_priv,IPS_CTL ,0 ); +intel_de_posting_read (dev_priv,IPS_CTL ); }/* We need to wait for a vblank before we can disable the plane. */
@@ -6895,7 +6915,7 @@ static bool hsw_crtc_supports_ips(struct intel_crtc *crtc)static void glk_pipe_scaler_clock_gating_wa (struct drm_i915_private *dev_priv,enum pipe pipe,bool apply) { -u32 val =I915_READ (CLKGATE_DIS_PSL (pipe)); +u32 val =intel_de_read (dev_priv,CLKGATE_DIS_PSL (pipe));u32 mask =DPF_GATING_DIS |DPF_RAM_GATING_DIS |DPFR_GATING_DIS ;if (apply)
@@ -6903,7 +6923,7 @@ static void glk_pipe_scaler_clock_gating_wa(struct drm_i915_private *dev_priv,else val &= ~mask; -I915_WRITE (CLKGATE_DIS_PSL (pipe), val); +intel_de_write (dev_priv,CLKGATE_DIS_PSL (pipe), val); }static void icl_pipe_mbus_enable (struct intel_crtc *crtc)
@@ -6922,7 +6942,7 @@ static void icl_pipe_mbus_enable(struct intel_crtc *crtc) val |=MBUS_DBOX_B_CREDIT (8 ); } -I915_WRITE (PIPE_MBUS_DBOX_CTL (pipe), val); +intel_de_write (dev_priv,PIPE_MBUS_DBOX_CTL (pipe), val); }static void hsw_set_frame_start_delay (const struct intel_crtc_state *crtc_state)
@@ -6932,10 +6952,10 @@ static void hsw_set_frame_start_delay(const struct intel_crtc_state *crtc_state)i915_reg_t reg =CHICKEN_TRANS (crtc_state->cpu_transcoder);u32 val; - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg); val &= ~HSW_FRAME_START_DELAY_MASK ; val |=HSW_FRAME_START_DELAY (0 ); -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val); } static void hsw_crtc_enable(struct intel_atomic_state *state,
@@ -6971,8 +6991,8 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,if (cpu_transcoder !=TRANSCODER_EDP && !transcoder_is_dsi (cpu_transcoder)) -I915_WRITE (PIPE_MULT (cpu_transcoder), - new_crtc_state->pixel_multiplier -1 ); +intel_de_write (dev_priv,PIPE_MULT (cpu_transcoder), + new_crtc_state->pixel_multiplier -1 );if (new_crtc_state->has_pch_encoder) intel_cpu_transcoder_set_m_n(new_crtc_state,
@@ -7055,9 +7075,9 @@ void ilk_pfit_disable(const struct intel_crtc_state *old_crtc_state)/* To avoid upsetting the power well on haswell only disable the pfit if * it's in use. The hw state code will make sure we get this right. */ if (old_crtc_state->pch_pfit.enabled) { -I915_WRITE (PF_CTL (pipe),0 ); -I915_WRITE (PF_WIN_POS (pipe),0 ); -I915_WRITE (PF_WIN_SZ (pipe),0 ); +intel_de_write (dev_priv,PF_CTL (pipe),0 ); +intel_de_write (dev_priv,PF_WIN_POS (pipe),0 ); +intel_de_write (dev_priv,PF_WIN_SZ (pipe),0 ); } }
@@ -7099,16 +7119,16 @@ static void ilk_crtc_disable(struct intel_atomic_state *state,/* disable TRANS_DP_CTL */ reg =TRANS_DP_CTL (pipe); - temp =I915_READ (reg); + temp =intel_de_read (dev_priv, reg); temp &= ~(TRANS_DP_OUTPUT_ENABLE |TRANS_DP_PORT_SEL_MASK ); temp |=TRANS_DP_PORT_SEL_NONE ; -I915_WRITE (reg, temp); +intel_de_write (dev_priv, reg, temp);/* disable DPLL_SEL */ - temp =I915_READ (PCH_DPLL_SEL ); + temp =intel_de_read (dev_priv,PCH_DPLL_SEL ); temp &= ~(TRANS_DPLL_ENABLE (pipe) |TRANS_DPLLB_SEL (pipe)); -I915_WRITE (PCH_DPLL_SEL , temp); +intel_de_write (dev_priv,PCH_DPLL_SEL , temp); }ilk_fdi_pll_disable (crtc);
@@ -7141,15 +7161,16 @@ static void i9xx_pfit_enable(const struct intel_crtc_state *crtc_state)* The panel fitter should only be adjusted whilst the pipe is disabled, * according to register description and PRM. */ -WARN_ON (I915_READ (PFIT_CONTROL ) &PFIT_ENABLE ); +WARN_ON (intel_de_read (dev_priv,PFIT_CONTROL ) &PFIT_ENABLE );assert_pipe_disabled (dev_priv, crtc_state->cpu_transcoder); -I915_WRITE (PFIT_PGM_RATIOS , crtc_state->gmch_pfit.pgm_ratios); -I915_WRITE (PFIT_CONTROL , crtc_state->gmch_pfit.control); +intel_de_write (dev_priv,PFIT_PGM_RATIOS , + crtc_state->gmch_pfit.pgm_ratios); +intel_de_write (dev_priv,PFIT_CONTROL , crtc_state->gmch_pfit.control);/* Border color in case we don't scale up to the full screen. Black by * default, change to something else for debugging. */ -I915_WRITE (BCLRPAT (crtc->pipe),0 ); +intel_de_write (dev_priv,BCLRPAT (crtc->pipe),0 ); }bool intel_phy_is_combo (struct drm_i915_private *dev_priv,enum phy phy)
@@ -7346,8 +7367,8 @@ static void valleyview_crtc_enable(struct intel_atomic_state *state,intel_set_pipe_src_size (new_crtc_state);if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_B ) { -I915_WRITE (CHV_BLEND (pipe),CHV_BLEND_LEGACY ); -I915_WRITE (CHV_CANVAS (pipe),0 ); +intel_de_write (dev_priv,CHV_BLEND (pipe),CHV_BLEND_LEGACY ); +intel_de_write (dev_priv,CHV_CANVAS (pipe),0 ); }i9xx_set_pipeconf (new_crtc_state);
@@ -7388,8 +7409,10 @@ static void i9xx_set_pll_dividers(const 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); -I915_WRITE (FP0 (crtc->pipe), crtc_state->dpll_hw_state.fp0); -I915_WRITE (FP1 (crtc->pipe), crtc_state->dpll_hw_state.fp1); +intel_de_write (dev_priv,FP0 (crtc->pipe), + crtc_state->dpll_hw_state.fp0); +intel_de_write (dev_priv,FP1 (crtc->pipe), + crtc_state->dpll_hw_state.fp1); } static void i9xx_crtc_enable(struct intel_atomic_state *state,
@@ -7451,8 +7474,8 @@ static void i9xx_pfit_disable(const struct intel_crtc_state *old_crtc_state)assert_pipe_disabled (dev_priv, old_crtc_state->cpu_transcoder);drm_dbg_kms (&dev_priv->drm,"disabling pfit, current: 0x%08x\n" , -I915_READ (PFIT_CONTROL )); -I915_WRITE (PFIT_CONTROL ,0 ); +intel_de_read (dev_priv,PFIT_CONTROL )); +intel_de_write (dev_priv,PFIT_CONTROL ,0 ); } static void i9xx_crtc_disable(struct intel_atomic_state *state,
@@ -8044,7 +8067,8 @@ static void intel_panel_sanitize_ssc(struct drm_i915_private *dev_priv)* indicates as much. */ if (HAS_PCH_IBX (dev_priv) ||HAS_PCH_CPT (dev_priv)) { -bool bios_lvds_use_ssc =I915_READ (PCH_DREF_CONTROL ) & +bool bios_lvds_use_ssc =intel_de_read (dev_priv, +PCH_DREF_CONTROL ) &DREF_SSC1_ENABLE ;if (dev_priv->vbt.lvds_use_ssc != bios_lvds_use_ssc) {
@@ -8138,10 +8162,11 @@ static void intel_pch_transcoder_set_m_n(const struct intel_crtc_state *crtc_stastruct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -I915_WRITE (PCH_TRANS_DATA_M1 (pipe),TU_SIZE (m_n->tu) | m_n->gmch_m); -I915_WRITE (PCH_TRANS_DATA_N1 (pipe), m_n->gmch_n); -I915_WRITE (PCH_TRANS_LINK_M1 (pipe), m_n->link_m); -I915_WRITE (PCH_TRANS_LINK_N1 (pipe), m_n->link_n); +intel_de_write (dev_priv,PCH_TRANS_DATA_M1 (pipe), +TU_SIZE (m_n->tu) | m_n->gmch_m); +intel_de_write (dev_priv,PCH_TRANS_DATA_N1 (pipe), m_n->gmch_n); +intel_de_write (dev_priv,PCH_TRANS_LINK_M1 (pipe), m_n->link_m); +intel_de_write (dev_priv,PCH_TRANS_LINK_N1 (pipe), m_n->link_n); } static bool transcoder_has_m2_n2(struct drm_i915_private *dev_priv,
@@ -8167,27 +8192,35 @@ static void intel_cpu_transcoder_set_m_n(const struct intel_crtc_state *crtc_staenum transcoder transcoder = crtc_state->cpu_transcoder;if (INTEL_GEN (dev_priv) >=5 ) { -I915_WRITE (PIPE_DATA_M1 (transcoder),TU_SIZE (m_n->tu) | m_n->gmch_m); -I915_WRITE (PIPE_DATA_N1 (transcoder), m_n->gmch_n); -I915_WRITE (PIPE_LINK_M1 (transcoder), m_n->link_m); -I915_WRITE (PIPE_LINK_N1 (transcoder), m_n->link_n); +intel_de_write (dev_priv,PIPE_DATA_M1 (transcoder), +TU_SIZE (m_n->tu) | m_n->gmch_m); +intel_de_write (dev_priv,PIPE_DATA_N1 (transcoder), + m_n->gmch_n); +intel_de_write (dev_priv,PIPE_LINK_M1 (transcoder), + m_n->link_m); +intel_de_write (dev_priv,PIPE_LINK_N1 (transcoder), + m_n->link_n);/* * M2_N2 registers are set only if DRRS is supported * (to make sure the registers are not unnecessarily accessed). */ if (m2_n2 && crtc_state->has_drrs &&transcoder_has_m2_n2 (dev_priv, transcoder)) { -I915_WRITE (PIPE_DATA_M2 (transcoder), -TU_SIZE (m2_n2->tu) | m2_n2->gmch_m); -I915_WRITE (PIPE_DATA_N2 (transcoder), m2_n2->gmch_n); -I915_WRITE (PIPE_LINK_M2 (transcoder), m2_n2->link_m); -I915_WRITE (PIPE_LINK_N2 (transcoder), m2_n2->link_n); +intel_de_write (dev_priv,PIPE_DATA_M2 (transcoder), +TU_SIZE (m2_n2->tu) | m2_n2->gmch_m); +intel_de_write (dev_priv,PIPE_DATA_N2 (transcoder), + m2_n2->gmch_n); +intel_de_write (dev_priv,PIPE_LINK_M2 (transcoder), + m2_n2->link_m); +intel_de_write (dev_priv,PIPE_LINK_N2 (transcoder), + m2_n2->link_n); } }else { -I915_WRITE (PIPE_DATA_M_G4X (pipe),TU_SIZE (m_n->tu) | m_n->gmch_m); -I915_WRITE (PIPE_DATA_N_G4X (pipe), m_n->gmch_n); -I915_WRITE (PIPE_LINK_M_G4X (pipe), m_n->link_m); -I915_WRITE (PIPE_LINK_N_G4X (pipe), m_n->link_n); +intel_de_write (dev_priv,PIPE_DATA_M_G4X (pipe), +TU_SIZE (m_n->tu) | m_n->gmch_m); +intel_de_write (dev_priv,PIPE_DATA_N_G4X (pipe), m_n->gmch_n); +intel_de_write (dev_priv,PIPE_LINK_M_G4X (pipe), m_n->link_m); +intel_de_write (dev_priv,PIPE_LINK_N_G4X (pipe), m_n->link_n); } }
@@ -8261,9 +8294,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,u32 coreclk, reg_val;/* Enable Refclk */ -I915_WRITE (DPLL (pipe), - pipe_config->dpll_hw_state.dpll & - ~(DPLL_VCO_ENABLE |DPLL_EXT_BUFFER_ENABLE_VLV )); +intel_de_write (dev_priv,DPLL (pipe), + pipe_config->dpll_hw_state.dpll & ~(DPLL_VCO_ENABLE |DPLL_EXT_BUFFER_ENABLE_VLV ));/* No need to actually set up the DPLL with DSI */ if ((pipe_config->dpll_hw_state.dpll &DPLL_VCO_ENABLE ) ==0 )
@@ -8363,8 +8395,8 @@ static void chv_prepare_pll(struct intel_crtc *crtc,int vco;/* Enable Refclk and SSC */ -I915_WRITE (DPLL (pipe), - pipe_config->dpll_hw_state.dpll & ~DPLL_VCO_ENABLE ); +intel_de_write (dev_priv,DPLL (pipe), + pipe_config->dpll_hw_state.dpll & ~DPLL_VCO_ENABLE );/* No need to actually set up the DPLL with DSI */ if ((pipe_config->dpll_hw_state.dpll &DPLL_VCO_ENABLE ) ==0 )
@@ -8663,27 +8695,22 @@ static void intel_set_pipe_timings(const struct intel_crtc_state *crtc_state) }if (INTEL_GEN (dev_priv) >3 ) -I915_WRITE (VSYNCSHIFT (cpu_transcoder), vsyncshift); - -I915_WRITE (HTOTAL (cpu_transcoder), - (adjusted_mode->crtc_hdisplay -1 ) | - ((adjusted_mode->crtc_htotal -1 ) <<16 )); -I915_WRITE (HBLANK (cpu_transcoder), - (adjusted_mode->crtc_hblank_start -1 ) | - ((adjusted_mode->crtc_hblank_end -1 ) <<16 )); -I915_WRITE (HSYNC (cpu_transcoder), - (adjusted_mode->crtc_hsync_start -1 ) | - ((adjusted_mode->crtc_hsync_end -1 ) <<16 )); - -I915_WRITE (VTOTAL (cpu_transcoder), - (adjusted_mode->crtc_vdisplay -1 ) | - ((crtc_vtotal -1 ) <<16 )); -I915_WRITE (VBLANK (cpu_transcoder), - (adjusted_mode->crtc_vblank_start -1 ) | - ((crtc_vblank_end -1 ) <<16 )); -I915_WRITE (VSYNC (cpu_transcoder), - (adjusted_mode->crtc_vsync_start -1 ) | - ((adjusted_mode->crtc_vsync_end -1 ) <<16 )); +intel_de_write (dev_priv,VSYNCSHIFT (cpu_transcoder), + vsyncshift); + +intel_de_write (dev_priv,HTOTAL (cpu_transcoder), + (adjusted_mode->crtc_hdisplay -1 ) | ((adjusted_mode->crtc_htotal -1 ) <<16 )); +intel_de_write (dev_priv,HBLANK (cpu_transcoder), + (adjusted_mode->crtc_hblank_start -1 ) | ((adjusted_mode->crtc_hblank_end -1 ) <<16 )); +intel_de_write (dev_priv,HSYNC (cpu_transcoder), + (adjusted_mode->crtc_hsync_start -1 ) | ((adjusted_mode->crtc_hsync_end -1 ) <<16 )); + +intel_de_write (dev_priv,VTOTAL (cpu_transcoder), + (adjusted_mode->crtc_vdisplay -1 ) | ((crtc_vtotal -1 ) <<16 )); +intel_de_write (dev_priv,VBLANK (cpu_transcoder), + (adjusted_mode->crtc_vblank_start -1 ) | ((crtc_vblank_end -1 ) <<16 )); +intel_de_write (dev_priv,VSYNC (cpu_transcoder), + (adjusted_mode->crtc_vsync_start -1 ) | ((adjusted_mode->crtc_vsync_end -1 ) <<16 ));/* Workaround: when the EDP input selection is B, the VTOTAL_B must be * programmed with the VTOTAL_EDP value. Same for VTOTAL_C. This is
@@ -8691,7 +8718,8 @@ static void intel_set_pipe_timings(const struct intel_crtc_state *crtc_state)* bits. */ if (IS_HASWELL (dev_priv) && cpu_transcoder ==TRANSCODER_EDP && (pipe ==PIPE_B || pipe ==PIPE_C )) -I915_WRITE (VTOTAL (pipe),I915_READ (VTOTAL (cpu_transcoder))); +intel_de_write (dev_priv,VTOTAL (pipe), +intel_de_read (dev_priv,VTOTAL (cpu_transcoder))); }
@@ -8704,9 +8732,8 @@ static void intel_set_pipe_src_size(const struct intel_crtc_state *crtc_state)/* pipesrc controls the size that is scaled from, which should * always be the user's requested size. */ -I915_WRITE (PIPESRC (pipe), - ((crtc_state->pipe_src_w -1 ) <<16 ) | - (crtc_state->pipe_src_h -1 )); +intel_de_write (dev_priv,PIPESRC (pipe), + ((crtc_state->pipe_src_w -1 ) <<16 ) | (crtc_state->pipe_src_h -1 )); }static bool intel_pipe_is_interlaced (const struct intel_crtc_state *crtc_state)
@@ -8719,9 +8746,9 @@ static bool intel_pipe_is_interlaced(const struct intel_crtc_state *crtc_state)if (INTEL_GEN (dev_priv) >=9 ||IS_BROADWELL (dev_priv) ||IS_HASWELL (dev_priv)) -return I915_READ (PIPECONF (cpu_transcoder)) &PIPECONF_INTERLACE_MASK_HSW ; +return intel_de_read (dev_priv,PIPECONF (cpu_transcoder)) &PIPECONF_INTERLACE_MASK_HSW ;else -return I915_READ (PIPECONF (cpu_transcoder)) &PIPECONF_INTERLACE_MASK ; +return intel_de_read (dev_priv,PIPECONF (cpu_transcoder)) &PIPECONF_INTERLACE_MASK ; } static void intel_get_pipe_timings(struct intel_crtc *crtc,
@@ -8732,33 +8759,33 @@ static void intel_get_pipe_timings(struct intel_crtc *crtc,enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;u32 tmp; - tmp =I915_READ (HTOTAL (cpu_transcoder)); + tmp =intel_de_read (dev_priv,HTOTAL (cpu_transcoder)); pipe_config->hw.adjusted_mode.crtc_hdisplay = (tmp &0xffff ) +1 ; pipe_config->hw.adjusted_mode.crtc_htotal = ((tmp >>16 ) &0xffff ) +1 ;if (!transcoder_is_dsi (cpu_transcoder)) { - tmp =I915_READ (HBLANK (cpu_transcoder)); + tmp =intel_de_read (dev_priv,HBLANK (cpu_transcoder)); pipe_config->hw.adjusted_mode.crtc_hblank_start = (tmp &0xffff ) +1 ; pipe_config->hw.adjusted_mode.crtc_hblank_end = ((tmp >>16 ) &0xffff ) +1 ; } - tmp =I915_READ (HSYNC (cpu_transcoder)); + tmp =intel_de_read (dev_priv,HSYNC (cpu_transcoder)); pipe_config->hw.adjusted_mode.crtc_hsync_start = (tmp &0xffff ) +1 ; pipe_config->hw.adjusted_mode.crtc_hsync_end = ((tmp >>16 ) &0xffff ) +1 ; - tmp =I915_READ (VTOTAL (cpu_transcoder)); + tmp =intel_de_read (dev_priv,VTOTAL (cpu_transcoder)); pipe_config->hw.adjusted_mode.crtc_vdisplay = (tmp &0xffff ) +1 ; pipe_config->hw.adjusted_mode.crtc_vtotal = ((tmp >>16 ) &0xffff ) +1 ;if (!transcoder_is_dsi (cpu_transcoder)) { - tmp =I915_READ (VBLANK (cpu_transcoder)); + tmp =intel_de_read (dev_priv,VBLANK (cpu_transcoder)); pipe_config->hw.adjusted_mode.crtc_vblank_start = (tmp &0xffff ) +1 ; pipe_config->hw.adjusted_mode.crtc_vblank_end = ((tmp >>16 ) &0xffff ) +1 ; } - tmp =I915_READ (VSYNC (cpu_transcoder)); + tmp =intel_de_read (dev_priv,VSYNC (cpu_transcoder)); pipe_config->hw.adjusted_mode.crtc_vsync_start = (tmp &0xffff ) +1 ; pipe_config->hw.adjusted_mode.crtc_vsync_end = ((tmp >>16 ) &0xffff ) +1 ;
@@ -8776,7 +8803,7 @@ static void intel_get_pipe_src_size(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (dev);u32 tmp; - tmp =I915_READ (PIPESRC (crtc->pipe)); + tmp =intel_de_read (dev_priv,PIPESRC (crtc->pipe)); pipe_config->pipe_src_h = (tmp &0xffff ) +1 ; pipe_config->pipe_src_w = ((tmp >>16 ) &0xffff ) +1 ;
@@ -8817,7 +8844,7 @@ static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state)/* we keep both pipes enabled on 830 */ if (IS_I830 (dev_priv)) - pipeconf |=I915_READ (PIPECONF (crtc->pipe)) &PIPECONF_ENABLE ; + pipeconf |=intel_de_read (dev_priv,PIPECONF (crtc->pipe)) &PIPECONF_ENABLE ;if (crtc_state->double_wide) pipeconf |=PIPECONF_DOUBLE_WIDE ;
@@ -8864,8 +8891,8 @@ static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state) pipeconf |=PIPECONF_FRAME_START_DELAY (0 ); -I915_WRITE (PIPECONF (crtc->pipe), pipeconf); -POSTING_READ (PIPECONF (crtc->pipe)); +intel_de_write (dev_priv,PIPECONF (crtc->pipe), pipeconf); +intel_de_posting_read (dev_priv,PIPECONF (crtc->pipe)); } static int i8xx_crtc_compute_clock(struct intel_crtc *crtc,
@@ -9088,7 +9115,7 @@ static void i9xx_get_pfit_config(struct intel_crtc *crtc,if (!i9xx_has_pfit (dev_priv))return ; - tmp =I915_READ (PFIT_CONTROL ); + tmp =intel_de_read (dev_priv,PFIT_CONTROL );if (!(tmp &PFIT_ENABLE ))return ;
@@ -9102,7 +9129,8 @@ static void i9xx_get_pfit_config(struct intel_crtc *crtc, } pipe_config->gmch_pfit.control = tmp; - pipe_config->gmch_pfit.pgm_ratios =I915_READ (PFIT_PGM_RATIOS ); + pipe_config->gmch_pfit.pgm_ratios =intel_de_read (dev_priv, +PFIT_PGM_RATIOS ); } static void vlv_crtc_clock_get(struct intel_crtc *crtc,
@@ -9162,7 +9190,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc, fb->dev = dev; - val =I915_READ (DSPCNTR (i9xx_plane)); + val =intel_de_read (dev_priv,DSPCNTR (i9xx_plane));if (INTEL_GEN (dev_priv) >=4 ) {if (val &DISPPLANE_TILED ) {
@@ -9183,24 +9211,26 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc, fb->format =drm_format_info (fourcc);if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { - offset =I915_READ (DSPOFFSET (i9xx_plane)); - base =I915_READ (DSPSURF (i9xx_plane)) &0xfffff000 ; + offset =intel_de_read (dev_priv,DSPOFFSET (i9xx_plane)); + base =intel_de_read (dev_priv,DSPSURF (i9xx_plane)) &0xfffff000 ; }else if (INTEL_GEN (dev_priv) >=4 ) {if (plane_config->tiling) - offset =I915_READ (DSPTILEOFF (i9xx_plane)); + offset =intel_de_read (dev_priv, +DSPTILEOFF (i9xx_plane));else - offset =I915_READ (DSPLINOFF (i9xx_plane)); - base =I915_READ (DSPSURF (i9xx_plane)) &0xfffff000 ; + offset =intel_de_read (dev_priv, +DSPLINOFF (i9xx_plane)); + base =intel_de_read (dev_priv,DSPSURF (i9xx_plane)) &0xfffff000 ; }else { - base =I915_READ (DSPADDR (i9xx_plane)); + base =intel_de_read (dev_priv,DSPADDR (i9xx_plane)); } plane_config->base = base; - val =I915_READ (PIPESRC (pipe)); + val =intel_de_read (dev_priv,PIPESRC (pipe)); fb->width = ((val >>16 ) &0xfff ) +1 ; fb->height = ((val >>0 ) &0xfff ) +1 ; - val =I915_READ (DSPSTRIDE (i9xx_plane)); + val =intel_de_read (dev_priv,DSPSTRIDE (i9xx_plane)); fb->pitches[0 ] = val &0xffffffc0 ; aligned_height =intel_fb_align_height (fb,0 , fb->height);
@@ -9256,7 +9286,7 @@ bdw_get_pipemisc_output_format(struct intel_crtc *crtc)struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 tmp; - tmp =I915_READ (PIPEMISC (crtc->pipe)); + tmp =intel_de_read (dev_priv,PIPEMISC (crtc->pipe));if (tmp &PIPEMISC_YUV420_ENABLE ) {/* We support 4:2:0 in full blend mode only */
@@ -9278,7 +9308,7 @@ static void i9xx_get_pipe_color_config(struct intel_crtc_state *crtc_state)enum i9xx_plane_id i9xx_plane = plane->i9xx_plane;u32 tmp; - tmp =I915_READ (DSPCNTR (i9xx_plane)); + tmp =intel_de_read (dev_priv,DSPCNTR (i9xx_plane));if (tmp &DISPPLANE_GAMMA_ENABLE ) crtc_state->gamma_enable = true;
@@ -9309,7 +9339,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc, ret = false; - tmp =I915_READ (PIPECONF (crtc->pipe)); + tmp =intel_de_read (dev_priv,PIPECONF (crtc->pipe));if (!(tmp &PIPECONF_ENABLE )) goto out;
@@ -9338,7 +9368,8 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,PIPECONF_GAMMA_MODE_SHIFT ;if (IS_CHERRYVIEW (dev_priv)) - pipe_config->cgm_mode =I915_READ (CGM_PIPE_MODE (crtc->pipe)); + pipe_config->cgm_mode =intel_de_read (dev_priv, +CGM_PIPE_MODE (crtc->pipe));i9xx_get_pipe_color_config (pipe_config);intel_color_get_config (pipe_config);
@@ -9356,14 +9387,14 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,if (IS_CHERRYVIEW (dev_priv) && crtc->pipe !=PIPE_A ) tmp = dev_priv->chv_dpll_md[crtc->pipe];else - tmp =I915_READ (DPLL_MD (crtc->pipe)); + tmp =intel_de_read (dev_priv,DPLL_MD (crtc->pipe)); pipe_config->pixel_multiplier = ((tmp &DPLL_MD_UDI_MULTIPLIER_MASK ) >>DPLL_MD_UDI_MULTIPLIER_SHIFT ) +1 ; pipe_config->dpll_hw_state.dpll_md = tmp; }else if (IS_I945G (dev_priv) ||IS_I945GM (dev_priv) ||IS_G33 (dev_priv) ||IS_PINEVIEW (dev_priv)) { - tmp =I915_READ (DPLL (crtc->pipe)); + tmp =intel_de_read (dev_priv,DPLL (crtc->pipe)); pipe_config->pixel_multiplier = ((tmp &SDVO_MULTIPLIER_MASK ) >>SDVO_MULTIPLIER_SHIFT_HIRES ) +1 ;
@@ -9373,10 +9404,13 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,* function. */ pipe_config->pixel_multiplier =1 ; } - pipe_config->dpll_hw_state.dpll =I915_READ (DPLL (crtc->pipe)); + pipe_config->dpll_hw_state.dpll =intel_de_read (dev_priv, +DPLL (crtc->pipe));if (!IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv)) { - pipe_config->dpll_hw_state.fp0 =I915_READ (FP0 (crtc->pipe)); - pipe_config->dpll_hw_state.fp1 =I915_READ (FP1 (crtc->pipe)); + pipe_config->dpll_hw_state.fp0 =intel_de_read (dev_priv, +FP0 (crtc->pipe)); + pipe_config->dpll_hw_state.fp1 =intel_de_read (dev_priv, +FP1 (crtc->pipe)); }else {/* Mask out read-only status bits. */ pipe_config->dpll_hw_state.dpll &= ~(DPLL_LOCK_VLV |
@@ -9446,7 +9480,7 @@ static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv)/* Check if any DPLLs are using the SSC source */ for (i =0 ; i < dev_priv->num_shared_dpll; i++) { -u32 temp =I915_READ (PCH_DPLL (i)); +u32 temp =intel_de_read (dev_priv,PCH_DPLL (i));if (!(temp &DPLL_VCO_ENABLE ))continue ;
@@ -9467,7 +9501,7 @@ static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv)* PCH B stepping, previous chipset stepping should be * ignoring this setting. */ - val =I915_READ (PCH_DREF_CONTROL ); + val =intel_de_read (dev_priv,PCH_DREF_CONTROL );/* As we must carefully and slowly disable/enable each source in turn, * compute the final state we want first and check if we need to
@@ -9525,8 +9559,8 @@ static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv) val &= ~DREF_SSC1_ENABLE ;/* Get SSC going before enabling the outputs */ -I915_WRITE (PCH_DREF_CONTROL , val); -POSTING_READ (PCH_DREF_CONTROL ); +intel_de_write (dev_priv,PCH_DREF_CONTROL , val); +intel_de_posting_read (dev_priv,PCH_DREF_CONTROL );udelay (200 ); val &= ~DREF_CPU_SOURCE_OUTPUT_MASK ;
@@ -9542,8 +9576,8 @@ static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv) }else val |=DREF_CPU_SOURCE_OUTPUT_DISABLE ; -I915_WRITE (PCH_DREF_CONTROL , val); -POSTING_READ (PCH_DREF_CONTROL ); +intel_de_write (dev_priv,PCH_DREF_CONTROL , val); +intel_de_posting_read (dev_priv,PCH_DREF_CONTROL );udelay (200 ); }else {drm_dbg_kms (&dev_priv->drm,"Disabling CPU source output\n" );
@@ -9553,8 +9587,8 @@ static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv)/* Turn off CPU output */ val |=DREF_CPU_SOURCE_OUTPUT_DISABLE ; -I915_WRITE (PCH_DREF_CONTROL , val); -POSTING_READ (PCH_DREF_CONTROL ); +intel_de_write (dev_priv,PCH_DREF_CONTROL , val); +intel_de_posting_read (dev_priv,PCH_DREF_CONTROL );udelay (200 );if (!using_ssc_source) {
@@ -9567,8 +9601,8 @@ static void ilk_init_pch_refclk(struct drm_i915_private *dev_priv)/* Turn off SSC1 */ val &= ~DREF_SSC1_ENABLE ; -I915_WRITE (PCH_DREF_CONTROL , val); -POSTING_READ (PCH_DREF_CONTROL ); +intel_de_write (dev_priv,PCH_DREF_CONTROL , val); +intel_de_posting_read (dev_priv,PCH_DREF_CONTROL );udelay (200 ); } }
@@ -9580,19 +9614,19 @@ static void lpt_reset_fdi_mphy(struct drm_i915_private *dev_priv) {u32 tmp; - tmp =I915_READ (SOUTH_CHICKEN2 ); + tmp =intel_de_read (dev_priv,SOUTH_CHICKEN2 ); tmp |=FDI_MPHY_IOSFSB_RESET_CTL ; -I915_WRITE (SOUTH_CHICKEN2 , tmp); +intel_de_write (dev_priv,SOUTH_CHICKEN2 , tmp); -if (wait_for_us (I915_READ (SOUTH_CHICKEN2 ) & +if (wait_for_us (intel_de_read (dev_priv,SOUTH_CHICKEN2 ) &FDI_MPHY_IOSFSB_RESET_STATUS ,100 ))drm_err (&dev_priv->drm,"FDI mPHY reset assert timeout\n" ); - tmp =I915_READ (SOUTH_CHICKEN2 ); + tmp =intel_de_read (dev_priv,SOUTH_CHICKEN2 ); tmp &= ~FDI_MPHY_IOSFSB_RESET_CTL ; -I915_WRITE (SOUTH_CHICKEN2 , tmp); +intel_de_write (dev_priv,SOUTH_CHICKEN2 , tmp); -if (wait_for_us ((I915_READ (SOUTH_CHICKEN2 ) & +if (wait_for_us ((intel_de_read (dev_priv,SOUTH_CHICKEN2 ) &FDI_MPHY_IOSFSB_RESET_STATUS ) ==0 ,100 ))drm_err (&dev_priv->drm,"FDI mPHY reset de-assert timeout\n" ); }
@@ -9806,8 +9840,8 @@ static void lpt_bend_clkout_dp(struct drm_i915_private *dev_priv, int steps)static bool spll_uses_pch_ssc (struct drm_i915_private *dev_priv) { -u32 fuse_strap =I915_READ (FUSE_STRAP ); -u32 ctl =I915_READ (SPLL_CTL ); +u32 fuse_strap =intel_de_read (dev_priv,FUSE_STRAP ); +u32 ctl =intel_de_read (dev_priv,SPLL_CTL );if ((ctl &SPLL_PLL_ENABLE ) ==0 )return false;
@@ -9826,8 +9860,8 @@ static bool spll_uses_pch_ssc(struct drm_i915_private *dev_priv)static bool wrpll_uses_pch_ssc (struct drm_i915_private *dev_priv,enum intel_dpll_id id) { -u32 fuse_strap =I915_READ (FUSE_STRAP ); -u32 ctl =I915_READ (WRPLL_CTL (id)); +u32 fuse_strap =intel_de_read (dev_priv,FUSE_STRAP ); +u32 ctl =intel_de_read (dev_priv,WRPLL_CTL (id));if ((ctl &WRPLL_PLL_ENABLE ) ==0 )return false;
@@ -9964,8 +9998,8 @@ static void ilk_set_pipeconf(const struct intel_crtc_state *crtc_state) val |=PIPECONF_FRAME_START_DELAY (0 ); -I915_WRITE (PIPECONF (pipe), val); -POSTING_READ (PIPECONF (pipe)); +intel_de_write (dev_priv,PIPECONF (pipe), val); +intel_de_posting_read (dev_priv,PIPECONF (pipe)); }static void hsw_set_pipeconf (const struct intel_crtc_state *crtc_state)
@@ -9987,8 +10021,8 @@ static void hsw_set_pipeconf(const struct intel_crtc_state *crtc_state) crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB) val |=PIPECONF_OUTPUT_COLORSPACE_YUV_HSW ; -I915_WRITE (PIPECONF (cpu_transcoder), val); -POSTING_READ (PIPECONF (cpu_transcoder)); +intel_de_write (dev_priv,PIPECONF (cpu_transcoder), val); +intel_de_posting_read (dev_priv,PIPECONF (cpu_transcoder)); }static void bdw_set_pipemisc (const struct intel_crtc_state *crtc_state)
@@ -10031,7 +10065,7 @@ static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state) BIT(PLANE_CURSOR))) == 0) val |=PIPEMISC_HDR_MODE_PRECISION ; -I915_WRITE (PIPEMISC (crtc->pipe), val); +intel_de_write (dev_priv,PIPEMISC (crtc->pipe), val); }int bdw_get_pipemisc_bpp (struct intel_crtc *crtc)
@@ -10039,7 +10073,7 @@ int bdw_get_pipemisc_bpp(struct intel_crtc *crtc)struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);u32 tmp; - tmp =I915_READ (PIPEMISC (crtc->pipe)); + tmp =intel_de_read (dev_priv,PIPEMISC (crtc->pipe));switch (tmp &PIPEMISC_DITHER_BPC_MASK ) {case PIPEMISC_DITHER_6_BPC :
@@ -10240,12 +10274,12 @@ static void intel_pch_transcoder_get_m_n(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (dev);enum pipe pipe = crtc->pipe; - m_n->link_m =I915_READ (PCH_TRANS_LINK_M1 (pipe)); - m_n->link_n =I915_READ (PCH_TRANS_LINK_N1 (pipe)); - m_n->gmch_m =I915_READ (PCH_TRANS_DATA_M1 (pipe)) + m_n->link_m =intel_de_read (dev_priv,PCH_TRANS_LINK_M1 (pipe)); + m_n->link_n =intel_de_read (dev_priv,PCH_TRANS_LINK_N1 (pipe)); + m_n->gmch_m =intel_de_read (dev_priv,PCH_TRANS_DATA_M1 (pipe)) & ~TU_SIZE_MASK ; - m_n->gmch_n =I915_READ (PCH_TRANS_DATA_N1 (pipe)); - m_n->tu = ((I915_READ (PCH_TRANS_DATA_M1 (pipe)) + m_n->gmch_n =intel_de_read (dev_priv,PCH_TRANS_DATA_N1 (pipe)); + m_n->tu = ((intel_de_read (dev_priv,PCH_TRANS_DATA_M1 (pipe)) &TU_SIZE_MASK ) >>TU_SIZE_SHIFT ) +1 ; }
@@ -10258,30 +10292,38 @@ static void intel_cpu_transcoder_get_m_n(struct intel_crtc *crtc,enum pipe pipe = crtc->pipe;if (INTEL_GEN (dev_priv) >=5 ) { - m_n->link_m =I915_READ (PIPE_LINK_M1 (transcoder)); - m_n->link_n =I915_READ (PIPE_LINK_N1 (transcoder)); - m_n->gmch_m =I915_READ (PIPE_DATA_M1 (transcoder)) + m_n->link_m =intel_de_read (dev_priv, +PIPE_LINK_M1 (transcoder)); + m_n->link_n =intel_de_read (dev_priv, +PIPE_LINK_N1 (transcoder)); + m_n->gmch_m =intel_de_read (dev_priv, +PIPE_DATA_M1 (transcoder)) & ~TU_SIZE_MASK ; - m_n->gmch_n =I915_READ (PIPE_DATA_N1 (transcoder)); - m_n->tu = ((I915_READ (PIPE_DATA_M1 (transcoder)) + m_n->gmch_n =intel_de_read (dev_priv, +PIPE_DATA_N1 (transcoder)); + m_n->tu = ((intel_de_read (dev_priv,PIPE_DATA_M1 (transcoder)) &TU_SIZE_MASK ) >>TU_SIZE_SHIFT ) +1 ;if (m2_n2 &&transcoder_has_m2_n2 (dev_priv, transcoder)) { - m2_n2->link_m =I915_READ (PIPE_LINK_M2 (transcoder)); - m2_n2->link_n =I915_READ (PIPE_LINK_N2 (transcoder)); - m2_n2->gmch_m =I915_READ (PIPE_DATA_M2 (transcoder)) + m2_n2->link_m =intel_de_read (dev_priv, +PIPE_LINK_M2 (transcoder)); + m2_n2->link_n =intel_de_read (dev_priv, +PIPE_LINK_N2 (transcoder)); + m2_n2->gmch_m =intel_de_read (dev_priv, +PIPE_DATA_M2 (transcoder)) & ~TU_SIZE_MASK ; - m2_n2->gmch_n =I915_READ (PIPE_DATA_N2 (transcoder)); - m2_n2->tu = ((I915_READ (PIPE_DATA_M2 (transcoder)) + m2_n2->gmch_n =intel_de_read (dev_priv, +PIPE_DATA_N2 (transcoder)); + m2_n2->tu = ((intel_de_read (dev_priv,PIPE_DATA_M2 (transcoder)) &TU_SIZE_MASK ) >>TU_SIZE_SHIFT ) +1 ; } }else { - m_n->link_m =I915_READ (PIPE_LINK_M_G4X (pipe)); - m_n->link_n =I915_READ (PIPE_LINK_N_G4X (pipe)); - m_n->gmch_m =I915_READ (PIPE_DATA_M_G4X (pipe)) + m_n->link_m =intel_de_read (dev_priv,PIPE_LINK_M_G4X (pipe)); + m_n->link_n =intel_de_read (dev_priv,PIPE_LINK_N_G4X (pipe)); + m_n->gmch_m =intel_de_read (dev_priv,PIPE_DATA_M_G4X (pipe)) & ~TU_SIZE_MASK ; - m_n->gmch_n =I915_READ (PIPE_DATA_N_G4X (pipe)); - m_n->tu = ((I915_READ (PIPE_DATA_M_G4X (pipe)) + m_n->gmch_n =intel_de_read (dev_priv,PIPE_DATA_N_G4X (pipe)); + m_n->tu = ((intel_de_read (dev_priv,PIPE_DATA_M_G4X (pipe)) &TU_SIZE_MASK ) >>TU_SIZE_SHIFT ) +1 ; } }
@@ -10316,12 +10358,14 @@ static void skl_get_pfit_config(struct intel_crtc *crtc,/* find scaler attached to this pipe */ for (i =0 ; i < crtc->num_scalers; i++) { - ps_ctrl =I915_READ (SKL_PS_CTRL (crtc->pipe, i)); + ps_ctrl =intel_de_read (dev_priv,SKL_PS_CTRL (crtc->pipe, i));if (ps_ctrl &PS_SCALER_EN && !(ps_ctrl &PS_PLANE_SEL_MASK )) { id = i; pipe_config->pch_pfit.enabled = true; - pipe_config->pch_pfit.pos =I915_READ (SKL_PS_WIN_POS (crtc->pipe, i)); - pipe_config->pch_pfit.size =I915_READ (SKL_PS_WIN_SZ (crtc->pipe, i)); + pipe_config->pch_pfit.pos =intel_de_read (dev_priv, +SKL_PS_WIN_POS (crtc->pipe, i)); + pipe_config->pch_pfit.size =intel_de_read (dev_priv, +SKL_PS_WIN_SZ (crtc->pipe, i)); scaler_state->scalers[i].in_use = true;break ; }
@@ -10365,7 +10409,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc, fb->dev = dev; - val =I915_READ (PLANE_CTL (pipe, plane_id)); + val =intel_de_read (dev_priv,PLANE_CTL (pipe, plane_id));if (INTEL_GEN (dev_priv) >=11 ) pixel_format = val &ICL_PLANE_CTL_FORMAT_MASK ;
@@ -10373,7 +10417,8 @@ skl_get_initial_plane_config(struct intel_crtc *crtc, pixel_format = val &PLANE_CTL_FORMAT_MASK ;if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) { - alpha =I915_READ (PLANE_COLOR_CTL (pipe, plane_id)); + alpha =intel_de_read (dev_priv, +PLANE_COLOR_CTL (pipe, plane_id)); alpha &=PLANE_COLOR_ALPHA_MASK ; }else { alpha = val &PLANE_CTL_ALPHA_MASK ;
@@ -10437,16 +10482,16 @@ skl_get_initial_plane_config(struct intel_crtc *crtc, val & PLANE_CTL_FLIP_HORIZONTAL) plane_config->rotation |=DRM_MODE_REFLECT_X ; - base =I915_READ (PLANE_SURF (pipe, plane_id)) &0xfffff000 ; + base =intel_de_read (dev_priv,PLANE_SURF (pipe, plane_id)) &0xfffff000 ; plane_config->base = base; - offset =I915_READ (PLANE_OFFSET (pipe, plane_id)); + offset =intel_de_read (dev_priv,PLANE_OFFSET (pipe, plane_id)); - val =I915_READ (PLANE_SIZE (pipe, plane_id)); + val =intel_de_read (dev_priv,PLANE_SIZE (pipe, plane_id)); fb->height = ((val >>16 ) &0xffff ) +1 ; fb->width = ((val >>0 ) &0xffff ) +1 ; - val =I915_READ (PLANE_STRIDE (pipe, plane_id)); + val =intel_de_read (dev_priv,PLANE_STRIDE (pipe, plane_id)); stride_mult =skl_plane_stride_mult (fb,0 ,DRM_MODE_ROTATE_0 ); fb->pitches[0 ] = (val &0x3ff ) * stride_mult;
@@ -10474,12 +10519,14 @@ static void ilk_get_pfit_config(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (dev);u32 tmp; - tmp =I915_READ (PF_CTL (crtc->pipe)); + tmp =intel_de_read (dev_priv,PF_CTL (crtc->pipe));if (tmp &PF_ENABLE ) { pipe_config->pch_pfit.enabled = true; - pipe_config->pch_pfit.pos =I915_READ (PF_WIN_POS (crtc->pipe)); - pipe_config->pch_pfit.size =I915_READ (PF_WIN_SZ (crtc->pipe)); + pipe_config->pch_pfit.pos =intel_de_read (dev_priv, +PF_WIN_POS (crtc->pipe)); + pipe_config->pch_pfit.size =intel_de_read (dev_priv, +PF_WIN_SZ (crtc->pipe));/* We currently do not free assignements of panel fitters on * ivb/hsw (since we don't use the higher upscaling modes which
@@ -10511,7 +10558,7 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc, pipe_config->master_transcoder =INVALID_TRANSCODER ; ret = false; - tmp =I915_READ (PIPECONF (crtc->pipe)); + tmp =intel_de_read (dev_priv,PIPECONF (crtc->pipe));if (!(tmp &PIPECONF_ENABLE )) goto out;
@@ -10548,18 +10595,19 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc, pipe_config->gamma_mode = (tmp &PIPECONF_GAMMA_MODE_MASK_ILK ) >>PIPECONF_GAMMA_MODE_SHIFT ; - pipe_config->csc_mode =I915_READ (PIPE_CSC_MODE (crtc->pipe)); + pipe_config->csc_mode =intel_de_read (dev_priv, +PIPE_CSC_MODE (crtc->pipe));i9xx_get_pipe_color_config (pipe_config);intel_color_get_config (pipe_config); -if (I915_READ (PCH_TRANSCONF (crtc->pipe)) &TRANS_ENABLE ) { +if (intel_de_read (dev_priv,PCH_TRANSCONF (crtc->pipe)) &TRANS_ENABLE ) {struct intel_shared_dpll *pll;enum intel_dpll_id pll_id; pipe_config->has_pch_encoder = true; - tmp =I915_READ (FDI_RX_CTL (crtc->pipe)); + tmp =intel_de_read (dev_priv,FDI_RX_CTL (crtc->pipe)); pipe_config->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>FDI_DP_PORT_WIDTH_SHIFT ) +1 ;
@@ -10572,7 +10620,7 @@ static bool ilk_get_pipe_config(struct intel_crtc *crtc,*/ pll_id = (enum intel_dpll_id ) crtc->pipe; }else { - tmp =I915_READ (PCH_DPLL_SEL ); + tmp =intel_de_read (dev_priv,PCH_DPLL_SEL );if (tmp &TRANS_DPLLB_SEL (crtc->pipe)) pll_id =DPLL_ID_PCH_PLL_B ;else
@@ -10638,7 +10686,7 @@ static void cnl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,enum intel_dpll_id id;u32 temp; - temp =I915_READ (DPCLKA_CFGCR0 ) &DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (port); + temp =intel_de_read (dev_priv,DPCLKA_CFGCR0 ) &DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (port); id = temp >>DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (port);if (WARN_ON (id <SKL_DPLL0 || id >SKL_DPLL2 ))
@@ -10656,12 +10704,12 @@ static void icl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,u32 temp;if (intel_phy_is_combo (dev_priv, phy)) { - temp =I915_READ (ICL_DPCLKA_CFGCR0 ) & + temp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 ) &ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK (phy); id = temp >>ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT (phy); port_dpll_id =ICL_PORT_DPLL_DEFAULT ; }else if (intel_phy_is_tc (dev_priv, phy)) { -u32 clk_sel =I915_READ (DDI_CLK_SEL (port)) &DDI_CLK_SEL_MASK ; +u32 clk_sel =intel_de_read (dev_priv,DDI_CLK_SEL (port)) &DDI_CLK_SEL_MASK ;if (clk_sel ==DDI_CLK_SEL_MG ) { id = icl_tc_port_to_pll_id(intel_port_to_tc(dev_priv,
@@ -10713,7 +10761,7 @@ static void skl_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port,enum intel_dpll_id id;u32 temp; - temp =I915_READ (DPLL_CTRL2 ) &DPLL_CTRL2_DDI_CLK_SEL_MASK (port); + temp =intel_de_read (dev_priv,DPLL_CTRL2 ) &DPLL_CTRL2_DDI_CLK_SEL_MASK (port); id = temp >> (port *3 +1 );if (WARN_ON (id <SKL_DPLL0 || id >SKL_DPLL3 ))
@@ -10726,7 +10774,7 @@ static void hsw_get_ddi_pll(struct drm_i915_private *dev_priv, enum port port, struct intel_crtc_state *pipe_config) {enum intel_dpll_id id; -u32 ddi_pll_sel =I915_READ (PORT_CLK_SEL (port)); +u32 ddi_pll_sel =intel_de_read (dev_priv,PORT_CLK_SEL (port));switch (ddi_pll_sel) {case PORT_CLK_SEL_WRPLL1 :
@@ -10794,7 +10842,8 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc,bool force_thru = false;enum pipe trans_pipe; - tmp =I915_READ (TRANS_DDI_FUNC_CTL (panel_transcoder)); + tmp =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (panel_transcoder));if (!(tmp &TRANS_DDI_FUNC_ENABLE ))continue ;
@@ -10851,7 +10900,7 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc, wakerefs[power_domain] = wf; *power_domain_mask |=BIT_ULL (power_domain); - tmp =I915_READ (PIPECONF (pipe_config->cpu_transcoder)); + tmp =intel_de_read (dev_priv,PIPECONF (pipe_config->cpu_transcoder));return tmp &PIPECONF_ENABLE ; }
@@ -10896,11 +10945,11 @@ static bool bxt_get_dsi_transcoder_state(struct intel_crtc *crtc,break ;/* XXX: this works for video mode only */ - tmp =I915_READ (BXT_MIPI_PORT_CTRL (port)); + tmp =intel_de_read (dev_priv,BXT_MIPI_PORT_CTRL (port));if (!(tmp &DPI_ENABLE ))continue ; - tmp =I915_READ (MIPI_CTRL (port)); + tmp =intel_de_read (dev_priv,MIPI_CTRL (port));if ((tmp &BXT_PIPE_SELECT_MASK ) !=BXT_PIPE_SELECT (crtc->pipe))continue ;
@@ -10924,7 +10973,8 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc, port = (cpu_transcoder ==TRANSCODER_DSI_A ) ?PORT_A :PORT_B ; }else { - tmp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder)); + tmp =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (cpu_transcoder));if (INTEL_GEN (dev_priv) >=12 ) port =TGL_TRANS_DDI_FUNC_CTL_VAL_TO_PORT (tmp);else
@@ -10954,10 +11004,10 @@ static void hsw_get_ddi_port_state(struct intel_crtc *crtc,* the PCH transcoder is on. */ if (INTEL_GEN (dev_priv) <9 && - (port ==PORT_E ) &&I915_READ (LPT_TRANSCONF ) &TRANS_ENABLE ) { + (port ==PORT_E ) &&intel_de_read (dev_priv,LPT_TRANSCONF ) &TRANS_ENABLE ) { pipe_config->has_pch_encoder = true; - tmp =I915_READ (FDI_RX_CTL (PIPE_A )); + tmp =intel_de_read (dev_priv,FDI_RX_CTL (PIPE_A )); pipe_config->fdi_lanes = ((FDI_DP_PORT_WIDTH_MASK & tmp) >>FDI_DP_PORT_WIDTH_SHIFT ) +1 ;
@@ -10970,7 +11020,8 @@ static enum transcoder transcoder_master_readout(struct drm_i915_private *dev_pr {u32 trans_port_sync, master_select; - trans_port_sync =I915_READ (TRANS_DDI_FUNC_CTL2 (cpu_transcoder)); + trans_port_sync =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL2 (cpu_transcoder));if ((trans_port_sync &PORT_SYNC_MODE_ENABLE ) ==0 )return INVALID_TRANSCODER ;
@@ -11061,7 +11112,8 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,intel_get_pipe_src_size (crtc, pipe_config);if (IS_HASWELL (dev_priv)) { -u32 tmp =I915_READ (PIPECONF (pipe_config->cpu_transcoder)); +u32 tmp =intel_de_read (dev_priv, +PIPECONF (pipe_config->cpu_transcoder));if (tmp &PIPECONF_OUTPUT_COLORSPACE_YUV_HSW ) pipe_config->output_format =INTEL_OUTPUT_FORMAT_YCBCR444 ;
@@ -11084,12 +11136,15 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc, pipe_config->output_format ==INTEL_OUTPUT_FORMAT_YCBCR444 ; } - pipe_config->gamma_mode =I915_READ (GAMMA_MODE (crtc->pipe)); + pipe_config->gamma_mode =intel_de_read (dev_priv, +GAMMA_MODE (crtc->pipe)); - pipe_config->csc_mode =I915_READ (PIPE_CSC_MODE (crtc->pipe)); + pipe_config->csc_mode =intel_de_read (dev_priv, +PIPE_CSC_MODE (crtc->pipe));if (INTEL_GEN (dev_priv) >=9 ) { -u32 tmp =I915_READ (SKL_BOTTOM_COLOR (crtc->pipe)); +u32 tmp =intel_de_read (dev_priv, +SKL_BOTTOM_COLOR (crtc->pipe));if (tmp &SKL_BOTTOM_COLOR_GAMMA_ENABLE ) pipe_config->gamma_enable = true;
@@ -11118,7 +11173,8 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,if (hsw_crtc_supports_ips (crtc)) {if (IS_HASWELL (dev_priv)) - pipe_config->ips_enabled =I915_READ (IPS_CTL ) &IPS_ENABLE ; + pipe_config->ips_enabled =intel_de_read (dev_priv, +IPS_CTL ) &IPS_ENABLE ;else {/* * We cannot readout IPS state on broadwell, set to
@@ -11132,7 +11188,8 @@ static bool hsw_get_pipe_config(struct intel_crtc *crtc,if (pipe_config->cpu_transcoder !=TRANSCODER_EDP && !transcoder_is_dsi (pipe_config->cpu_transcoder)) { pipe_config->pixel_multiplier = -I915_READ (PIPE_MULT (pipe_config->cpu_transcoder)) +1 ; +intel_de_read (dev_priv, +PIPE_MULT (pipe_config->cpu_transcoder)) +1 ; }else { pipe_config->pixel_multiplier =1 ; }
@@ -11397,17 +11454,17 @@ static void i845_update_cursor(struct intel_plane *plane,if (plane->cursor.base != base || plane->cursor.size != size || plane->cursor.cntl != cntl) { -I915_WRITE_FW (CURCNTR (PIPE_A ),0 ); -I915_WRITE_FW (CURBASE (PIPE_A ), base); -I915_WRITE_FW (CURSIZE , size); -I915_WRITE_FW (CURPOS (PIPE_A ), pos); -I915_WRITE_FW (CURCNTR (PIPE_A ), cntl); +intel_de_write_fw (dev_priv,CURCNTR (PIPE_A ),0 ); +intel_de_write_fw (dev_priv,CURBASE (PIPE_A ), base); +intel_de_write_fw (dev_priv,CURSIZE , size); +intel_de_write_fw (dev_priv,CURPOS (PIPE_A ), pos); +intel_de_write_fw (dev_priv,CURCNTR (PIPE_A ), cntl); plane->cursor.base = base; plane->cursor.size = size; plane->cursor.cntl = cntl; }else { -I915_WRITE_FW (CURPOS (PIPE_A ), pos); +intel_de_write_fw (dev_priv,CURPOS (PIPE_A ), pos); }spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags);
@@ -11432,7 +11489,7 @@ static bool i845_cursor_get_hw_state(struct intel_plane *plane,if (!wakeref)return false; - ret =I915_READ (CURCNTR (PIPE_A )) &CURSOR_ENABLE ; + ret =intel_de_read (dev_priv,CURCNTR (PIPE_A )) &CURSOR_ENABLE ; *pipe =PIPE_A ;
@@ -11651,17 +11708,18 @@ static void i9xx_update_cursor(struct intel_plane *plane, plane->cursor.size != fbc_ctl || plane->cursor.cntl != cntl) {if (HAS_CUR_FBC (dev_priv)) -I915_WRITE_FW (CUR_FBC_CTL (pipe), fbc_ctl); -I915_WRITE_FW (CURCNTR (pipe), cntl); -I915_WRITE_FW (CURPOS (pipe), pos); -I915_WRITE_FW (CURBASE (pipe), base); +intel_de_write_fw (dev_priv,CUR_FBC_CTL (pipe), + fbc_ctl); +intel_de_write_fw (dev_priv,CURCNTR (pipe), cntl); +intel_de_write_fw (dev_priv,CURPOS (pipe), pos); +intel_de_write_fw (dev_priv,CURBASE (pipe), base); plane->cursor.base = base; plane->cursor.size = fbc_ctl; plane->cursor.cntl = cntl; } else { -I915_WRITE_FW (CURPOS (pipe ),pos ); -I915_WRITE_FW (CURBASE (pipe), base); +intel_de_write_fw (dev_priv,CURPOS (pipe), pos); +intel_de_write_fw (dev_priv,CURBASE (pipe), base); }spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags);
@@ -11692,7 +11750,7 @@ static bool i9xx_cursor_get_hw_state(struct intel_plane *plane,if (!wakeref)return false; - val =I915_READ (CURCNTR (plane->pipe)); + val =intel_de_read (dev_priv,CURCNTR (plane->pipe)); ret = val &MCURSOR_MODE ;
@@ -12016,7 +12074,8 @@ static void i9xx_crtc_clock_get(struct intel_crtc *crtc,else port_clock =i9xx_calc_dpll_params (refclk, &clock); }else { -u32 lvds =IS_I830 (dev_priv) ?0 :I915_READ (LVDS ); +u32 lvds =IS_I830 (dev_priv) ?0 :intel_de_read (dev_priv, +LVDS );bool is_lvds = (pipe ==1 ) && (lvds &LVDS_PORT_EN );if (is_lvds) {
@@ -16689,10 +16748,10 @@ static bool ilk_has_edp_a(struct drm_i915_private *dev_priv)if (!IS_MOBILE (dev_priv))return false; -if ((I915_READ (DP_A ) &DP_DETECTED ) ==0 ) +if ((intel_de_read (dev_priv,DP_A ) &DP_DETECTED ) ==0 )return false; -if (IS_GEN (dev_priv,5 ) && (I915_READ (FUSE_STRAP ) & ILK_eDP_A_DISABLE)) +if (IS_GEN (dev_priv,5 ) && (intel_de_read (dev_priv,FUSE_STRAP ) & ILK_eDP_A_DISABLE))return false;return true;
@@ -16707,11 +16766,11 @@ static bool intel_ddi_crt_present(struct drm_i915_private *dev_priv)return false;if (HAS_PCH_LPT_H (dev_priv) && -I915_READ (SFUSE_STRAP ) &SFUSE_STRAP_CRT_DISABLED ) +intel_de_read (dev_priv,SFUSE_STRAP ) &SFUSE_STRAP_CRT_DISABLED )return false;/* DDI E can't be used if DDI A requires 4 lanes */ -if (I915_READ (DDI_BUF_CTL (PORT_A )) &DDI_A_4_LANES ) +if (intel_de_read (dev_priv,DDI_BUF_CTL (PORT_A )) &DDI_A_4_LANES )return false;if (!dev_priv->vbt.int_crt_support)
@@ -16737,10 +16796,10 @@ void intel_pps_unlock_regs_wa(struct drm_i915_private *dev_priv) pps_num =1 ;for (pps_idx =0 ; pps_idx < pps_num; pps_idx++) { -u32 val =I915_READ (PP_CONTROL (pps_idx)); +u32 val =intel_de_read (dev_priv,PP_CONTROL (pps_idx)); val = (val & ~PANEL_UNLOCK_MASK ) |PANEL_UNLOCK_REGS ; -I915_WRITE (PP_CONTROL (pps_idx), val); +intel_de_write (dev_priv,PP_CONTROL (pps_idx), val); } }
@@ -16820,14 +16879,14 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)* On SKL pre-D0 the strap isn't connected, so we assume * it's there. */ - found =I915_READ (DDI_BUF_CTL (PORT_A )) &DDI_INIT_DISPLAY_DETECTED ; + found =intel_de_read (dev_priv,DDI_BUF_CTL (PORT_A )) &DDI_INIT_DISPLAY_DETECTED ;/* WaIgnoreDDIAStrap: skl */ if (found ||IS_GEN9_BC (dev_priv))intel_ddi_init (dev_priv,PORT_A );/* DDI B, C, D, and F detection is indicated by the SFUSE_STRAP * register */ - found =I915_READ (SFUSE_STRAP ); + found =intel_de_read (dev_priv,SFUSE_STRAP );if (found &SFUSE_STRAP_DDIB_DETECTED )intel_ddi_init (dev_priv,PORT_B );
@@ -16860,25 +16919,25 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)if (ilk_has_edp_a (dev_priv))intel_dp_init (dev_priv,DP_A ,PORT_A ); -if (I915_READ (PCH_HDMIB ) &SDVO_DETECTED ) { +if (intel_de_read (dev_priv,PCH_HDMIB ) &SDVO_DETECTED ) {/* PCH SDVOB multiplex with HDMIB */ found =intel_sdvo_init (dev_priv,PCH_SDVOB ,PORT_B );if (!found)intel_hdmi_init (dev_priv,PCH_HDMIB ,PORT_B ); -if (!found && (I915_READ (PCH_DP_B ) &DP_DETECTED )) +if (!found && (intel_de_read (dev_priv,PCH_DP_B ) &DP_DETECTED ))intel_dp_init (dev_priv,PCH_DP_B ,PORT_B ); } -if (I915_READ (PCH_HDMIC ) &SDVO_DETECTED ) +if (intel_de_read (dev_priv,PCH_HDMIC ) &SDVO_DETECTED )intel_hdmi_init (dev_priv,PCH_HDMIC ,PORT_C ); -if (!dpd_is_edp &&I915_READ (PCH_HDMID ) &SDVO_DETECTED ) +if (!dpd_is_edp &&intel_de_read (dev_priv,PCH_HDMID ) &SDVO_DETECTED )intel_hdmi_init (dev_priv,PCH_HDMID ,PORT_D ); -if (I915_READ (PCH_DP_C ) &DP_DETECTED ) +if (intel_de_read (dev_priv,PCH_DP_C ) &DP_DETECTED )intel_dp_init (dev_priv,PCH_DP_C ,PORT_C ); -if (I915_READ (PCH_DP_D ) &DP_DETECTED ) +if (intel_de_read (dev_priv,PCH_DP_D ) &DP_DETECTED )intel_dp_init (dev_priv,PCH_DP_D ,PORT_D ); }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {bool has_edp, has_port;
@@ -16903,16 +16962,16 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)*/ has_edp =intel_dp_is_port_edp (dev_priv,PORT_B ); has_port =intel_bios_is_port_present (dev_priv,PORT_B ); -if (I915_READ (VLV_DP_B ) &DP_DETECTED || has_port) +if (intel_de_read (dev_priv,VLV_DP_B ) &DP_DETECTED || has_port) has_edp &=intel_dp_init (dev_priv,VLV_DP_B ,PORT_B ); -if ((I915_READ (VLV_HDMIB ) &SDVO_DETECTED || has_port) && !has_edp) +if ((intel_de_read (dev_priv,VLV_HDMIB ) &SDVO_DETECTED || has_port) && !has_edp)intel_hdmi_init (dev_priv,VLV_HDMIB ,PORT_B ); has_edp =intel_dp_is_port_edp (dev_priv,PORT_C ); has_port =intel_bios_is_port_present (dev_priv,PORT_C ); -if (I915_READ (VLV_DP_C ) &DP_DETECTED || has_port) +if (intel_de_read (dev_priv,VLV_DP_C ) &DP_DETECTED || has_port) has_edp &=intel_dp_init (dev_priv,VLV_DP_C ,PORT_C ); -if ((I915_READ (VLV_HDMIC ) &SDVO_DETECTED || has_port) && !has_edp) +if ((intel_de_read (dev_priv,VLV_HDMIC ) &SDVO_DETECTED || has_port) && !has_edp)intel_hdmi_init (dev_priv,VLV_HDMIC ,PORT_C );if (IS_CHERRYVIEW (dev_priv)) {
@@ -16921,9 +16980,9 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)* so no need to worry about it */ has_port =intel_bios_is_port_present (dev_priv,PORT_D ); -if (I915_READ (CHV_DP_D ) &DP_DETECTED || has_port) +if (intel_de_read (dev_priv,CHV_DP_D ) &DP_DETECTED || has_port)intel_dp_init (dev_priv,CHV_DP_D ,PORT_D ); -if (I915_READ (CHV_HDMID ) &SDVO_DETECTED || has_port) +if (intel_de_read (dev_priv,CHV_HDMID ) &SDVO_DETECTED || has_port)intel_hdmi_init (dev_priv,CHV_HDMID ,PORT_D ); }
@@ -16939,7 +16998,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)intel_crt_init (dev_priv); -if (I915_READ (GEN3_SDVOB ) &SDVO_DETECTED ) { +if (intel_de_read (dev_priv,GEN3_SDVOB ) &SDVO_DETECTED ) {drm_dbg_kms (&dev_priv->drm,"probing SDVOB\n" ); found =intel_sdvo_init (dev_priv,GEN3_SDVOB ,PORT_B );if (!found &&IS_G4X (dev_priv)) {
@@ -16954,12 +17013,12 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)/* Before G4X SDVOC doesn't have its own detect register */ -if (I915_READ (GEN3_SDVOB ) &SDVO_DETECTED ) { +if (intel_de_read (dev_priv,GEN3_SDVOB ) &SDVO_DETECTED ) {drm_dbg_kms (&dev_priv->drm,"probing SDVOC\n" ); found =intel_sdvo_init (dev_priv,GEN3_SDVOC ,PORT_C ); } -if (!found && (I915_READ (GEN3_SDVOC ) &SDVO_DETECTED )) { +if (!found && (intel_de_read (dev_priv,GEN3_SDVOC ) &SDVO_DETECTED )) {if (IS_G4X (dev_priv)) { drm_dbg_kms(&dev_priv->drm,
@@ -16970,7 +17029,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)intel_dp_init (dev_priv,DP_C ,PORT_C ); } -if (IS_G4X (dev_priv) && (I915_READ (DP_D ) &DP_DETECTED )) +if (IS_G4X (dev_priv) && (intel_de_read (dev_priv,DP_D ) &DP_DETECTED ))intel_dp_init (dev_priv,DP_D ,PORT_D );if (SUPPORTS_TV (dev_priv))
@@ -17568,7 +17627,7 @@ static void intel_update_fdi_pll_freq(struct drm_i915_private *dev_priv) {if (IS_GEN (dev_priv,5 )) {u32 fdi_pll_clk = -I915_READ (FDI_PLL_BIOS_0 ) &FDI_PLL_FB_CLOCK_MASK ; +intel_de_read (dev_priv,FDI_PLL_BIOS_0 ) &FDI_PLL_FB_CLOCK_MASK ; dev_priv->fdi_pll_freq = (fdi_pll_clk +2 ) *10000 ; }else if (IS_GEN (dev_priv,6 ) ||IS_IVYBRIDGE (dev_priv)) {
@@ -17818,27 +17877,27 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)PLL_REF_INPUT_DREFCLK |DPLL_VCO_ENABLE ; -I915_WRITE (FP0 (pipe), fp); -I915_WRITE (FP1 (pipe), fp); +intel_de_write (dev_priv,FP0 (pipe), fp); +intel_de_write (dev_priv,FP1 (pipe), fp); -I915_WRITE (HTOTAL (pipe), (640 -1 ) | ((800 -1 ) <<16 )); -I915_WRITE (HBLANK (pipe), (640 -1 ) | ((800 -1 ) <<16 )); -I915_WRITE (HSYNC (pipe), (656 -1 ) | ((752 -1 ) <<16 )); -I915_WRITE (VTOTAL (pipe), (480 -1 ) | ((525 -1 ) <<16 )); -I915_WRITE (VBLANK (pipe), (480 -1 ) | ((525 -1 ) <<16 )); -I915_WRITE (VSYNC (pipe), (490 -1 ) | ((492 -1 ) <<16 )); -I915_WRITE (PIPESRC (pipe), ((640 -1 ) <<16 ) | (480 -1 )); +intel_de_write (dev_priv,HTOTAL (pipe), (640 -1 ) | ((800 -1 ) <<16 )); +intel_de_write (dev_priv,HBLANK (pipe), (640 -1 ) | ((800 -1 ) <<16 )); +intel_de_write (dev_priv,HSYNC (pipe), (656 -1 ) | ((752 -1 ) <<16 )); +intel_de_write (dev_priv,VTOTAL (pipe), (480 -1 ) | ((525 -1 ) <<16 )); +intel_de_write (dev_priv,VBLANK (pipe), (480 -1 ) | ((525 -1 ) <<16 )); +intel_de_write (dev_priv,VSYNC (pipe), (490 -1 ) | ((492 -1 ) <<16 )); +intel_de_write (dev_priv,PIPESRC (pipe), ((640 -1 ) <<16 ) | (480 -1 ));/* * Apparently we need to have VGA mode enabled prior to changing * the P1/P2 dividers. Otherwise the DPLL will keep using the old * dividers, even though the register value does change. */ -I915_WRITE (DPLL (pipe), dpll & ~DPLL_VGA_MODE_DIS ); -I915_WRITE (DPLL (pipe), dpll); +intel_de_write (dev_priv,DPLL (pipe), dpll & ~DPLL_VGA_MODE_DIS ); +intel_de_write (dev_priv,DPLL (pipe), dpll);/* Wait for the clocks to stabilize. */ -POSTING_READ (DPLL (pipe)); +intel_de_posting_read (dev_priv,DPLL (pipe));udelay (150 );/* The pixel multiplier can only be updated once the
@@ -17846,17 +17905,18 @@ void i830_enable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)* * So write it again. */ -I915_WRITE (DPLL (pipe), dpll); +intel_de_write (dev_priv,DPLL (pipe), dpll);/* We do this three times for luck */ for (i =0 ; i <3 ; i++) { -I915_WRITE (DPLL (pipe), dpll); -POSTING_READ (DPLL (pipe)); +intel_de_write (dev_priv,DPLL (pipe), dpll); +intel_de_posting_read (dev_priv,DPLL (pipe));udelay (150 );/* wait for warmup */ } -I915_WRITE (PIPECONF (pipe),PIPECONF_ENABLE |PIPECONF_PROGRESSIVE ); -POSTING_READ (PIPECONF (pipe)); +intel_de_write (dev_priv,PIPECONF (pipe), +PIPECONF_ENABLE |PIPECONF_PROGRESSIVE ); +intel_de_posting_read (dev_priv,PIPECONF (pipe));intel_wait_for_pipe_scanline_moving (crtc); }
@@ -17868,19 +17928,19 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)drm_dbg_kms (&dev_priv->drm,"disabling pipe %c due to force quirk\n" ,pipe_name (pipe)); -WARN_ON (I915_READ (DSPCNTR (PLANE_A )) &DISPLAY_PLANE_ENABLE ); -WARN_ON (I915_READ (DSPCNTR (PLANE_B )) &DISPLAY_PLANE_ENABLE ); -WARN_ON (I915_READ (DSPCNTR (PLANE_C )) &DISPLAY_PLANE_ENABLE ); -WARN_ON (I915_READ (CURCNTR (PIPE_A )) &MCURSOR_MODE ); -WARN_ON (I915_READ (CURCNTR (PIPE_B )) &MCURSOR_MODE ); +WARN_ON (intel_de_read (dev_priv,DSPCNTR (PLANE_A )) &DISPLAY_PLANE_ENABLE ); +WARN_ON (intel_de_read (dev_priv,DSPCNTR (PLANE_B )) &DISPLAY_PLANE_ENABLE ); +WARN_ON (intel_de_read (dev_priv,DSPCNTR (PLANE_C )) &DISPLAY_PLANE_ENABLE ); +WARN_ON (intel_de_read (dev_priv,CURCNTR (PIPE_A )) &MCURSOR_MODE ); +WARN_ON (intel_de_read (dev_priv,CURCNTR (PIPE_B )) &MCURSOR_MODE ); -I915_WRITE (PIPECONF (pipe),0 ); -POSTING_READ (PIPECONF (pipe)); +intel_de_write (dev_priv,PIPECONF (pipe),0 ); +intel_de_posting_read (dev_priv,PIPECONF (pipe));intel_wait_for_pipe_scanline_stopped (crtc); -I915_WRITE (DPLL (pipe),DPLL_VGA_MODE_DIS ); -POSTING_READ (DPLL (pipe)); +intel_de_write (dev_priv,DPLL (pipe),DPLL_VGA_MODE_DIS ); +intel_de_posting_read (dev_priv,DPLL (pipe)); } static void
@@ -17955,18 +18015,18 @@ static void intel_sanitize_frame_start_delay(const struct intel_crtc_state *crtcif (transcoder_is_dsi (cpu_transcoder))return ; - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg); val &= ~HSW_FRAME_START_DELAY_MASK ; val |=HSW_FRAME_START_DELAY (0 ); -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val); }else {i915_reg_t reg =PIPECONF (cpu_transcoder);u32 val; - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg); val &= ~PIPECONF_FRAME_START_DELAY_MASK ; val |=PIPECONF_FRAME_START_DELAY (0 ); -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val); }if (!crtc_state->has_pch_encoder)
@@ -17976,19 +18036,19 @@ static void intel_sanitize_frame_start_delay(const struct intel_crtc_state *crtci915_reg_t reg =PCH_TRANSCONF (crtc->pipe);u32 val; - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg); val &= ~TRANS_FRAME_START_DELAY_MASK ; val |=TRANS_FRAME_START_DELAY (0 ); -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val); }else {enum pipe pch_transcoder =intel_crtc_pch_transcoder (crtc);i915_reg_t reg =TRANS_CHICKEN2 (pch_transcoder);u32 val; - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg); val &= ~TRANS_CHICKEN2_FRAME_START_DELAY_MASK ; val |=TRANS_CHICKEN2_FRAME_START_DELAY (0 ); -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val); } }
@@ -18020,9 +18080,8 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,* gamma and CSC to match how we program our planes. */ if (INTEL_GEN (dev_priv) >=9 ) -I915_WRITE (SKL_BOTTOM_COLOR (crtc->pipe), -SKL_BOTTOM_COLOR_GAMMA_ENABLE | -SKL_BOTTOM_COLOR_CSC_ENABLE ); +intel_de_write (dev_priv,SKL_BOTTOM_COLOR (crtc->pipe), +SKL_BOTTOM_COLOR_GAMMA_ENABLE |SKL_BOTTOM_COLOR_CSC_ENABLE ); }/* Adjust the state of the output pipe according to whether we
@@ -18418,23 +18477,23 @@ static void intel_early_display_was(struct drm_i915_private *dev_priv)* Also known as Wa_14010480278. */ if (IS_GEN_RANGE (dev_priv,10 ,12 ) ||IS_GEMINILAKE (dev_priv)) -I915_WRITE (GEN9_CLKGATE_DIS_0 ,I915_READ (GEN9_CLKGATE_DIS_0 ) | -DARBF_GATING_DIS ); +intel_de_write (dev_priv,GEN9_CLKGATE_DIS_0 , +intel_de_read (dev_priv,GEN9_CLKGATE_DIS_0 ) |DARBF_GATING_DIS );if (IS_HASWELL (dev_priv)) {/* * WaRsPkgCStateDisplayPMReq:hsw * System hang if this isn't done before disabling all planes! */ -I915_WRITE (CHICKEN_PAR1_1 , -I915_READ (CHICKEN_PAR1_1 ) |FORCE_ARB_IDLE_PLANES ); +intel_de_write (dev_priv,CHICKEN_PAR1_1 , +intel_de_read (dev_priv,CHICKEN_PAR1_1 ) |FORCE_ARB_IDLE_PLANES ); } }static void ibx_sanitize_pch_hdmi_port (struct drm_i915_private *dev_priv,enum port port,i915_reg_t hdmi_reg) { -u32 val =I915_READ (hdmi_reg); +u32 val =intel_de_read (dev_priv, hdmi_reg);if (val &SDVO_ENABLE || (val &SDVO_PIPE_SEL_MASK ) ==SDVO_PIPE_SEL (PIPE_A ))
@@ -18447,13 +18506,13 @@ static void ibx_sanitize_pch_hdmi_port(struct drm_i915_private *dev_priv, val &= ~SDVO_PIPE_SEL_MASK ; val |=SDVO_PIPE_SEL (PIPE_A ); -I915_WRITE (hdmi_reg, val); +intel_de_write (dev_priv, hdmi_reg, val); }static void ibx_sanitize_pch_dp_port (struct drm_i915_private *dev_priv,enum port port,i915_reg_t dp_reg) { -u32 val =I915_READ (dp_reg); +u32 val =intel_de_read (dev_priv, dp_reg);if (val &DP_PORT_EN || (val &DP_PIPE_SEL_MASK ) ==DP_PIPE_SEL (PIPE_A ))
@@ -18466,7 +18525,7 @@ static void ibx_sanitize_pch_dp_port(struct drm_i915_private *dev_priv, val &= ~DP_PIPE_SEL_MASK ; val |=DP_PIPE_SEL (PIPE_A ); -I915_WRITE (dp_reg, val); +intel_de_write (dev_priv, dp_reg, val); }static void ibx_sanitize_pch_ports (struct drm_i915_private *dev_priv)
@@ -18770,7 +18829,8 @@ intel_display_capture_error_state(struct drm_i915_private *dev_priv)return NULL ;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) - error->power_well_driver =I915_READ (HSW_PWR_WELL_CTL2 ); + error->power_well_driver =intel_de_read (dev_priv, +HSW_PWR_WELL_CTL2 );for_each_pipe (dev_priv, i) { error->pipe[i].power_domain_on =
@@ -18779,27 +18839,33 @@ intel_display_capture_error_state(struct drm_i915_private *dev_priv)if (!error->pipe[i].power_domain_on)continue ; - error->cursor[i].control =I915_READ (CURCNTR (i)); - error->cursor[i].position =I915_READ (CURPOS (i)); - error->cursor[i].base =I915_READ (CURBASE (i)); + error->cursor[i].control =intel_de_read (dev_priv,CURCNTR (i)); + error->cursor[i].position =intel_de_read (dev_priv,CURPOS (i)); + error->cursor[i].base =intel_de_read (dev_priv,CURBASE (i)); - error->plane[i].control =I915_READ (DSPCNTR (i)); - error->plane[i].stride =I915_READ (DSPSTRIDE (i)); + error->plane[i].control =intel_de_read (dev_priv,DSPCNTR (i)); + error->plane[i].stride =intel_de_read (dev_priv,DSPSTRIDE (i));if (INTEL_GEN (dev_priv) <=3 ) { - error->plane[i].size =I915_READ (DSPSIZE (i)); - error->plane[i].pos =I915_READ (DSPPOS (i)); + error->plane[i].size =intel_de_read (dev_priv, +DSPSIZE (i)); + error->plane[i].pos =intel_de_read (dev_priv, +DSPPOS (i)); }if (INTEL_GEN (dev_priv) <=7 && !IS_HASWELL (dev_priv)) - error->plane[i].addr =I915_READ (DSPADDR (i)); + error->plane[i].addr =intel_de_read (dev_priv, +DSPADDR (i));if (INTEL_GEN (dev_priv) >=4 ) { - error->plane[i].surface =I915_READ (DSPSURF (i)); - error->plane[i].tile_offset =I915_READ (DSPTILEOFF (i)); + error->plane[i].surface =intel_de_read (dev_priv, +DSPSURF (i)); + error->plane[i].tile_offset =intel_de_read (dev_priv, +DSPTILEOFF (i)); } - error->pipe[i].source =I915_READ (PIPESRC (i)); + error->pipe[i].source =intel_de_read (dev_priv,PIPESRC (i));if (HAS_GMCH (dev_priv)) - error->pipe[i].stat =I915_READ (PIPESTAT (i)); + error->pipe[i].stat =intel_de_read (dev_priv, +PIPESTAT (i)); }for (i =0 ; i <ARRAY_SIZE (error->transcoder); i++) {
@@ -18817,13 +18883,20 @@ intel_display_capture_error_state(struct drm_i915_private *dev_priv) error->transcoder[i].cpu_transcoder = cpu_transcoder; - error->transcoder[i].conf =I915_READ (PIPECONF (cpu_transcoder)); - error->transcoder[i].htotal =I915_READ (HTOTAL (cpu_transcoder)); - error->transcoder[i].hblank =I915_READ (HBLANK (cpu_transcoder)); - error->transcoder[i].hsync =I915_READ (HSYNC (cpu_transcoder)); - error->transcoder[i].vtotal =I915_READ (VTOTAL (cpu_transcoder)); - error->transcoder[i].vblank =I915_READ (VBLANK (cpu_transcoder)); - error->transcoder[i].vsync =I915_READ (VSYNC (cpu_transcoder)); + error->transcoder[i].conf =intel_de_read (dev_priv, +PIPECONF (cpu_transcoder)); + error->transcoder[i].htotal =intel_de_read (dev_priv, +HTOTAL (cpu_transcoder)); + error->transcoder[i].hblank =intel_de_read (dev_priv, +HBLANK (cpu_transcoder)); + error->transcoder[i].hsync =intel_de_read (dev_priv, +HSYNC (cpu_transcoder)); + error->transcoder[i].vtotal =intel_de_read (dev_priv, +VTOTAL (cpu_transcoder)); + error->transcoder[i].vblank =intel_de_read (dev_priv, +VBLANK (cpu_transcoder)); + error->transcoder[i].vsync =intel_de_read (dev_priv, +VSYNC (cpu_transcoder)); }return error;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/8 drm/i915/dp: use intel_de_*() functions for register access
In reply to Jani NikulaThe implicit "dev_priv" local variable use has been a long-standing pain point in the register access macros I915_READ(), I915_WRITE(), POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register accessors intel_de_read(), intel_de_write(), intel_de_posting_read(), intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
--- drivers/gpu/drm/i915/display/intel_dp.c | 234 ++++++++++++------------ 1 file changed, 119 insertions(+), 115 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +119 -115
@@ -267,7 +267,7 @@ static int cnl_max_source_rate(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev);enum port port = dig_port->base.port; -u32 voltage =I915_READ (CNL_PORT_COMP_DW3 ) &VOLTAGE_INFO_MASK ; +u32 voltage =intel_de_read (dev_priv,CNL_PORT_COMP_DW3 ) &VOLTAGE_INFO_MASK ;/* Low voltage SKUs are limited to max of 5.4G */ if (voltage ==VOLTAGE_INFO_0_85V )
@@ -756,7 +756,7 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)enum dpio_channel ch =vlv_pipe_to_channel (pipe);u32 DP ; -if (WARN (I915_READ (intel_dp->output_reg) &DP_PORT_EN , +if (WARN (intel_de_read (dev_priv, intel_dp->output_reg) &DP_PORT_EN ,"skipping pipe %c power sequencer kick due to [ENCODER:%d:%s] being active\n" ,pipe_name (pipe), intel_dig_port->base.base.base.id, intel_dig_port->base.base.name))
@@ -770,7 +770,7 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)/* Preserve the BIOS-computed detected bit. This is * supposed to be read-only. */ -DP =I915_READ (intel_dp->output_reg) &DP_DETECTED ; +DP =intel_de_read (dev_priv, intel_dp->output_reg) &DP_DETECTED ;DP |=DP_VOLTAGE_0_4 |DP_PRE_EMPHASIS_0 ;DP |=DP_PORT_WIDTH (1 );DP |=DP_LINK_TRAIN_PAT_1 ;
@@ -780,7 +780,7 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)else DP |=DP_PIPE_SEL (pipe); - pll_enabled =I915_READ (DPLL (pipe)) &DPLL_VCO_ENABLE ; + pll_enabled =intel_de_read (dev_priv,DPLL (pipe)) &DPLL_VCO_ENABLE ;/* * The DPLL for the pipe must be enabled for this to work.
@@ -805,14 +805,14 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp)* to make this power sequencer lock onto the port. * Otherwise even VDD force bit won't work. */ -I915_WRITE (intel_dp->output_reg,DP ); -POSTING_READ (intel_dp->output_reg); +intel_de_write (dev_priv, intel_dp->output_reg,DP ); +intel_de_posting_read (dev_priv, intel_dp->output_reg); -I915_WRITE (intel_dp->output_reg,DP |DP_PORT_EN ); -POSTING_READ (intel_dp->output_reg); +intel_de_write (dev_priv, intel_dp->output_reg,DP |DP_PORT_EN ); +intel_de_posting_read (dev_priv, intel_dp->output_reg); -I915_WRITE (intel_dp->output_reg,DP & ~DP_PORT_EN ); -POSTING_READ (intel_dp->output_reg); +intel_de_write (dev_priv, intel_dp->output_reg,DP & ~DP_PORT_EN ); +intel_de_posting_read (dev_priv, intel_dp->output_reg);if (!pll_enabled) {vlv_force_pll_off (dev_priv, pipe);
@@ -934,13 +934,13 @@ typedef bool (*vlv_pipe_check)(struct drm_i915_private *dev_priv,static bool vlv_pipe_has_pp_on (struct drm_i915_private *dev_priv,enum pipe pipe) { -return I915_READ (PP_STATUS (pipe)) &PP_ON ; +return intel_de_read (dev_priv,PP_STATUS (pipe)) &PP_ON ; }static bool vlv_pipe_has_vdd_on (struct drm_i915_private *dev_priv,enum pipe pipe) { -return I915_READ (PP_CONTROL (pipe)) &EDP_FORCE_VDD ; +return intel_de_read (dev_priv,PP_CONTROL (pipe)) &EDP_FORCE_VDD ; } static bool vlv_pipe_any(struct drm_i915_private *dev_priv,
@@ -957,7 +957,7 @@ vlv_initial_pps_pipe(struct drm_i915_private *dev_priv,enum pipe pipe;for (pipe =PIPE_A ; pipe <=PIPE_B ; pipe++) { -u32 port_sel =I915_READ (PP_ON_DELAYS (pipe)) & +u32 port_sel =intel_de_read (dev_priv,PP_ON_DELAYS (pipe)) &PANEL_PORT_SELECT_MASK ;if (port_sel !=PANEL_PORT_SELECT_VLV (port))
@@ -1120,12 +1120,13 @@ static int edp_notify_handler(struct notifier_block *this, unsigned long code, pp_ctrl_reg =PP_CONTROL (pipe); pp_div_reg =PP_DIVISOR (pipe); - pp_div =I915_READ (pp_div_reg); + pp_div =intel_de_read (dev_priv, pp_div_reg); pp_div &=PP_REFERENCE_DIVIDER_MASK ;/* 0x1F write to PP_DIV_REG sets max cycle delay */ -I915_WRITE (pp_div_reg, pp_div |0x1F ); -I915_WRITE (pp_ctrl_reg,PANEL_UNLOCK_REGS ); +intel_de_write (dev_priv, pp_div_reg, pp_div |0x1F ); +intel_de_write (dev_priv, pp_ctrl_reg, +PANEL_UNLOCK_REGS );msleep (intel_dp->panel_power_cycle_delay); } }
@@ -1143,7 +1144,7 @@ static bool edp_have_panel_power(struct intel_dp *intel_dp) intel_dp->pps_pipe == INVALID_PIPE)return false; -return (I915_READ (_pp_stat_reg (intel_dp)) &PP_ON ) !=0 ; +return (intel_de_read (dev_priv,_pp_stat_reg (intel_dp)) &PP_ON ) !=0 ; }static bool edp_have_panel_vdd (struct intel_dp *intel_dp)
@@ -1156,7 +1157,7 @@ static bool edp_have_panel_vdd(struct intel_dp *intel_dp) intel_dp->pps_pipe == INVALID_PIPE)return false; -return I915_READ (_pp_ctrl_reg (intel_dp)) &EDP_FORCE_VDD ; +return intel_de_read (dev_priv,_pp_ctrl_reg (intel_dp)) &EDP_FORCE_VDD ; } static void
@@ -1170,8 +1171,8 @@ intel_dp_check_edp(struct intel_dp *intel_dp)if (!edp_have_panel_power (intel_dp) && !edp_have_panel_vdd (intel_dp)) {WARN (1 ,"eDP powered off while attempting aux channel communication.\n" );drm_dbg_kms (&dev_priv->drm,"Status 0x%08x Control 0x%08x\n" , -I915_READ (_pp_stat_reg (intel_dp)), -I915_READ (_pp_ctrl_reg (intel_dp))); +intel_de_read (dev_priv,_pp_stat_reg (intel_dp)), +intel_de_read (dev_priv,_pp_ctrl_reg (intel_dp))); } }
@@ -2527,7 +2528,7 @@ static void intel_dp_prepare(struct intel_encoder *encoder,/* Preserve the BIOS-computed detected bit. This is * supposed to be read-only. */ - intel_dp->DP =I915_READ (intel_dp->output_reg) &DP_DETECTED ; + intel_dp->DP =intel_de_read (dev_priv, intel_dp->output_reg) &DP_DETECTED ;/* Handle DP bits in common between all three register formats */ intel_dp->DP |=DP_VOLTAGE_0_4 |DP_PRE_EMPHASIS_0 ;
@@ -2551,12 +2552,12 @@ static void intel_dp_prepare(struct intel_encoder *encoder, intel_dp->DP |=DP_LINK_TRAIN_OFF_CPT ; - trans_dp =I915_READ (TRANS_DP_CTL (crtc->pipe)); + trans_dp =intel_de_read (dev_priv,TRANS_DP_CTL (crtc->pipe));if (drm_dp_enhanced_frame_cap (intel_dp->dpcd)) trans_dp |=TRANS_DP_ENH_FRAMING ;else trans_dp &= ~TRANS_DP_ENH_FRAMING ; -I915_WRITE (TRANS_DP_CTL (crtc->pipe), trans_dp); +intel_de_write (dev_priv,TRANS_DP_CTL (crtc->pipe), trans_dp); }else {if (IS_G4X (dev_priv) && pipe_config->limited_color_range) intel_dp->DP |=DP_COLOR_RANGE_16_235 ;
@@ -2605,15 +2606,15 @@ static void wait_panel_status(struct intel_dp *intel_dp,drm_dbg_kms (&dev_priv->drm,"mask %08x value %08x status %08x control %08x\n" , mask, value, -I915_READ (pp_stat_reg), -I915_READ (pp_ctrl_reg)); +intel_de_read (dev_priv, pp_stat_reg), +intel_de_read (dev_priv, pp_ctrl_reg));if (intel_de_wait_for_register (dev_priv, pp_stat_reg, mask, value,5000 ))drm_err (&dev_priv->drm,"Panel status timeout: status %08x control %08x\n" , -I915_READ (pp_stat_reg), -I915_READ (pp_ctrl_reg)); +intel_de_read (dev_priv, pp_stat_reg), +intel_de_read (dev_priv, pp_ctrl_reg));drm_dbg_kms (&dev_priv->drm,"Wait complete\n" ); }
@@ -2674,7 +2675,7 @@ static u32 ilk_get_pp_control(struct intel_dp *intel_dp)lockdep_assert_held (&dev_priv->pps_mutex); - control =I915_READ (_pp_ctrl_reg (intel_dp)); + control =intel_de_read (dev_priv,_pp_ctrl_reg (intel_dp));if (WARN_ON (!HAS_DDI (dev_priv) && (control &PANEL_UNLOCK_MASK ) !=PANEL_UNLOCK_REGS )) { control &= ~PANEL_UNLOCK_MASK ;
@@ -2723,10 +2724,11 @@ static bool edp_panel_vdd_on(struct intel_dp *intel_dp) pp_stat_reg =_pp_stat_reg (intel_dp); pp_ctrl_reg =_pp_ctrl_reg (intel_dp); -I915_WRITE (pp_ctrl_reg, pp); -POSTING_READ (pp_ctrl_reg); +intel_de_write (dev_priv, pp_ctrl_reg, pp); +intel_de_posting_read (dev_priv, pp_ctrl_reg);drm_dbg_kms (&dev_priv->drm,"PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n" , -I915_READ (pp_stat_reg),I915_READ (pp_ctrl_reg)); +intel_de_read (dev_priv, pp_stat_reg), +intel_de_read (dev_priv, pp_ctrl_reg));/* * If the panel wasn't on, delay before accessing aux channel */
@@ -2789,12 +2791,13 @@ static void edp_panel_vdd_off_sync(struct intel_dp *intel_dp) pp_ctrl_reg =_pp_ctrl_reg (intel_dp); pp_stat_reg =_pp_stat_reg (intel_dp); -I915_WRITE (pp_ctrl_reg, pp); -POSTING_READ (pp_ctrl_reg); +intel_de_write (dev_priv, pp_ctrl_reg, pp); +intel_de_posting_read (dev_priv, pp_ctrl_reg);/* Make sure sequencer is idle before allowing subsequent activity */ drm_dbg_kms (&dev_priv->drm,"PP_STATUS: 0x%08x PP_CONTROL: 0x%08x\n" , -I915_READ (pp_stat_reg),I915_READ (pp_ctrl_reg)); +intel_de_read (dev_priv, pp_stat_reg), +intel_de_read (dev_priv, pp_ctrl_reg));if ((pp &PANEL_POWER_ON ) ==0 ) intel_dp->panel_power_off_time =ktime_get_boottime ();
@@ -2883,24 +2886,24 @@ static void edp_panel_on(struct intel_dp *intel_dp)if (IS_GEN (dev_priv,5 )) {/* ILK workaround: disable reset around power sequence */ pp &= ~PANEL_POWER_RESET ; -I915_WRITE (pp_ctrl_reg, pp); -POSTING_READ (pp_ctrl_reg); +intel_de_write (dev_priv, pp_ctrl_reg, pp); +intel_de_posting_read (dev_priv, pp_ctrl_reg); } pp |=PANEL_POWER_ON ;if (!IS_GEN (dev_priv,5 )) pp |=PANEL_POWER_RESET ; -I915_WRITE (pp_ctrl_reg, pp); -POSTING_READ (pp_ctrl_reg); +intel_de_write (dev_priv, pp_ctrl_reg, pp); +intel_de_posting_read (dev_priv, pp_ctrl_reg);wait_panel_on (intel_dp); intel_dp->last_power_on = jiffies;if (IS_GEN (dev_priv,5 )) { pp |=PANEL_POWER_RESET ;/* restore panel reset bit */ -I915_WRITE (pp_ctrl_reg, pp); -POSTING_READ (pp_ctrl_reg); +intel_de_write (dev_priv, pp_ctrl_reg, pp); +intel_de_posting_read (dev_priv, pp_ctrl_reg); } }
@@ -2944,8 +2947,8 @@ static void edp_panel_off(struct intel_dp *intel_dp) intel_dp->want_panel_vdd = false; -I915_WRITE (pp_ctrl_reg, pp); -POSTING_READ (pp_ctrl_reg); +intel_de_write (dev_priv, pp_ctrl_reg, pp); +intel_de_posting_read (dev_priv, pp_ctrl_reg);wait_panel_off (intel_dp); intel_dp->panel_power_off_time =ktime_get_boottime ();
@@ -2986,8 +2989,8 @@ static void _intel_edp_backlight_on(struct intel_dp *intel_dp) pp =ilk_get_pp_control (intel_dp); pp |=EDP_BLC_ENABLE ; -I915_WRITE (pp_ctrl_reg, pp); -POSTING_READ (pp_ctrl_reg); +intel_de_write (dev_priv, pp_ctrl_reg, pp); +intel_de_posting_read (dev_priv, pp_ctrl_reg); } }
@@ -3022,8 +3025,8 @@ static void _intel_edp_backlight_off(struct intel_dp *intel_dp) pp =ilk_get_pp_control (intel_dp); pp &= ~EDP_BLC_ENABLE ; -I915_WRITE (pp_ctrl_reg, pp); -POSTING_READ (pp_ctrl_reg); +intel_de_write (dev_priv, pp_ctrl_reg, pp); +intel_de_posting_read (dev_priv, pp_ctrl_reg); } intel_dp->last_backlight_off = jiffies;
@@ -3074,7 +3077,7 @@ static void assert_dp_port(struct intel_dp *intel_dp, bool state) {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dig_port->base.base.dev); -bool cur_state =I915_READ (intel_dp->output_reg) &DP_PORT_EN ; +bool cur_state =intel_de_read (dev_priv, intel_dp->output_reg) &DP_PORT_EN ; I915_STATE_WARN(cur_state != state, "[ENCODER:%d:%s] state assertion failure (expected %s, current %s)\n",
@@ -3085,7 +3088,7 @@ static void assert_dp_port(struct intel_dp *intel_dp, bool state)static void assert_edp_pll (struct drm_i915_private *dev_priv,bool state) { -bool cur_state =I915_READ (DP_A ) &DP_PLL_ENABLE ; +bool cur_state =intel_de_read (dev_priv,DP_A ) &DP_PLL_ENABLE ; I915_STATE_WARN(cur_state != state, "eDP PLL state assertion failure (expected %s, current %s)\n",
@@ -3114,8 +3117,8 @@ static void ilk_edp_pll_on(struct intel_dp *intel_dp,else intel_dp->DP |=DP_PLL_FREQ_270MHZ ; -I915_WRITE (DP_A , intel_dp->DP); -POSTING_READ (DP_A ); +intel_de_write (dev_priv,DP_A , intel_dp->DP); +intel_de_posting_read (dev_priv,DP_A );udelay (500 );/*
@@ -3129,8 +3132,8 @@ static void ilk_edp_pll_on(struct intel_dp *intel_dp, intel_dp->DP |=DP_PLL_ENABLE ; -I915_WRITE (DP_A , intel_dp->DP); -POSTING_READ (DP_A ); +intel_de_write (dev_priv,DP_A , intel_dp->DP); +intel_de_posting_read (dev_priv,DP_A );udelay (200 ); }
@@ -3148,8 +3151,8 @@ static void ilk_edp_pll_off(struct intel_dp *intel_dp, intel_dp->DP &= ~DP_PLL_ENABLE ; -I915_WRITE (DP_A , intel_dp->DP); -POSTING_READ (DP_A ); +intel_de_write (dev_priv,DP_A , intel_dp->DP); +intel_de_posting_read (dev_priv,DP_A );udelay (200 ); }
@@ -3229,7 +3232,7 @@ static bool cpt_dp_port_selected(struct drm_i915_private *dev_priv,enum pipe p;for_each_pipe (dev_priv, p) { -u32 val =I915_READ (TRANS_DP_CTL (p)); +u32 val =intel_de_read (dev_priv,TRANS_DP_CTL (p));if ((val &TRANS_DP_PORT_SEL_MASK ) ==TRANS_DP_PORT_SEL (port)) { *pipe = p;
@@ -3253,7 +3256,7 @@ bool intel_dp_port_enabled(struct drm_i915_private *dev_priv,bool ret;u32 val; - val =I915_READ (dp_reg); + val =intel_de_read (dev_priv, dp_reg); ret = val &DP_PORT_EN ;
@@ -3305,12 +3308,13 @@ static void intel_dp_get_config(struct intel_encoder *encoder,else pipe_config->output_types |=BIT (INTEL_OUTPUT_DP ); - tmp =I915_READ (intel_dp->output_reg); + tmp =intel_de_read (dev_priv, intel_dp->output_reg); pipe_config->has_audio = tmp &DP_AUDIO_OUTPUT_ENABLE && port !=PORT_A ;if (HAS_PCH_CPT (dev_priv) && port !=PORT_A ) { -u32 trans_dp =I915_READ (TRANS_DP_CTL (crtc->pipe)); +u32 trans_dp =intel_de_read (dev_priv, +TRANS_DP_CTL (crtc->pipe));if (trans_dp &TRANS_DP_HSYNC_ACTIVE_HIGH ) flags |=DRM_MODE_FLAG_PHSYNC ;
@@ -3344,7 +3348,7 @@ static void intel_dp_get_config(struct intel_encoder *encoder,intel_dp_get_m_n (crtc, pipe_config);if (port ==PORT_A ) { -if ((I915_READ (DP_A ) &DP_PLL_FREQ_MASK ) ==DP_PLL_FREQ_162MHZ ) +if ((intel_de_read (dev_priv,DP_A ) &DP_PLL_FREQ_MASK ) ==DP_PLL_FREQ_162MHZ ) pipe_config->port_clock =162000 ;else pipe_config->port_clock =270000 ;
@@ -3469,7 +3473,7 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp, dp_train_pat & train_pat_mask);if (HAS_DDI (dev_priv)) { -u32 temp =I915_READ (intel_dp->regs.dp_tp_ctl); +u32 temp =intel_de_read (dev_priv, intel_dp->regs.dp_tp_ctl);if (dp_train_pat &DP_LINK_SCRAMBLING_DISABLE ) temp |=DP_TP_CTL_SCRAMBLE_DISABLE ;
@@ -3495,7 +3499,7 @@ _intel_dp_set_link_train(struct intel_dp *intel_dp, temp |=DP_TP_CTL_LINK_TRAIN_PAT4 ;break ; } -I915_WRITE (intel_dp->regs.dp_tp_ctl, temp); +intel_de_write (dev_priv, intel_dp->regs.dp_tp_ctl, temp); }else if ((IS_IVYBRIDGE (dev_priv) && port ==PORT_A ) || (HAS_PCH_CPT (dev_priv) && port !=PORT_A )) {
@@ -3559,8 +3563,8 @@ static void intel_dp_enable_port(struct intel_dp *intel_dp,if (old_crtc_state->has_audio) intel_dp->DP |=DP_AUDIO_OUTPUT_ENABLE ; -I915_WRITE (intel_dp->output_reg, intel_dp->DP); -POSTING_READ (intel_dp->output_reg); +intel_de_write (dev_priv, intel_dp->output_reg, intel_dp->DP); +intel_de_posting_read (dev_priv, intel_dp->output_reg); } static void intel_enable_dp(struct intel_encoder *encoder,
@@ -3570,7 +3574,7 @@ static void intel_enable_dp(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dp *intel_dp =enc_to_intel_dp (encoder);struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); -u32 dp_reg =I915_READ (intel_dp->output_reg); +u32 dp_reg =intel_de_read (dev_priv, intel_dp->output_reg);enum pipe pipe = crtc->pipe;intel_wakeref_t wakeref;
@@ -3665,8 +3669,8 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)"detaching pipe %c power sequencer from [ENCODER:%d:%s]\n" ,pipe_name (pipe), intel_dig_port->base.base.base.id, intel_dig_port->base.base.name); -I915_WRITE (pp_on_reg,0 ); -POSTING_READ (pp_on_reg); +intel_de_write (dev_priv, pp_on_reg,0 ); +intel_de_posting_read (dev_priv, pp_on_reg); intel_dp->pps_pipe =INVALID_PIPE ; }
@@ -4177,8 +4181,8 @@ intel_dp_set_signal_levels(struct intel_dp *intel_dp) intel_dp->DP = (intel_dp->DP & ~mask) | signal_levels; -I915_WRITE (intel_dp->output_reg, intel_dp->DP); -POSTING_READ (intel_dp->output_reg); +intel_de_write (dev_priv, intel_dp->output_reg, intel_dp->DP); +intel_de_posting_read (dev_priv, intel_dp->output_reg); }void
@@ -4191,8 +4195,8 @@ intel_dp_program_link_training_pattern(struct intel_dp *intel_dp,_intel_dp_set_link_train (intel_dp, &intel_dp->DP, dp_train_pat); -I915_WRITE (intel_dp->output_reg, intel_dp->DP); -POSTING_READ (intel_dp->output_reg); +intel_de_write (dev_priv, intel_dp->output_reg, intel_dp->DP); +intel_de_posting_read (dev_priv, intel_dp->output_reg); }void intel_dp_set_idle_link_train (struct intel_dp *intel_dp)
@@ -4205,10 +4209,10 @@ void intel_dp_set_idle_link_train(struct intel_dp *intel_dp)if (!HAS_DDI (dev_priv))return ; - val =I915_READ (intel_dp->regs.dp_tp_ctl); + val =intel_de_read (dev_priv, intel_dp->regs.dp_tp_ctl); val &= ~DP_TP_CTL_LINK_TRAIN_MASK ; val |=DP_TP_CTL_LINK_TRAIN_IDLE ; -I915_WRITE (intel_dp->regs.dp_tp_ctl, val); +intel_de_write (dev_priv, intel_dp->regs.dp_tp_ctl, val);/* * Until TGL on PORT_A we can have only eDP in SST mode. There the only
@@ -4236,7 +4240,7 @@ intel_dp_link_down(struct intel_encoder *encoder,enum port port = encoder->port;u32 DP = intel_dp->DP; -if (WARN_ON ((I915_READ (intel_dp->output_reg) &DP_PORT_EN ) ==0 )) +if (WARN_ON ((intel_de_read (dev_priv, intel_dp->output_reg) &DP_PORT_EN ) ==0 ))return ;drm_dbg_kms (&dev_priv->drm,"\n" );
@@ -4249,12 +4253,12 @@ intel_dp_link_down(struct intel_encoder *encoder,DP &= ~DP_LINK_TRAIN_MASK ;DP |=DP_LINK_TRAIN_PAT_IDLE ; } -I915_WRITE (intel_dp->output_reg,DP ); -POSTING_READ (intel_dp->output_reg); +intel_de_write (dev_priv, intel_dp->output_reg,DP ); +intel_de_posting_read (dev_priv, intel_dp->output_reg);DP &= ~(DP_PORT_EN |DP_AUDIO_OUTPUT_ENABLE ); -I915_WRITE (intel_dp->output_reg,DP ); -POSTING_READ (intel_dp->output_reg); +intel_de_write (dev_priv, intel_dp->output_reg,DP ); +intel_de_posting_read (dev_priv, intel_dp->output_reg);/* * HW workaround for IBX, we need to move the port
@@ -4273,12 +4277,12 @@ intel_dp_link_down(struct intel_encoder *encoder,DP &= ~(DP_PIPE_SEL_MASK |DP_LINK_TRAIN_MASK );DP |=DP_PORT_EN |DP_PIPE_SEL (PIPE_A ) |DP_LINK_TRAIN_PAT_1 ; -I915_WRITE (intel_dp->output_reg,DP ); -POSTING_READ (intel_dp->output_reg); +intel_de_write (dev_priv, intel_dp->output_reg,DP ); +intel_de_posting_read (dev_priv, intel_dp->output_reg);DP &= ~DP_PORT_EN ; -I915_WRITE (intel_dp->output_reg,DP ); -POSTING_READ (intel_dp->output_reg); +intel_de_write (dev_priv, intel_dp->output_reg,DP ); +intel_de_posting_read (dev_priv, intel_dp->output_reg);intel_wait_for_vblank_if_active (dev_priv,PIPE_A );intel_set_cpu_fifo_underrun_reporting (dev_priv,PIPE_A , true);
@@ -5401,7 +5405,7 @@ static bool ibx_digital_port_connected(struct intel_encoder *encoder)return false; } -return I915_READ (SDEISR ) & bit; +return intel_de_read (dev_priv,SDEISR ) & bit; }static bool cpt_digital_port_connected (struct intel_encoder *encoder)
@@ -5424,7 +5428,7 @@ static bool cpt_digital_port_connected(struct intel_encoder *encoder)return false; } -return I915_READ (SDEISR ) & bit; +return intel_de_read (dev_priv,SDEISR ) & bit; }static bool spt_digital_port_connected (struct intel_encoder *encoder)
@@ -5443,7 +5447,7 @@ static bool spt_digital_port_connected(struct intel_encoder *encoder)return cpt_digital_port_connected (encoder); } -return I915_READ (SDEISR ) & bit; +return intel_de_read (dev_priv,SDEISR ) & bit; }static bool g4x_digital_port_connected (struct intel_encoder *encoder)
@@ -5466,7 +5470,7 @@ static bool g4x_digital_port_connected(struct intel_encoder *encoder)return false; } -return I915_READ (PORT_HOTPLUG_STAT ) & bit; +return intel_de_read (dev_priv,PORT_HOTPLUG_STAT ) & bit; }static bool gm45_digital_port_connected (struct intel_encoder *encoder)
@@ -5489,7 +5493,7 @@ static bool gm45_digital_port_connected(struct intel_encoder *encoder)return false; } -return I915_READ (PORT_HOTPLUG_STAT ) & bit; +return intel_de_read (dev_priv,PORT_HOTPLUG_STAT ) & bit; }static bool ilk_digital_port_connected (struct intel_encoder *encoder)
@@ -5497,7 +5501,7 @@ static bool ilk_digital_port_connected(struct intel_encoder *encoder)struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);if (encoder->hpd_pin ==HPD_PORT_A ) -return I915_READ (DEISR ) &DE_DP_A_HOTPLUG ; +return intel_de_read (dev_priv,DEISR ) &DE_DP_A_HOTPLUG ;else return ibx_digital_port_connected (encoder); }
@@ -5507,7 +5511,7 @@ static bool snb_digital_port_connected(struct intel_encoder *encoder)struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);if (encoder->hpd_pin ==HPD_PORT_A ) -return I915_READ (DEISR ) &DE_DP_A_HOTPLUG ; +return intel_de_read (dev_priv,DEISR ) &DE_DP_A_HOTPLUG ;else return cpt_digital_port_connected (encoder); }
@@ -5517,7 +5521,7 @@ static bool ivb_digital_port_connected(struct intel_encoder *encoder)struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);if (encoder->hpd_pin ==HPD_PORT_A ) -return I915_READ (DEISR ) &DE_DP_A_HOTPLUG_IVB ; +return intel_de_read (dev_priv,DEISR ) &DE_DP_A_HOTPLUG_IVB ;else return cpt_digital_port_connected (encoder); }
@@ -5527,7 +5531,7 @@ static bool bdw_digital_port_connected(struct intel_encoder *encoder)struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);if (encoder->hpd_pin ==HPD_PORT_A ) -return I915_READ (GEN8_DE_PORT_ISR ) &GEN8_PORT_DP_A_HOTPLUG ; +return intel_de_read (dev_priv,GEN8_DE_PORT_ISR ) &GEN8_PORT_DP_A_HOTPLUG ;else return cpt_digital_port_connected (encoder); }
@@ -5552,16 +5556,16 @@ static bool bxt_digital_port_connected(struct intel_encoder *encoder)return false; } -return I915_READ (GEN8_DE_PORT_ISR ) & bit; +return intel_de_read (dev_priv,GEN8_DE_PORT_ISR ) & bit; }static bool intel_combo_phy_connected (struct drm_i915_private *dev_priv,enum phy phy) {if (HAS_PCH_MCC (dev_priv) && phy ==PHY_C ) -return I915_READ (SDEISR ) &SDE_TC_HOTPLUG_ICP (PORT_TC1 ); +return intel_de_read (dev_priv,SDEISR ) &SDE_TC_HOTPLUG_ICP (PORT_TC1 ); -return I915_READ (SDEISR ) &SDE_DDI_HOTPLUG_ICP (phy); +return intel_de_read (dev_priv,SDEISR ) &SDE_DDI_HOTPLUG_ICP (phy); }static bool icp_digital_port_connected (struct intel_encoder *encoder)
@@ -6552,7 +6556,7 @@ void intel_dp_encoder_reset(struct drm_encoder *encoder)intel_wakeref_t wakeref;if (!HAS_DDI (dev_priv)) - intel_dp->DP =I915_READ (intel_dp->output_reg); + intel_dp->DP =intel_de_read (dev_priv, intel_dp->output_reg);if (lspcon->active)lspcon_resume (lspcon);
@@ -6730,10 +6734,10 @@ intel_pps_readout_hw_state(struct intel_dp *intel_dp, struct edp_power_seq *seq)/* Ensure PPS is unlocked */ if (!HAS_DDI (dev_priv)) -I915_WRITE (regs.pp_ctrl, pp_ctl); +intel_de_write (dev_priv, regs.pp_ctrl, pp_ctl); - pp_on =I915_READ (regs.pp_on); - pp_off =I915_READ (regs.pp_off); + pp_on =intel_de_read (dev_priv, regs.pp_on); + pp_off =intel_de_read (dev_priv, regs.pp_off);/* Pull timing values out of registers */ seq->t1_t3 =REG_FIELD_GET (PANEL_POWER_UP_DELAY_MASK , pp_on);
@@ -6744,7 +6748,7 @@ intel_pps_readout_hw_state(struct intel_dp *intel_dp, struct edp_power_seq *seq)if (i915_mmio_reg_valid (regs.pp_div)) {u32 pp_div; - pp_div =I915_READ (regs.pp_div); + pp_div =intel_de_read (dev_priv, regs.pp_div); seq->t11_t12 =REG_FIELD_GET (PANEL_POWER_CYCLE_DELAY_MASK , pp_div) *1000 ; }else {
@@ -6910,7 +6914,7 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp, pp &= ~EDP_FORCE_VDD ; -I915_WRITE (regs.pp_ctrl, pp); +intel_de_write (dev_priv, regs.pp_ctrl, pp); } pp_on = REG_FIELD_PREP(PANEL_POWER_UP_DELAY_MASK, seq->t1_t3) |
@@ -6941,32 +6945,31 @@ intel_dp_init_panel_power_sequencer_registers(struct intel_dp *intel_dp, pp_on |= port_sel; -I915_WRITE (regs.pp_on, pp_on); -I915_WRITE (regs.pp_off, pp_off); +intel_de_write (dev_priv, regs.pp_on, pp_on); +intel_de_write (dev_priv, regs.pp_off, pp_off);/* * Compute the divisor for the pp clock, simply match the Bspec formula. */ if (i915_mmio_reg_valid (regs.pp_div)) { -I915_WRITE (regs.pp_div, -REG_FIELD_PREP (PP_REFERENCE_DIVIDER_MASK , (100 * div) /2 -1 ) | -REG_FIELD_PREP (PANEL_POWER_CYCLE_DELAY_MASK ,DIV_ROUND_UP (seq->t11_t12,1000 ))); +intel_de_write (dev_priv, regs.pp_div, +REG_FIELD_PREP (PP_REFERENCE_DIVIDER_MASK , (100 * div) /2 -1 ) |REG_FIELD_PREP (PANEL_POWER_CYCLE_DELAY_MASK ,DIV_ROUND_UP (seq->t11_t12,1000 ))); }else {u32 pp_ctl; - pp_ctl =I915_READ (regs.pp_ctrl); + pp_ctl =intel_de_read (dev_priv, regs.pp_ctrl); pp_ctl &= ~BXT_POWER_CYCLE_DELAY_MASK ; pp_ctl |=REG_FIELD_PREP (BXT_POWER_CYCLE_DELAY_MASK ,DIV_ROUND_UP (seq->t11_t12,1000 )); -I915_WRITE (regs.pp_ctrl, pp_ctl); +intel_de_write (dev_priv, regs.pp_ctrl, pp_ctl); }drm_dbg_kms (&dev_priv->drm,"panel power sequencer register settings: PP_ON %#x, PP_OFF %#x, PP_DIV %#x\n" , -I915_READ (regs.pp_on), -I915_READ (regs.pp_off), +intel_de_read (dev_priv, regs.pp_on), +intel_de_read (dev_priv, regs.pp_off),i915_mmio_reg_valid (regs.pp_div) ? -I915_READ (regs.pp_div) : - (I915_READ (regs.pp_ctrl) &BXT_POWER_CYCLE_DELAY_MASK )); +intel_de_read (dev_priv, regs.pp_div) : + (intel_de_read (dev_priv, regs.pp_ctrl) &BXT_POWER_CYCLE_DELAY_MASK )); }static void intel_dp_pps_init (struct intel_dp *intel_dp)
@@ -7057,7 +7060,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,i915_reg_t reg =PIPECONF (crtc_state->cpu_transcoder);u32 val; - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg);if (index >DRRS_HIGH_RR ) {if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) val |=PIPECONF_EDP_RR_MODE_SWITCH_VLV ;
@@ -7069,7 +7072,7 @@ static void intel_dp_set_drrs_state(struct drm_i915_private *dev_priv,else val &= ~PIPECONF_EDP_RR_MODE_SWITCH ; } -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val); } dev_priv->drrs.refresh_rate_type = index;
@@ -7526,7 +7529,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, intel_dp->active_pipe =INVALID_PIPE ;/* Preserve the current hw state. */ - intel_dp->DP =I915_READ (intel_dp->output_reg); + intel_dp->DP =intel_de_read (dev_priv, intel_dp->output_reg); intel_dp->attached_connector = intel_connector;if (intel_dp_is_port_edp (dev_priv, port)) {
@@ -7607,8 +7610,9 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,* generated on the port when a cable is not attached. */ if (IS_G45 (dev_priv)) { -u32 temp =I915_READ (PEG_BAND_GAP_DATA ); -I915_WRITE (PEG_BAND_GAP_DATA , (temp & ~0xf ) |0xd ); +u32 temp =intel_de_read (dev_priv,PEG_BAND_GAP_DATA ); +intel_de_write (dev_priv,PEG_BAND_GAP_DATA , + (temp & ~0xf ) |0xd ); }return true;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 8/8 drm/i915/psr: use intel_de_*() functions for register access
In reply to Jani NikulaThe implicit "dev_priv" local variable use has been a long-standing pain point in the register access macros I915_READ(), I915_WRITE(), POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register accessors intel_de_read(), intel_de_write(), intel_de_posting_read(), intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
--- drivers/gpu/drm/i915/display/intel_psr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +2 -2
@@ -832,11 +832,11 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,* TODO: if future platforms supports DC3CO in more than one * transcoder, EXITLINE will need to be unset when disabling PSR */ - val =I915_READ (EXITLINE (cpu_transcoder)); + val =intel_de_read (dev_priv,EXITLINE (cpu_transcoder)); val &= ~EXITLINE_MASK ; val |= crtc_state->dc3co_exitline <<EXITLINE_SHIFT ; val |=EXITLINE_ENABLE ; -I915_WRITE (EXITLINE (cpu_transcoder), val); +intel_de_write (dev_priv,EXITLINE (cpu_transcoder), val); } }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/8 drm/i915/combo_phy: use intel_de_*() functions for register access
In reply to Jani NikulaThe implicit "dev_priv" local variable use has been a long-standing pain point in the register access macros I915_READ(), I915_WRITE(), POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register accessors intel_de_read(), intel_de_write(), intel_de_posting_read(), intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
--- .../gpu/drm/i915/display/intel_combo_phy.c | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/display/intel_combo_phy.c +33 -33
@@ -48,7 +48,7 @@ cnl_get_procmon_ref_values(struct drm_i915_private *dev_priv, enum phy phy)const struct cnl_procmon *procmon;u32 val; - val =I915_READ (ICL_PORT_COMP_DW3 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_COMP_DW3 (phy));switch (val & (PROCESS_INFO_MASK |VOLTAGE_INFO_MASK )) {default :MISSING_CASE (val);
@@ -81,20 +81,20 @@ static void cnl_set_procmon_ref_values(struct drm_i915_private *dev_priv, procmon =cnl_get_procmon_ref_values (dev_priv, phy); - val =I915_READ (ICL_PORT_COMP_DW1 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_COMP_DW1 (phy)); val &= ~((0xff <<16 ) |0xff ); val |= procmon->dw1; -I915_WRITE (ICL_PORT_COMP_DW1 (phy), val); +intel_de_write (dev_priv,ICL_PORT_COMP_DW1 (phy), val); -I915_WRITE (ICL_PORT_COMP_DW9 (phy), procmon->dw9); -I915_WRITE (ICL_PORT_COMP_DW10 (phy), procmon->dw10); +intel_de_write (dev_priv,ICL_PORT_COMP_DW9 (phy), procmon->dw9); +intel_de_write (dev_priv,ICL_PORT_COMP_DW10 (phy), procmon->dw10); }static bool check_phy_reg (struct drm_i915_private *dev_priv,enum phy phy,i915_reg_t reg,u32 mask,u32 expected_val) { -u32 val =I915_READ (reg); +u32 val =intel_de_read (dev_priv, reg);if ((val & mask) != expected_val) { DRM_DEBUG_DRIVER("Combo PHY %c reg %08x state mismatch: "
@@ -127,8 +127,8 @@ static bool cnl_verify_procmon_ref_values(struct drm_i915_private *dev_priv,static bool cnl_combo_phy_enabled (struct drm_i915_private *dev_priv) { -return !(I915_READ (CHICKEN_MISC_2 ) &CNL_COMP_PWR_DOWN ) && - (I915_READ (CNL_PORT_COMP_DW0 ) &COMP_INIT ); +return !(intel_de_read (dev_priv,CHICKEN_MISC_2 ) &CNL_COMP_PWR_DOWN ) && + (intel_de_read (dev_priv,CNL_PORT_COMP_DW0 ) &COMP_INIT ); }static bool cnl_combo_phy_verify_state (struct drm_i915_private *dev_priv)
@@ -151,20 +151,20 @@ static void cnl_combo_phys_init(struct drm_i915_private *dev_priv) {u32 val; - val =I915_READ (CHICKEN_MISC_2 ); + val =intel_de_read (dev_priv,CHICKEN_MISC_2 ); val &= ~CNL_COMP_PWR_DOWN ; -I915_WRITE (CHICKEN_MISC_2 , val); +intel_de_write (dev_priv,CHICKEN_MISC_2 , val);/* Dummy PORT_A to get the correct CNL register from the ICL macro */ cnl_set_procmon_ref_values (dev_priv,PHY_A ); - val =I915_READ (CNL_PORT_COMP_DW0 ); + val =intel_de_read (dev_priv,CNL_PORT_COMP_DW0 ); val |=COMP_INIT ; -I915_WRITE (CNL_PORT_COMP_DW0 , val); +intel_de_write (dev_priv,CNL_PORT_COMP_DW0 , val); - val =I915_READ (CNL_PORT_CL1CM_DW5 ); + val =intel_de_read (dev_priv,CNL_PORT_CL1CM_DW5 ); val |=CL_POWER_DOWN_ENABLE ; -I915_WRITE (CNL_PORT_CL1CM_DW5 , val); +intel_de_write (dev_priv,CNL_PORT_CL1CM_DW5 , val); }static void cnl_combo_phys_uninit (struct drm_i915_private *dev_priv)
@@ -174,9 +174,9 @@ static void cnl_combo_phys_uninit(struct drm_i915_private *dev_priv)if (!cnl_combo_phy_verify_state (dev_priv))DRM_WARN ("Combo PHY HW state changed unexpectedly.\n" ); - val =I915_READ (CHICKEN_MISC_2 ); + val =intel_de_read (dev_priv,CHICKEN_MISC_2 ); val |=CNL_COMP_PWR_DOWN ; -I915_WRITE (CHICKEN_MISC_2 , val); +intel_de_write (dev_priv,CHICKEN_MISC_2 , val); } static bool icl_combo_phy_enabled(struct drm_i915_private *dev_priv,
@@ -184,11 +184,11 @@ static bool icl_combo_phy_enabled(struct drm_i915_private *dev_priv, {/* The PHY C added by EHL has no PHY_MISC register */ if (IS_ELKHARTLAKE (dev_priv) && phy ==PHY_C ) -return I915_READ (ICL_PORT_COMP_DW0 (phy)) &COMP_INIT ; +return intel_de_read (dev_priv,ICL_PORT_COMP_DW0 (phy)) &COMP_INIT ;else -return !(I915_READ (ICL_PHY_MISC (phy)) & +return !(intel_de_read (dev_priv,ICL_PHY_MISC (phy)) &ICL_PHY_MISC_DE_IO_COMP_PWR_DOWN ) && - (I915_READ (ICL_PORT_COMP_DW0 (phy)) &COMP_INIT ); + (intel_de_read (dev_priv,ICL_PORT_COMP_DW0 (phy)) &COMP_INIT ); }static bool ehl_vbt_ddi_d_present (struct drm_i915_private *i915)
@@ -294,10 +294,10 @@ void intel_combo_phy_power_up_lanes(struct drm_i915_private *dev_priv, } } - val =I915_READ (ICL_PORT_CL_DW10 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_CL_DW10 (phy)); val &= ~PWR_DOWN_LN_MASK ; val |= lane_mask <<PWR_DOWN_LN_SHIFT ; -I915_WRITE (ICL_PORT_CL_DW10 (phy), val); +intel_de_write (dev_priv,ICL_PORT_CL_DW10 (phy), val); }static void icl_combo_phys_init (struct drm_i915_private *dev_priv)
@@ -329,7 +329,7 @@ static void icl_combo_phys_init(struct drm_i915_private *dev_priv)* based on whether our VBT indicates the presence of any * "internal" child devices. */ - val =I915_READ (ICL_PHY_MISC (phy)); + val =intel_de_read (dev_priv,ICL_PHY_MISC (phy));if (IS_ELKHARTLAKE (dev_priv) && phy ==PHY_A ) { val &= ~ICL_PHY_MISC_MUX_DDID ;
@@ -338,24 +338,24 @@ static void icl_combo_phys_init(struct drm_i915_private *dev_priv) } val &= ~ICL_PHY_MISC_DE_IO_COMP_PWR_DOWN ; -I915_WRITE (ICL_PHY_MISC (phy), val); +intel_de_write (dev_priv,ICL_PHY_MISC (phy), val); skip_phy_misc:cnl_set_procmon_ref_values (dev_priv, phy);if (phy ==PHY_A ) { - val =I915_READ (ICL_PORT_COMP_DW8 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_COMP_DW8 (phy)); val |=IREFGEN ; -I915_WRITE (ICL_PORT_COMP_DW8 (phy), val); +intel_de_write (dev_priv,ICL_PORT_COMP_DW8 (phy), val); } - val =I915_READ (ICL_PORT_COMP_DW0 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_COMP_DW0 (phy)); val |=COMP_INIT ; -I915_WRITE (ICL_PORT_COMP_DW0 (phy), val); +intel_de_write (dev_priv,ICL_PORT_COMP_DW0 (phy), val); - val =I915_READ (ICL_PORT_CL_DW5 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_CL_DW5 (phy)); val |=CL_POWER_DOWN_ENABLE ; -I915_WRITE (ICL_PORT_CL_DW5 (phy), val); +intel_de_write (dev_priv,ICL_PORT_CL_DW5 (phy), val); } }
@@ -379,14 +379,14 @@ static void icl_combo_phys_uninit(struct drm_i915_private *dev_priv)if (IS_ELKHARTLAKE (dev_priv) && phy ==PHY_C ) goto skip_phy_misc; - val =I915_READ (ICL_PHY_MISC (phy)); + val =intel_de_read (dev_priv,ICL_PHY_MISC (phy)); val |=ICL_PHY_MISC_DE_IO_COMP_PWR_DOWN ; -I915_WRITE (ICL_PHY_MISC (phy), val); +intel_de_write (dev_priv,ICL_PHY_MISC (phy), val); skip_phy_misc: - val =I915_READ (ICL_PORT_COMP_DW0 (phy)); + val =intel_de_read (dev_priv,ICL_PORT_COMP_DW0 (phy)); val &= ~COMP_INIT ; -I915_WRITE (ICL_PORT_COMP_DW0 (phy), val); +intel_de_write (dev_priv,ICL_PORT_COMP_DW0 (phy), val); } }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/8 drm/i915/icl_dsi: use intel_de_*() functions for register access
In reply to Jani NikulaThe implicit "dev_priv" local variable use has been a long-standing pain point in the register access macros I915_READ(), I915_WRITE(), POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register accessors intel_de_read(), intel_de_write(), intel_de_posting_read(), intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
--- drivers/gpu/drm/i915/display/icl_dsi.c | 271 +++++++++++++------------ 1 file changed, 145 insertions(+), 126 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +145 -126
@@ -39,14 +39,14 @@static inline int header_credits_available (struct drm_i915_private *dev_priv,enum transcoder dsi_trans) { -return (I915_READ (DSI_CMD_TXCTL (dsi_trans)) &FREE_HEADER_CREDIT_MASK ) +return (intel_de_read (dev_priv,DSI_CMD_TXCTL (dsi_trans)) &FREE_HEADER_CREDIT_MASK ) >>FREE_HEADER_CREDIT_SHIFT ; }static inline int payload_credits_available (struct drm_i915_private *dev_priv,enum transcoder dsi_trans) { -return (I915_READ (DSI_CMD_TXCTL (dsi_trans)) &FREE_PLOAD_CREDIT_MASK ) +return (intel_de_read (dev_priv,DSI_CMD_TXCTL (dsi_trans)) &FREE_PLOAD_CREDIT_MASK ) >>FREE_PLOAD_CREDIT_SHIFT ; }
@@ -110,7 +110,7 @@ static void wait_for_cmds_dispatched_to_panel(struct intel_encoder *encoder)/* 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 (!(I915_READ (DSI_LP_MSG (dsi_trans)) & +if (wait_for_us (!(intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)) &LPTX_IN_PROGRESS ),20 ))drm_err (&dev_priv->drm,"LPTX bit not cleared\n" ); }
@@ -138,7 +138,7 @@ static bool add_payld_to_queue(struct intel_dsi_host *host, const u8 *data,for (j =0 ; j <min_t (u32, len - i,4 ); j++) tmp |= *data++ <<8 * j; -I915_WRITE (DSI_CMD_TXPYLD (dsi_trans), tmp); +intel_de_write (dev_priv,DSI_CMD_TXPYLD (dsi_trans), tmp); }return true;
@@ -161,7 +161,7 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host,return -1 ; } - tmp =I915_READ (DSI_CMD_TXHDR (dsi_trans)); + tmp =intel_de_read (dev_priv,DSI_CMD_TXHDR (dsi_trans));if (pkt.payload) tmp |=PAYLOAD_PRESENT ;
@@ -178,7 +178,7 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host, tmp |= ((pkt.header[0 ] &DT_MASK ) <<DT_SHIFT ); tmp |= (pkt.header[1 ] <<PARAM_WC_LOWER_SHIFT ); tmp |= (pkt.header[2 ] <<PARAM_WC_UPPER_SHIFT ); -I915_WRITE (DSI_CMD_TXHDR (dsi_trans), tmp); +intel_de_write (dev_priv,DSI_CMD_TXHDR (dsi_trans), tmp);return 0 ; }
@@ -215,53 +215,55 @@ static void dsi_program_swing_and_deemphasis(struct intel_encoder *encoder)* Program voltage swing and pre-emphasis level values as per * table in BSPEC under DDI buffer programing */ - tmp =I915_READ (ICL_PORT_TX_DW5_LN0 (phy)); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN0 (phy)); tmp &= ~(SCALING_MODE_SEL_MASK |RTERM_SELECT_MASK ); tmp |=SCALING_MODE_SEL (0x2 ); tmp |=TAP2_DISABLE |TAP3_DISABLE ; tmp |=RTERM_SELECT (0x6 ); -I915_WRITE (ICL_PORT_TX_DW5_GRP (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); - tmp =I915_READ (ICL_PORT_TX_DW5_AUX (phy)); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_AUX (phy)); tmp &= ~(SCALING_MODE_SEL_MASK |RTERM_SELECT_MASK ); tmp |=SCALING_MODE_SEL (0x2 ); tmp |=TAP2_DISABLE |TAP3_DISABLE ; tmp |=RTERM_SELECT (0x6 ); -I915_WRITE (ICL_PORT_TX_DW5_AUX (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_TX_DW5_AUX (phy), tmp); - tmp =I915_READ (ICL_PORT_TX_DW2_LN0 (phy)); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW2_LN0 (phy)); tmp &= ~(SWING_SEL_LOWER_MASK |SWING_SEL_UPPER_MASK |RCOMP_SCALAR_MASK ); tmp |=SWING_SEL_UPPER (0x2 ); tmp |=SWING_SEL_LOWER (0x2 ); tmp |=RCOMP_SCALAR (0x98 ); -I915_WRITE (ICL_PORT_TX_DW2_GRP (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_TX_DW2_GRP (phy), tmp); - tmp =I915_READ (ICL_PORT_TX_DW2_AUX (phy)); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW2_AUX (phy)); tmp &= ~(SWING_SEL_LOWER_MASK |SWING_SEL_UPPER_MASK |RCOMP_SCALAR_MASK ); tmp |=SWING_SEL_UPPER (0x2 ); tmp |=SWING_SEL_LOWER (0x2 ); tmp |=RCOMP_SCALAR (0x98 ); -I915_WRITE (ICL_PORT_TX_DW2_AUX (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_TX_DW2_AUX (phy), tmp); - tmp =I915_READ (ICL_PORT_TX_DW4_AUX (phy)); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW4_AUX (phy)); tmp &= ~(POST_CURSOR_1_MASK |POST_CURSOR_2_MASK |CURSOR_COEFF_MASK ); tmp |=POST_CURSOR_1 (0x0 ); tmp |=POST_CURSOR_2 (0x0 ); tmp |=CURSOR_COEFF (0x3f ); -I915_WRITE (ICL_PORT_TX_DW4_AUX (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_TX_DW4_AUX (phy), tmp);for (lane =0 ; lane <=3 ; lane++) {/* Bspec: must not use GRP register for write */ - tmp =I915_READ (ICL_PORT_TX_DW4_LN (lane, phy)); + tmp =intel_de_read (dev_priv, +ICL_PORT_TX_DW4_LN (lane, phy)); tmp &= ~(POST_CURSOR_1_MASK |POST_CURSOR_2_MASK |CURSOR_COEFF_MASK ); tmp |=POST_CURSOR_1 (0x0 ); tmp |=POST_CURSOR_2 (0x0 ); tmp |=CURSOR_COEFF (0x3f ); -I915_WRITE (ICL_PORT_TX_DW4_LN (lane, phy), tmp); +intel_de_write (dev_priv, +ICL_PORT_TX_DW4_LN (lane, phy), tmp); } } }
@@ -273,7 +275,7 @@ static void configure_dual_link_mode(struct intel_encoder *encoder,struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);u32 dss_ctl1; - dss_ctl1 =I915_READ (DSS_CTL1 ); + dss_ctl1 =intel_de_read (dev_priv,DSS_CTL1 ); dss_ctl1 |=SPLITTER_ENABLE ; dss_ctl1 &= ~OVERLAP_PIXELS_MASK ; dss_ctl1 |=OVERLAP_PIXELS (intel_dsi->pixel_overlap);
@@ -294,16 +296,16 @@ static void configure_dual_link_mode(struct intel_encoder *encoder, dss_ctl1 &= ~LEFT_DL_BUF_TARGET_DEPTH_MASK ; dss_ctl1 |=LEFT_DL_BUF_TARGET_DEPTH (dl_buffer_depth); - dss_ctl2 =I915_READ (DSS_CTL2 ); + dss_ctl2 =intel_de_read (dev_priv,DSS_CTL2 ); dss_ctl2 &= ~RIGHT_DL_BUF_TARGET_DEPTH_MASK ; dss_ctl2 |=RIGHT_DL_BUF_TARGET_DEPTH (dl_buffer_depth); -I915_WRITE (DSS_CTL2 , dss_ctl2); +intel_de_write (dev_priv,DSS_CTL2 , dss_ctl2); }else {/* Interleave */ dss_ctl1 |=DUAL_LINK_MODE_INTERLEAVE ; } -I915_WRITE (DSS_CTL1 , dss_ctl1); +intel_de_write (dev_priv,DSS_CTL1 , dss_ctl1); }/* aka DSI 8X clock */
@@ -334,15 +336,15 @@ static void gen11_dsi_program_esc_clk_div(struct intel_encoder *encoder, esc_clk_div_m =DIV_ROUND_UP (afe_clk_khz,DSI_MAX_ESC_CLK );for_each_dsi_port (port, intel_dsi->ports) { -I915_WRITE (ICL_DSI_ESC_CLK_DIV (port), - esc_clk_div_m &ICL_ESC_CLK_DIV_MASK ); -POSTING_READ (ICL_DSI_ESC_CLK_DIV (port)); +intel_de_write (dev_priv,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)); }for_each_dsi_port (port, intel_dsi->ports) { -I915_WRITE (ICL_DPHY_ESC_CLK_DIV (port), - esc_clk_div_m &ICL_ESC_CLK_DIV_MASK ); -POSTING_READ (ICL_DPHY_ESC_CLK_DIV (port)); +intel_de_write (dev_priv,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)); } }
@@ -369,9 +371,9 @@ static void gen11_dsi_enable_io_power(struct intel_encoder *encoder)u32 tmp;for_each_dsi_port (port, intel_dsi->ports) { - tmp =I915_READ (ICL_DSI_IO_MODECTL (port)); + tmp =intel_de_read (dev_priv,ICL_DSI_IO_MODECTL (port)); tmp |=COMBO_PHY_MODE_DSI ; -I915_WRITE (ICL_DSI_IO_MODECTL (port), tmp); +intel_de_write (dev_priv,ICL_DSI_IO_MODECTL (port), tmp); }get_dsi_io_power_domains (dev_priv, intel_dsi);
@@ -398,40 +400,46 @@ 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) { - tmp =I915_READ (ICL_PORT_TX_DW4_AUX (phy)); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW4_AUX (phy)); tmp &= ~LOADGEN_SELECT ; -I915_WRITE (ICL_PORT_TX_DW4_AUX (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_TX_DW4_AUX (phy), tmp);for (lane =0 ; lane <=3 ; lane++) { - tmp =I915_READ (ICL_PORT_TX_DW4_LN (lane, phy)); + tmp =intel_de_read (dev_priv, +ICL_PORT_TX_DW4_LN (lane, phy)); tmp &= ~LOADGEN_SELECT ;if (lane !=2 ) tmp |=LOADGEN_SELECT ; -I915_WRITE (ICL_PORT_TX_DW4_LN (lane, phy), tmp); +intel_de_write (dev_priv, +ICL_PORT_TX_DW4_LN (lane, phy), tmp); } }/* Step 4b(ii) set latency optimization for transmit and aux lanes */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =I915_READ (ICL_PORT_TX_DW2_AUX (phy)); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW2_AUX (phy)); tmp &= ~FRC_LATENCY_OPTIM_MASK ; tmp |=FRC_LATENCY_OPTIM_VAL (0x5 ); -I915_WRITE (ICL_PORT_TX_DW2_AUX (phy), tmp); - tmp =I915_READ (ICL_PORT_TX_DW2_LN0 (phy)); +intel_de_write (dev_priv,ICL_PORT_TX_DW2_AUX (phy), tmp); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW2_LN0 (phy)); tmp &= ~FRC_LATENCY_OPTIM_MASK ; tmp |=FRC_LATENCY_OPTIM_VAL (0x5 ); -I915_WRITE (ICL_PORT_TX_DW2_GRP (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_TX_DW2_GRP (phy), tmp);/* For EHL, TGL, set latency optimization for PCS_DW1 lanes */ if (IS_ELKHARTLAKE (dev_priv) || (INTEL_GEN (dev_priv) >=12 )) { - tmp =I915_READ (ICL_PORT_PCS_DW1_AUX (phy)); + tmp =intel_de_read (dev_priv, +ICL_PORT_PCS_DW1_AUX (phy)); tmp &= ~LATENCY_OPTIM_MASK ; tmp |=LATENCY_OPTIM_VAL (0 ); -I915_WRITE (ICL_PORT_PCS_DW1_AUX (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_PCS_DW1_AUX (phy), + tmp); - tmp =I915_READ (ICL_PORT_PCS_DW1_LN0 (phy)); + tmp =intel_de_read (dev_priv, +ICL_PORT_PCS_DW1_LN0 (phy)); tmp &= ~LATENCY_OPTIM_MASK ; tmp |=LATENCY_OPTIM_VAL (0x1 ); -I915_WRITE (ICL_PORT_PCS_DW1_GRP (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_PCS_DW1_GRP (phy), + tmp); } }
@@ -446,12 +454,12 @@ static void gen11_dsi_voltage_swing_program_seq(struct intel_encoder *encoder)/* clear common keeper enable bit */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =I915_READ (ICL_PORT_PCS_DW1_LN0 (phy)); + tmp =intel_de_read (dev_priv,ICL_PORT_PCS_DW1_LN0 (phy)); tmp &= ~COMMON_KEEPER_EN ; -I915_WRITE (ICL_PORT_PCS_DW1_GRP (phy), tmp); - tmp =I915_READ (ICL_PORT_PCS_DW1_AUX (phy)); +intel_de_write (dev_priv,ICL_PORT_PCS_DW1_GRP (phy), tmp); + tmp =intel_de_read (dev_priv,ICL_PORT_PCS_DW1_AUX (phy)); tmp &= ~COMMON_KEEPER_EN ; -I915_WRITE (ICL_PORT_PCS_DW1_AUX (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_PCS_DW1_AUX (phy), tmp); }/*
@@ -460,19 +468,19 @@ 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) { - tmp =I915_READ (ICL_PORT_CL_DW5 (phy)); + tmp =intel_de_read (dev_priv,ICL_PORT_CL_DW5 (phy)); tmp |=SUS_CLOCK_CONFIG ; -I915_WRITE (ICL_PORT_CL_DW5 (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_CL_DW5 (phy), tmp); }/* Clear training enable to change swing values */ for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =I915_READ (ICL_PORT_TX_DW5_LN0 (phy)); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN0 (phy)); tmp &= ~TX_TRAINING_EN ; -I915_WRITE (ICL_PORT_TX_DW5_GRP (phy), tmp); - tmp =I915_READ (ICL_PORT_TX_DW5_AUX (phy)); +intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_AUX (phy)); tmp &= ~TX_TRAINING_EN ; -I915_WRITE (ICL_PORT_TX_DW5_AUX (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_TX_DW5_AUX (phy), tmp); }/* Program swing and de-emphasis */
@@ -480,12 +488,12 @@ 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 =I915_READ (ICL_PORT_TX_DW5_LN0 (phy)); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_LN0 (phy)); tmp |=TX_TRAINING_EN ; -I915_WRITE (ICL_PORT_TX_DW5_GRP (phy), tmp); - tmp =I915_READ (ICL_PORT_TX_DW5_AUX (phy)); +intel_de_write (dev_priv,ICL_PORT_TX_DW5_GRP (phy), tmp); + tmp =intel_de_read (dev_priv,ICL_PORT_TX_DW5_AUX (phy)); tmp |=TX_TRAINING_EN ; -I915_WRITE (ICL_PORT_TX_DW5_AUX (phy), tmp); +intel_de_write (dev_priv,ICL_PORT_TX_DW5_AUX (phy), tmp); } }
@@ -497,11 +505,11 @@ static void gen11_dsi_enable_ddi_buffer(struct intel_encoder *encoder)enum port port;for_each_dsi_port (port, intel_dsi->ports) { - tmp =I915_READ (DDI_BUF_CTL (port)); + tmp =intel_de_read (dev_priv,DDI_BUF_CTL (port)); tmp |=DDI_BUF_CTL_ENABLE ; -I915_WRITE (DDI_BUF_CTL (port), tmp); +intel_de_write (dev_priv,DDI_BUF_CTL (port), tmp); -if (wait_for_us (!(I915_READ (DDI_BUF_CTL (port)) & +if (wait_for_us (!(intel_de_read (dev_priv,DDI_BUF_CTL (port)) &DDI_BUF_IS_IDLE ),500 )) drm_err(&dev_priv->drm, "DDI port:%c buffer idle\n",
@@ -521,28 +529,30 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,/* Program T-INIT master registers */ for_each_dsi_port (port, intel_dsi->ports) { - tmp =I915_READ (ICL_DSI_T_INIT_MASTER (port)); + tmp =intel_de_read (dev_priv,ICL_DSI_T_INIT_MASTER (port)); tmp &= ~MASTER_INIT_TIMER_MASK ; tmp |= intel_dsi->init_count; -I915_WRITE (ICL_DSI_T_INIT_MASTER (port), tmp); +intel_de_write (dev_priv,ICL_DSI_T_INIT_MASTER (port), tmp); }/* Program DPHY clock lanes timings */ for_each_dsi_port (port, intel_dsi->ports) { -I915_WRITE (DPHY_CLK_TIMING_PARAM (port), intel_dsi->dphy_reg); +intel_de_write (dev_priv,DPHY_CLK_TIMING_PARAM (port), + intel_dsi->dphy_reg);/* shadow register inside display core */ -I915_WRITE (DSI_CLK_TIMING_PARAM (port), intel_dsi->dphy_reg); +intel_de_write (dev_priv,DSI_CLK_TIMING_PARAM (port), + intel_dsi->dphy_reg); }/* Program DPHY data lanes timings */ for_each_dsi_port (port, intel_dsi->ports) { -I915_WRITE (DPHY_DATA_TIMING_PARAM (port), - intel_dsi->dphy_data_lane_reg); +intel_de_write (dev_priv,DPHY_DATA_TIMING_PARAM (port), + intel_dsi->dphy_data_lane_reg);/* shadow register inside display core */ -I915_WRITE (DSI_DATA_TIMING_PARAM (port), - intel_dsi->dphy_data_lane_reg); +intel_de_write (dev_priv,DSI_DATA_TIMING_PARAM (port), + intel_dsi->dphy_data_lane_reg); }/*
@@ -554,25 +564,30 @@ gen11_dsi_setup_dphy_timings(struct intel_encoder *encoder,if (IS_GEN (dev_priv,11 )) {if (afe_clk (encoder, crtc_state) <=800000 ) {for_each_dsi_port (port, intel_dsi->ports) { - tmp =I915_READ (DPHY_TA_TIMING_PARAM (port)); + tmp =intel_de_read (dev_priv, +DPHY_TA_TIMING_PARAM (port)); tmp &= ~TA_SURE_MASK ; tmp |=TA_SURE_OVERRIDE |TA_SURE (0 ); -I915_WRITE (DPHY_TA_TIMING_PARAM (port), tmp); +intel_de_write (dev_priv, +DPHY_TA_TIMING_PARAM (port), + tmp);/* shadow register inside display core */ - tmp =I915_READ (DSI_TA_TIMING_PARAM (port)); + tmp =intel_de_read (dev_priv, +DSI_TA_TIMING_PARAM (port)); tmp &= ~TA_SURE_MASK ; tmp |=TA_SURE_OVERRIDE |TA_SURE (0 ); -I915_WRITE (DSI_TA_TIMING_PARAM (port), tmp); +intel_de_write (dev_priv, +DSI_TA_TIMING_PARAM (port), tmp); } } }if (IS_ELKHARTLAKE (dev_priv)) {for_each_dsi_phy (phy, intel_dsi->phys) { - tmp =I915_READ (ICL_DPHY_CHKN (phy)); + tmp =intel_de_read (dev_priv,ICL_DPHY_CHKN (phy)); tmp |=ICL_DPHY_CHKN_AFE_OVER_PPI_STRAP ; -I915_WRITE (ICL_DPHY_CHKN (phy), tmp); +intel_de_write (dev_priv,ICL_DPHY_CHKN (phy), tmp); } } }
@@ -585,11 +600,11 @@ static void gen11_dsi_gate_clocks(struct intel_encoder *encoder)enum phy phy;mutex_lock (&dev_priv->dpll_lock); - tmp =I915_READ (ICL_DPCLKA_CFGCR0 ); + tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) tmp |=ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); -I915_WRITE (ICL_DPCLKA_CFGCR0 , tmp); +intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , tmp);mutex_unlock (&dev_priv->dpll_lock); }
@@ -601,11 +616,11 @@ static void gen11_dsi_ungate_clocks(struct intel_encoder *encoder)enum phy phy;mutex_lock (&dev_priv->dpll_lock); - tmp =I915_READ (ICL_DPCLKA_CFGCR0 ); + tmp =intel_de_read (dev_priv,ICL_DPCLKA_CFGCR0 );for_each_dsi_phy (phy, intel_dsi->phys) tmp &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); -I915_WRITE (ICL_DPCLKA_CFGCR0 , tmp); +intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , tmp);mutex_unlock (&dev_priv->dpll_lock); }
@@ -620,12 +635,12 @@ static void gen11_dsi_map_pll(struct intel_encoder *encoder,mutex_lock (&dev_priv->dpll_lock); - val =I915_READ (ICL_DPCLKA_CFGCR0 ); + val =intel_de_read (dev_priv,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); } -I915_WRITE (ICL_DPCLKA_CFGCR0 , val); +intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val);for_each_dsi_phy (phy, intel_dsi->phys) {if (INTEL_GEN (dev_priv) >=12 )
@@ -633,9 +648,9 @@ static void gen11_dsi_map_pll(struct intel_encoder *encoder,else val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (phy); } -I915_WRITE (ICL_DPCLKA_CFGCR0 , val); +intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val); -POSTING_READ (ICL_DPCLKA_CFGCR0 ); +intel_de_posting_read (dev_priv,ICL_DPCLKA_CFGCR0 );mutex_unlock (&dev_priv->dpll_lock); }
@@ -654,7 +669,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 =I915_READ (DSI_TRANS_FUNC_CONF (dsi_trans)); + tmp =intel_de_read (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans));if (intel_dsi->eotp_pkt) tmp &= ~EOTP_DISABLED ;
@@ -731,16 +746,18 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, } } -I915_WRITE (DSI_TRANS_FUNC_CONF (dsi_trans), tmp); +intel_de_write (dev_priv,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); - tmp =I915_READ (TRANS_DDI_FUNC_CTL2 (dsi_trans)); + tmp =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL2 (dsi_trans)); tmp |=PORT_SYNC_MODE_ENABLE ; -I915_WRITE (TRANS_DDI_FUNC_CTL2 (dsi_trans), tmp); +intel_de_write (dev_priv, +TRANS_DDI_FUNC_CTL2 (dsi_trans), tmp); }/* configure stream splitting */
@@ -751,7 +768,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, dsi_trans =dsi_port_to_transcoder (port);/* select data lane width */ - tmp =I915_READ (TRANS_DDI_FUNC_CTL (dsi_trans)); + tmp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (dsi_trans)); tmp &= ~DDI_PORT_WIDTH_MASK ; tmp |=DDI_PORT_WIDTH (intel_dsi->lane_count);
@@ -777,14 +794,14 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,/* enable DDI buffer */ tmp |=TRANS_DDI_FUNC_ENABLE ; -I915_WRITE (TRANS_DDI_FUNC_CTL (dsi_trans), tmp); +intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (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 ((I915_READ (DSI_TRANS_FUNC_CONF (dsi_trans)) & -LINK_READY ),2500 )) +if (wait_for_us ((intel_de_read (dev_priv,DSI_TRANS_FUNC_CONF (dsi_trans)) & +LINK_READY ),2500 ))drm_err (&dev_priv->drm,"DSI link not ready\n" ); } }
@@ -851,8 +868,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,/* program TRANS_HTOTAL register */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -I915_WRITE (HTOTAL (dsi_trans), - (hactive -1 ) | ((htotal -1 ) <<16 )); +intel_de_write (dev_priv,HTOTAL (dsi_trans), + (hactive -1 ) | ((htotal -1 ) <<16 )); }/* TRANS_HSYNC register to be programmed only for video mode */
@@ -875,8 +892,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); -I915_WRITE (HSYNC (dsi_trans), - (hsync_start -1 ) | ((hsync_end -1 ) <<16 )); +intel_de_write (dev_priv,HSYNC (dsi_trans), + (hsync_start -1 ) | ((hsync_end -1 ) <<16 )); } }
@@ -889,8 +906,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,* struct drm_display_mode. * For interlace mode: program required pixel minus 2 */ -I915_WRITE (VTOTAL (dsi_trans), - (vactive -1 ) | ((vtotal -1 ) <<16 )); +intel_de_write (dev_priv,VTOTAL (dsi_trans), + (vactive -1 ) | ((vtotal -1 ) <<16 )); }if (vsync_end < vsync_start || vsync_end > vtotal)
@@ -902,8 +919,8 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,/* program TRANS_VSYNC register */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -I915_WRITE (VSYNC (dsi_trans), - (vsync_start -1 ) | ((vsync_end -1 ) <<16 )); +intel_de_write (dev_priv,VSYNC (dsi_trans), + (vsync_start -1 ) | ((vsync_end -1 ) <<16 )); }/*
@@ -914,15 +931,15 @@ gen11_dsi_set_transcoder_timings(struct intel_encoder *encoder,*/ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -I915_WRITE (VSYNCSHIFT (dsi_trans), vsync_shift); +intel_de_write (dev_priv,VSYNCSHIFT (dsi_trans), vsync_shift); }/* program TRANS_VBLANK register, should be same as vtotal programmed */ if (INTEL_GEN (dev_priv) >=12 ) {for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); -I915_WRITE (VBLANK (dsi_trans), - (vactive -1 ) | ((vtotal -1 ) <<16 )); +intel_de_write (dev_priv,VBLANK (dsi_trans), + (vactive -1 ) | ((vtotal -1 ) <<16 )); } } }
@@ -937,9 +954,9 @@ static void gen11_dsi_enable_transcoder(struct intel_encoder *encoder)for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =I915_READ (PIPECONF (dsi_trans)); + tmp =intel_de_read (dev_priv,PIPECONF (dsi_trans)); tmp |=PIPECONF_ENABLE ; -I915_WRITE (PIPECONF (dsi_trans), tmp); +intel_de_write (dev_priv,PIPECONF (dsi_trans), tmp);/* wait for transcoder to be enabled */ if (intel_de_wait_for_set(dev_priv, PIPECONF(dsi_trans),
@@ -976,26 +993,26 @@ static void gen11_dsi_setup_timeouts(struct intel_encoder *encoder, dsi_trans =dsi_port_to_transcoder (port);/* program hst_tx_timeout */ - tmp =I915_READ (DSI_HSTX_TO (dsi_trans)); + tmp =intel_de_read (dev_priv,DSI_HSTX_TO (dsi_trans)); tmp &= ~HSTX_TIMEOUT_VALUE_MASK ; tmp |=HSTX_TIMEOUT_VALUE (hs_tx_timeout); -I915_WRITE (DSI_HSTX_TO (dsi_trans), tmp); +intel_de_write (dev_priv,DSI_HSTX_TO (dsi_trans), tmp);/* FIXME: DSI_CALIB_TO */ /* program lp_rx_host timeout */ - tmp =I915_READ (DSI_LPRX_HOST_TO (dsi_trans)); + tmp =intel_de_read (dev_priv,DSI_LPRX_HOST_TO (dsi_trans)); tmp &= ~LPRX_TIMEOUT_VALUE_MASK ; tmp |=LPRX_TIMEOUT_VALUE (lp_rx_timeout); -I915_WRITE (DSI_LPRX_HOST_TO (dsi_trans), tmp); +intel_de_write (dev_priv,DSI_LPRX_HOST_TO (dsi_trans), tmp);/* FIXME: DSI_PWAIT_TO */ /* program turn around timeout */ - tmp =I915_READ (DSI_TA_TO (dsi_trans)); + tmp =intel_de_read (dev_priv,DSI_TA_TO (dsi_trans)); tmp &= ~TA_TIMEOUT_VALUE_MASK ; tmp |=TA_TIMEOUT_VALUE (ta_timeout); -I915_WRITE (DSI_TA_TO (dsi_trans), tmp); +intel_de_write (dev_priv,DSI_TA_TO (dsi_trans), tmp); } }
@@ -1049,7 +1066,7 @@ 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 =I915_READ (DSI_CMD_RXCTL (dsi_trans)); + tmp =intel_de_read (dev_priv,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 ;
@@ -1122,9 +1139,9 @@ static void gen11_dsi_disable_transcoder(struct intel_encoder *encoder) dsi_trans =dsi_port_to_transcoder (port);/* disable transcoder */ - tmp =I915_READ (PIPECONF (dsi_trans)); + tmp =intel_de_read (dev_priv,PIPECONF (dsi_trans)); tmp &= ~PIPECONF_ENABLE ; -I915_WRITE (PIPECONF (dsi_trans), tmp); +intel_de_write (dev_priv,PIPECONF (dsi_trans), tmp);/* wait for transcoder to be disabled */ if (intel_de_wait_for_clear(dev_priv, PIPECONF(dsi_trans),
@@ -1157,13 +1174,13 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)/* put dsi link in ULPS */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =I915_READ (DSI_LP_MSG (dsi_trans)); + tmp =intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)); tmp |=LINK_ENTER_ULPS ; tmp &= ~LINK_ULPS_TYPE_LP11 ; -I915_WRITE (DSI_LP_MSG (dsi_trans), tmp); +intel_de_write (dev_priv,DSI_LP_MSG (dsi_trans), tmp); -if (wait_for_us ((I915_READ (DSI_LP_MSG (dsi_trans)) & -LINK_IN_ULPS ), +if (wait_for_us ((intel_de_read (dev_priv,DSI_LP_MSG (dsi_trans)) & +LINK_IN_ULPS ),10 ))drm_err (&dev_priv->drm,"DSI link not in ULPS\n" ); }
@@ -1171,18 +1188,20 @@ static void gen11_dsi_deconfigure_trancoder(struct intel_encoder *encoder)/* disable ddi function */ for_each_dsi_port (port, intel_dsi->ports) { dsi_trans =dsi_port_to_transcoder (port); - tmp =I915_READ (TRANS_DDI_FUNC_CTL (dsi_trans)); + tmp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (dsi_trans)); tmp &= ~TRANS_DDI_FUNC_ENABLE ; -I915_WRITE (TRANS_DDI_FUNC_CTL (dsi_trans), tmp); +intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL (dsi_trans), tmp); }/* disable 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); - tmp =I915_READ (TRANS_DDI_FUNC_CTL2 (dsi_trans)); + tmp =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL2 (dsi_trans)); tmp &= ~PORT_SYNC_MODE_ENABLE ; -I915_WRITE (TRANS_DDI_FUNC_CTL2 (dsi_trans), tmp); +intel_de_write (dev_priv, +TRANS_DDI_FUNC_CTL2 (dsi_trans), tmp); } } }
@@ -1196,11 +1215,11 @@ static void gen11_dsi_disable_port(struct intel_encoder *encoder)gen11_dsi_ungate_clocks (encoder);for_each_dsi_port (port, intel_dsi->ports) { - tmp =I915_READ (DDI_BUF_CTL (port)); + tmp =intel_de_read (dev_priv,DDI_BUF_CTL (port)); tmp &= ~DDI_BUF_CTL_ENABLE ; -I915_WRITE (DDI_BUF_CTL (port), tmp); +intel_de_write (dev_priv,DDI_BUF_CTL (port), tmp); -if (wait_for_us ((I915_READ (DDI_BUF_CTL (port)) & +if (wait_for_us ((intel_de_read (dev_priv,DDI_BUF_CTL (port)) &DDI_BUF_IS_IDLE ),8 )) drm_err(&dev_priv->drm,
@@ -1230,9 +1249,9 @@ static void gen11_dsi_disable_io_power(struct intel_encoder *encoder)/* set mode to DDI */ for_each_dsi_port (port, intel_dsi->ports) { - tmp =I915_READ (ICL_DSI_IO_MODECTL (port)); + tmp =intel_de_read (dev_priv,ICL_DSI_IO_MODECTL (port)); tmp &= ~COMBO_PHY_MODE_DSI ; -I915_WRITE (ICL_DSI_IO_MODECTL (port), tmp); +intel_de_write (dev_priv,ICL_DSI_IO_MODECTL (port), tmp); } }
@@ -1454,7 +1473,7 @@ 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 =I915_READ (TRANS_DDI_FUNC_CTL (dsi_trans)); + tmp =intel_de_read (dev_priv,TRANS_DDI_FUNC_CTL (dsi_trans));switch (tmp &TRANS_DDI_EDP_INPUT_MASK ) {case TRANS_DDI_EDP_INPUT_A_ON : *pipe =PIPE_A ;
@@ -1473,7 +1492,7 @@ static bool gen11_dsi_get_hw_state(struct intel_encoder *encoder, goto out; } - tmp =I915_READ (PIPECONF (dsi_trans)); + tmp =intel_de_read (dev_priv,PIPECONF (dsi_trans)); ret = tmp &PIPECONF_ENABLE ; } out:
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/8 drm/i915/display_power: use intel_de_*() functions for register access
In reply to Jani NikulaThe implicit "dev_priv" local variable use has been a long-standing pain point in the register access macros I915_READ(), I915_WRITE(), POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register accessors intel_de_read(), intel_de_write(), intel_de_posting_read(), intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
--- .../drm/i915/display/intel_display_power.c | 292 ++++++++++-------- 1 file changed, 157 insertions(+), 135 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +157 -135
@@ -304,11 +304,11 @@ static u32 hsw_power_well_requesters(struct drm_i915_private *dev_priv,u32 req_mask =HSW_PWR_WELL_CTL_REQ (pw_idx);u32 ret; - ret =I915_READ (regs->bios) & req_mask ?1 :0 ; - ret |=I915_READ (regs->driver) & req_mask ?2 :0 ; + ret =intel_de_read (dev_priv, regs->bios) & req_mask ?1 :0 ; + ret |=intel_de_read (dev_priv, regs->driver) & req_mask ?2 :0 ;if (regs->kvmr.reg) - ret |=I915_READ (regs->kvmr) & req_mask ?4 :0 ; - ret |=I915_READ (regs->debug) & req_mask ?8 :0 ; + ret |=intel_de_read (dev_priv, regs->kvmr) & req_mask ?4 :0 ; + ret |=intel_de_read (dev_priv, regs->debug) & req_mask ?8 :0 ;return ret; }
@@ -330,7 +330,7 @@ static void hsw_wait_for_power_well_disable(struct drm_i915_private *dev_priv,* Skip the wait in case any of the request bits are set and print a * diagnostic message. */ -wait_for ((disabled = !(I915_READ (regs->driver) & +wait_for ((disabled = !(intel_de_read (dev_priv, regs->driver) &HSW_PWR_WELL_CTL_STATE (pw_idx))) || (reqs =hsw_power_well_requesters (dev_priv, regs, pw_idx)),1 );if (disabled)
@@ -373,17 +373,18 @@ static void hsw_power_well_enable(struct drm_i915_private *dev_priv,gen9_wait_for_power_well_fuses (dev_priv,SKL_PG0 ); } - val =I915_READ (regs->driver); -I915_WRITE (regs->driver, val |HSW_PWR_WELL_CTL_REQ (pw_idx)); + val =intel_de_read (dev_priv, regs->driver); +intel_de_write (dev_priv, regs->driver, + val |HSW_PWR_WELL_CTL_REQ (pw_idx));hsw_wait_for_power_well_enable (dev_priv, power_well);/* Display WA #1178: cnl */ if (IS_CANNONLAKE (dev_priv) && pw_idx >=GLK_PW_CTL_IDX_AUX_B && pw_idx <=CNL_PW_CTL_IDX_AUX_F ) { - val =I915_READ (CNL_AUX_ANAOVRD1 (pw_idx)); + val =intel_de_read (dev_priv,CNL_AUX_ANAOVRD1 (pw_idx)); val |=CNL_AUX_ANAOVRD1_ENABLE |CNL_AUX_ANAOVRD1_LDO_BYPASS ; -I915_WRITE (CNL_AUX_ANAOVRD1 (pw_idx), val); +intel_de_write (dev_priv,CNL_AUX_ANAOVRD1 (pw_idx), val); }if (wait_fuses)
@@ -404,8 +405,9 @@ static void hsw_power_well_disable(struct drm_i915_private *dev_priv,hsw_power_well_pre_disable (dev_priv, power_well->desc->hsw.irq_pipe_mask); - val =I915_READ (regs->driver); -I915_WRITE (regs->driver, val & ~HSW_PWR_WELL_CTL_REQ (pw_idx)); + val =intel_de_read (dev_priv, regs->driver); +intel_de_write (dev_priv, regs->driver, + val & ~HSW_PWR_WELL_CTL_REQ (pw_idx));hsw_wait_for_power_well_disable (dev_priv, power_well); }
@@ -422,12 +424,14 @@ icl_combo_phy_aux_power_well_enable(struct drm_i915_private *dev_priv,WARN_ON (!IS_ICELAKE (dev_priv)); - val =I915_READ (regs->driver); -I915_WRITE (regs->driver, val |HSW_PWR_WELL_CTL_REQ (pw_idx)); + val =intel_de_read (dev_priv, regs->driver); +intel_de_write (dev_priv, regs->driver, + val |HSW_PWR_WELL_CTL_REQ (pw_idx));if (INTEL_GEN (dev_priv) <12 ) { - val =I915_READ (ICL_PORT_CL_DW12 (phy)); -I915_WRITE (ICL_PORT_CL_DW12 (phy), val |ICL_LANE_ENABLE_AUX ); + val =intel_de_read (dev_priv,ICL_PORT_CL_DW12 (phy)); +intel_de_write (dev_priv,ICL_PORT_CL_DW12 (phy), + val |ICL_LANE_ENABLE_AUX ); }hsw_wait_for_power_well_enable (dev_priv, power_well);
@@ -435,9 +439,9 @@ icl_combo_phy_aux_power_well_enable(struct drm_i915_private *dev_priv,/* Display WA #1178: icl */ if (pw_idx >=ICL_PW_CTL_IDX_AUX_A && pw_idx <=ICL_PW_CTL_IDX_AUX_B && !intel_bios_is_port_edp (dev_priv, (enum port )phy)) { - val =I915_READ (ICL_AUX_ANAOVRD1 (pw_idx)); + val =intel_de_read (dev_priv,ICL_AUX_ANAOVRD1 (pw_idx)); val |=ICL_AUX_ANAOVRD1_ENABLE |ICL_AUX_ANAOVRD1_LDO_BYPASS ; -I915_WRITE (ICL_AUX_ANAOVRD1 (pw_idx), val); +intel_de_write (dev_priv,ICL_AUX_ANAOVRD1 (pw_idx), val); } }
@@ -452,11 +456,13 @@ icl_combo_phy_aux_power_well_disable(struct drm_i915_private *dev_priv,WARN_ON (!IS_ICELAKE (dev_priv)); - val =I915_READ (ICL_PORT_CL_DW12 (phy)); -I915_WRITE (ICL_PORT_CL_DW12 (phy), val & ~ICL_LANE_ENABLE_AUX ); + val =intel_de_read (dev_priv,ICL_PORT_CL_DW12 (phy)); +intel_de_write (dev_priv,ICL_PORT_CL_DW12 (phy), + val & ~ICL_LANE_ENABLE_AUX ); - val =I915_READ (regs->driver); -I915_WRITE (regs->driver, val & ~HSW_PWR_WELL_CTL_REQ (pw_idx)); + val =intel_de_read (dev_priv, regs->driver); +intel_de_write (dev_priv, regs->driver, + val & ~HSW_PWR_WELL_CTL_REQ (pw_idx));hsw_wait_for_power_well_disable (dev_priv, power_well); }
@@ -553,11 +559,11 @@ icl_tc_phy_aux_power_well_enable(struct drm_i915_private *dev_priv,icl_tc_port_assert_ref_held (dev_priv, power_well); - val =I915_READ (DP_AUX_CH_CTL (aux_ch)); + val =intel_de_read (dev_priv,DP_AUX_CH_CTL (aux_ch)); val &= ~DP_AUX_CH_CTL_TBT_IO ;if (power_well->desc->hsw.is_tc_tbt) val |=DP_AUX_CH_CTL_TBT_IO ; -I915_WRITE (DP_AUX_CH_CTL (aux_ch), val); +intel_de_write (dev_priv,DP_AUX_CH_CTL (aux_ch), val);hsw_power_well_enable (dev_priv, power_well);
@@ -565,7 +571,8 @@ icl_tc_phy_aux_power_well_enable(struct drm_i915_private *dev_priv,enum tc_port tc_port; tc_port =TGL_AUX_PW_TO_TC_PORT (power_well->desc->hsw.idx); -I915_WRITE (HIP_INDEX_REG (tc_port),HIP_INDEX_VAL (tc_port,0x2 )); +intel_de_write (dev_priv,HIP_INDEX_REG (tc_port), +HIP_INDEX_VAL (tc_port,0x2 ));if (intel_de_wait_for_set (dev_priv,DKL_CMN_UC_DW_27 (tc_port),DKL_CMN_UC_DW27_UC_HEALTH ,1 ))
@@ -598,7 +605,7 @@ static bool hsw_power_well_enabled(struct drm_i915_private *dev_priv,HSW_PWR_WELL_CTL_STATE (pw_idx);u32 val; - val =I915_READ (regs->driver); + val =intel_de_read (dev_priv, regs->driver);/* * On GEN9 big core due to a DMC bug the driver's request bits for PW1
@@ -608,18 +615,18 @@ static bool hsw_power_well_enabled(struct drm_i915_private *dev_priv,*/ if (IS_GEN (dev_priv,9 ) && !IS_GEN9_LP (dev_priv) && (id ==SKL_DISP_PW_1 || id ==SKL_DISP_PW_MISC_IO )) - val |=I915_READ (regs->bios); + val |=intel_de_read (dev_priv, regs->bios);return (val & mask) == mask; }static void assert_can_enable_dc9 (struct drm_i915_private *dev_priv) { -WARN_ONCE ((I915_READ (DC_STATE_EN ) &DC_STATE_EN_DC9 ), +WARN_ONCE ((intel_de_read (dev_priv,DC_STATE_EN ) &DC_STATE_EN_DC9 ),"DC9 already programmed to be enabled.\n" ); -WARN_ONCE (I915_READ (DC_STATE_EN ) &DC_STATE_EN_UPTO_DC5 , +WARN_ONCE (intel_de_read (dev_priv,DC_STATE_EN ) &DC_STATE_EN_UPTO_DC5 ,"DC5 still not disabled to enable DC9.\n" ); -WARN_ONCE (I915_READ (HSW_PWR_WELL_CTL2 ) & +WARN_ONCE (intel_de_read (dev_priv,HSW_PWR_WELL_CTL2 ) &HSW_PWR_WELL_CTL_REQ (SKL_PW_CTL_IDX_PW_2 ),"Power well 2 on.\n" ); WARN_ONCE(intel_irqs_enabled(dev_priv),
@@ -638,7 +645,7 @@ static void assert_can_disable_dc9(struct drm_i915_private *dev_priv) {WARN_ONCE (intel_irqs_enabled (dev_priv),"Interrupts not disabled yet.\n" ); -WARN_ONCE (I915_READ (DC_STATE_EN ) &DC_STATE_EN_UPTO_DC5 , +WARN_ONCE (intel_de_read (dev_priv,DC_STATE_EN ) &DC_STATE_EN_UPTO_DC5 ,"DC5 still not disabled.\n" );/*
@@ -657,7 +664,7 @@ static void gen9_write_dc_state(struct drm_i915_private *dev_priv,int rereads =0 ;u32 v; -I915_WRITE (DC_STATE_EN , state); +intel_de_write (dev_priv,DC_STATE_EN , state);/* It has been observed that disabling the dc6 state sometimes * doesn't stick and dmc keeps returning old value. Make sure
@@ -665,10 +672,10 @@ static void gen9_write_dc_state(struct drm_i915_private *dev_priv,* we are confident that state is exactly what we want. */ do { - v = I915_READ(DC_STATE_EN); + v = intel_de_read(dev_priv, DC_STATE_EN); if (v != state) { - I915_WRITE(DC_STATE_EN, state); + intel_de_write(dev_priv, DC_STATE_EN, state); rewrites++; rereads = 0; } else if (rereads++ > 5) {
@@ -712,7 +719,7 @@ static void gen9_sanitize_dc_state(struct drm_i915_private *dev_priv) {u32 val; - val =I915_READ (DC_STATE_EN ) &gen9_dc_mask (dev_priv); + val =intel_de_read (dev_priv,DC_STATE_EN ) &gen9_dc_mask (dev_priv); drm_dbg_kms(&dev_priv->drm, "Resetting DC state tracking from %02x to %02x\n",
@@ -751,7 +758,7 @@ static void gen9_set_dc_state(struct drm_i915_private *dev_priv, u32 state)if (WARN_ON_ONCE (state & ~dev_priv->csr.allowed_dc_mask)) state &= dev_priv->csr.allowed_dc_mask; - val =I915_READ (DC_STATE_EN ); + val =intel_de_read (dev_priv,DC_STATE_EN ); mask =gen9_dc_mask (dev_priv);drm_dbg_kms (&dev_priv->drm,"Setting DC state from %02x to %02x\n" , val & mask, state);
@@ -805,9 +812,9 @@ static void tgl_disable_dc3co(struct drm_i915_private *dev_priv)u32 val;drm_dbg_kms (&dev_priv->drm,"Disabling DC3CO\n" ); - val =I915_READ (DC_STATE_EN ); + val =intel_de_read (dev_priv,DC_STATE_EN ); val &= ~DC_STATE_DC3CO_STATUS ; -I915_WRITE (DC_STATE_EN , val); +intel_de_write (dev_priv,DC_STATE_EN , val);gen9_set_dc_state (dev_priv,DC_STATE_DISABLE );/* * Delay of 200us DC3CO Exit time B.Spec 49196
@@ -843,10 +850,11 @@ static void bxt_disable_dc9(struct drm_i915_private *dev_priv)static void assert_csr_loaded (struct drm_i915_private *dev_priv) { -WARN_ONCE (!I915_READ (CSR_PROGRAM (0 )), +WARN_ONCE (!intel_de_read (dev_priv,CSR_PROGRAM (0 )),"CSR program storage start is NULL\n" ); -WARN_ONCE (!I915_READ (CSR_SSP_BASE ),"CSR SSP Base Not fine\n" ); -WARN_ONCE (!I915_READ (CSR_HTP_SKL ),"CSR HTP Not fine\n" ); +WARN_ONCE (!intel_de_read (dev_priv,CSR_SSP_BASE ), +"CSR SSP Base Not fine\n" ); +WARN_ONCE (!intel_de_read (dev_priv,CSR_HTP_SKL ),"CSR HTP Not fine\n" ); } static struct i915_power_well *
@@ -922,7 +930,7 @@ static void assert_can_enable_dc5(struct drm_i915_private *dev_priv)WARN_ONCE (pg2_enabled,"PG2 not disabled to enable DC5.\n" ); -WARN_ONCE ((I915_READ (DC_STATE_EN ) &DC_STATE_EN_UPTO_DC5 ), +WARN_ONCE ((intel_de_read (dev_priv,DC_STATE_EN ) &DC_STATE_EN_UPTO_DC5 ),"DC5 already programmed to be enabled.\n" );assert_rpm_wakelock_held (&dev_priv->runtime_pm);
@@ -937,17 +945,17 @@ static void gen9_enable_dc5(struct drm_i915_private *dev_priv)/* Wa Display #1183: skl,kbl,cfl */ if (IS_GEN9_BC (dev_priv)) -I915_WRITE (GEN8_CHICKEN_DCPR_1 ,I915_READ (GEN8_CHICKEN_DCPR_1 ) | -SKL_SELECT_ALTERNATE_DC_EXIT ); +intel_de_write (dev_priv,GEN8_CHICKEN_DCPR_1 , +intel_de_read (dev_priv,GEN8_CHICKEN_DCPR_1 ) |SKL_SELECT_ALTERNATE_DC_EXIT );gen9_set_dc_state (dev_priv,DC_STATE_EN_UPTO_DC5 ); }static void assert_can_enable_dc6 (struct drm_i915_private *dev_priv) { -WARN_ONCE (I915_READ (UTIL_PIN_CTL ) &UTIL_PIN_ENABLE , +WARN_ONCE (intel_de_read (dev_priv,UTIL_PIN_CTL ) &UTIL_PIN_ENABLE ,"Backlight is not disabled.\n" ); -WARN_ONCE ((I915_READ (DC_STATE_EN ) &DC_STATE_EN_UPTO_DC6 ), +WARN_ONCE ((intel_de_read (dev_priv,DC_STATE_EN ) &DC_STATE_EN_UPTO_DC6 ),"DC6 already programmed to be enabled.\n" );assert_csr_loaded (dev_priv);
@@ -961,8 +969,8 @@ static void skl_enable_dc6(struct drm_i915_private *dev_priv)/* Wa Display #1183: skl,kbl,cfl */ if (IS_GEN9_BC (dev_priv)) -I915_WRITE (GEN8_CHICKEN_DCPR_1 ,I915_READ (GEN8_CHICKEN_DCPR_1 ) | -SKL_SELECT_ALTERNATE_DC_EXIT ); +intel_de_write (dev_priv,GEN8_CHICKEN_DCPR_1 , +intel_de_read (dev_priv,GEN8_CHICKEN_DCPR_1 ) |SKL_SELECT_ALTERNATE_DC_EXIT );gen9_set_dc_state (dev_priv,DC_STATE_EN_UPTO_DC6 ); }
@@ -973,15 +981,15 @@ static void hsw_power_well_sync_hw(struct drm_i915_private *dev_priv,const struct i915_power_well_regs *regs = power_well->desc->hsw.regs;int pw_idx = power_well->desc->hsw.idx;u32 mask =HSW_PWR_WELL_CTL_REQ (pw_idx); -u32 bios_req =I915_READ (regs->bios); +u32 bios_req =intel_de_read (dev_priv, regs->bios);/* Take over the request bit if set by BIOS. */ if (bios_req & mask) { -u32 drv_req =I915_READ (regs->driver); +u32 drv_req =intel_de_read (dev_priv, regs->driver);if (!(drv_req & mask)) -I915_WRITE (regs->driver, drv_req | mask); -I915_WRITE (regs->bios, bios_req & ~mask); +intel_de_write (dev_priv, regs->driver, drv_req | mask); +intel_de_write (dev_priv, regs->bios, bios_req & ~mask); } }
@@ -1027,13 +1035,13 @@ static void bxt_verify_ddi_phy_power_wells(struct drm_i915_private *dev_priv)static bool gen9_dc_off_power_well_enabled (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -return ((I915_READ (DC_STATE_EN ) &DC_STATE_EN_DC3CO ) ==0 && - (I915_READ (DC_STATE_EN ) &DC_STATE_EN_UPTO_DC5_DC6_MASK ) ==0 ); +return ((intel_de_read (dev_priv,DC_STATE_EN ) &DC_STATE_EN_DC3CO ) ==0 && + (intel_de_read (dev_priv,DC_STATE_EN ) &DC_STATE_EN_UPTO_DC5_DC6_MASK ) ==0 ); }static void gen9_assert_dbuf_enabled (struct drm_i915_private *dev_priv) { -u32 tmp =I915_READ (DBUF_CTL ); +u32 tmp =intel_de_read (dev_priv,DBUF_CTL ); WARN((tmp & (DBUF_POWER_STATE | DBUF_POWER_REQUEST)) != (DBUF_POWER_STATE | DBUF_POWER_REQUEST),
@@ -1113,9 +1121,9 @@ static bool i9xx_always_on_power_well_enabled(struct drm_i915_private *dev_priv,static void i830_pipes_power_well_enable (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -if ((I915_READ (PIPECONF (PIPE_A )) &PIPECONF_ENABLE ) ==0 ) +if ((intel_de_read (dev_priv,PIPECONF (PIPE_A )) &PIPECONF_ENABLE ) ==0 )i830_enable_pipe (dev_priv,PIPE_A ); -if ((I915_READ (PIPECONF (PIPE_B )) &PIPECONF_ENABLE ) ==0 ) +if ((intel_de_read (dev_priv,PIPECONF (PIPE_B )) &PIPECONF_ENABLE ) ==0 )i830_enable_pipe (dev_priv,PIPE_B ); }
@@ -1129,8 +1137,8 @@ static void i830_pipes_power_well_disable(struct drm_i915_private *dev_priv,static bool i830_pipes_power_well_enabled (struct drm_i915_private *dev_priv,struct i915_power_well *power_well) { -return I915_READ (PIPECONF (PIPE_A )) &PIPECONF_ENABLE && -I915_READ (PIPECONF (PIPE_B )) &PIPECONF_ENABLE ; +return intel_de_read (dev_priv,PIPECONF (PIPE_A )) &PIPECONF_ENABLE && +intel_de_read (dev_priv,PIPECONF (PIPE_B )) &PIPECONF_ENABLE ; } static void i830_pipes_power_well_sync_hw(struct drm_i915_private *dev_priv,
@@ -1237,21 +1245,22 @@ static void vlv_init_display_clock_gating(struct drm_i915_private *dev_priv)* (and never recovering) in this case. intel_dsi_post_disable() will * clear it when we turn off the display. */ - val =I915_READ (DSPCLK_GATE_D ); + val =intel_de_read (dev_priv,DSPCLK_GATE_D ); val &=DPOUNIT_CLOCK_GATE_DISABLE ; val |=VRHUNIT_CLOCK_GATE_DISABLE ; -I915_WRITE (DSPCLK_GATE_D , val); +intel_de_write (dev_priv,DSPCLK_GATE_D , val);/* * Disable trickle feed and enable pnd deadline calculation */ -I915_WRITE (MI_ARB_VLV ,MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE ); -I915_WRITE (CBR1_VLV ,0 ); +intel_de_write (dev_priv,MI_ARB_VLV , +MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE ); +intel_de_write (dev_priv,CBR1_VLV ,0 );WARN_ON (dev_priv->rawclk_freq ==0 ); -I915_WRITE (RAWCLK_FREQ_VLV , -DIV_ROUND_CLOSEST (dev_priv->rawclk_freq,1000 )); +intel_de_write (dev_priv,RAWCLK_FREQ_VLV , +DIV_ROUND_CLOSEST (dev_priv->rawclk_freq,1000 )); }static void vlv_display_power_well_init (struct drm_i915_private *dev_priv)
@@ -1268,13 +1277,13 @@ static void vlv_display_power_well_init(struct drm_i915_private *dev_priv)* CHV DPLL B/C have some issues if VGA mode is enabled. */ for_each_pipe (dev_priv, pipe) { -u32 val =I915_READ (DPLL (pipe)); +u32 val =intel_de_read (dev_priv,DPLL (pipe)); val |=DPLL_REF_CLK_ENABLE_VLV |DPLL_VGA_MODE_DIS ;if (pipe !=PIPE_A ) val |=DPLL_INTEGRATED_CRI_CLK_VLV ; -I915_WRITE (DPLL (pipe), val); +intel_de_write (dev_priv,DPLL (pipe), val); }vlv_init_display_clock_gating (dev_priv);
@@ -1354,7 +1363,8 @@ static void vlv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,* both PLLs disabled, or we risk losing DPIO and PLL * synchronization. */ -I915_WRITE (DPIO_CTL ,I915_READ (DPIO_CTL ) |DPIO_CMNRST ); +intel_de_write (dev_priv,DPIO_CTL , +intel_de_read (dev_priv,DPIO_CTL ) |DPIO_CMNRST ); } static void vlv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,
@@ -1366,7 +1376,8 @@ static void vlv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,assert_pll_disabled (dev_priv, pipe);/* Assert common reset */ -I915_WRITE (DPIO_CTL ,I915_READ (DPIO_CTL ) & ~DPIO_CMNRST ); +intel_de_write (dev_priv,DPIO_CTL , +intel_de_read (dev_priv,DPIO_CTL ) & ~DPIO_CMNRST );vlv_set_power_well (dev_priv, power_well, false); }
@@ -1428,7 +1439,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 )) && - (I915_READ (DPLL (PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) + (intel_de_read (dev_priv,DPLL (PIPE_B )) &DPLL_VCO_ENABLE ) ==0 ) phy_status |=PHY_STATUS_CMN_LDO (DPIO_PHY0 ,DPIO_CH1 ); if (BITS_SET(phy_control,
@@ -1475,7 +1486,7 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv) phy_status_mask, phy_status, 10))drm_err (&dev_priv->drm,"Unexpected PHY_STATUS 0x%08x, expected 0x%08x (PHY_CONTROL=0x%08x)\n" , -I915_READ (DISPLAY_PHY_STATUS ) & phy_status_mask, +intel_de_read (dev_priv,DISPLAY_PHY_STATUS ) & phy_status_mask, phy_status, dev_priv->chv_phy_control); }
@@ -1535,7 +1546,8 @@ static void chv_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv,vlv_dpio_put (dev_priv); dev_priv->chv_phy_control |=PHY_COM_LANE_RESET_DEASSERT (phy); -I915_WRITE (DISPLAY_PHY_CONTROL , dev_priv->chv_phy_control); +intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , + dev_priv->chv_phy_control); drm_dbg_kms(&dev_priv->drm, "Enabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n",
@@ -1562,7 +1574,8 @@ static void chv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv, } dev_priv->chv_phy_control &= ~PHY_COM_LANE_RESET_DEASSERT (phy); -I915_WRITE (DISPLAY_PHY_CONTROL , dev_priv->chv_phy_control); +intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , + dev_priv->chv_phy_control);vlv_set_power_well (dev_priv, power_well, false);
@@ -1656,7 +1669,8 @@ bool chv_phy_powergate_ch(struct drm_i915_private *dev_priv, enum dpio_phy phy,else dev_priv->chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); -I915_WRITE (DISPLAY_PHY_CONTROL , dev_priv->chv_phy_control); +intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , + dev_priv->chv_phy_control); drm_dbg_kms(&dev_priv->drm, "Power gating DPIO PHY%d CH%d (DPIO_PHY_CONTROL=0x%08x)\n",
@@ -1688,7 +1702,8 @@ void chv_phy_powergate_lanes(struct intel_encoder *encoder,else dev_priv->chv_phy_control &= ~PHY_CH_POWER_DOWN_OVRD_EN (phy, ch); -I915_WRITE (DISPLAY_PHY_CONTROL , dev_priv->chv_phy_control); +intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , + dev_priv->chv_phy_control); drm_dbg_kms(&dev_priv->drm, "Power gating DPIO PHY%d CH%d lanes 0x%x (PHY_CONTROL=0x%08x)\n",
@@ -4386,13 +4401,13 @@ bool intel_dbuf_slice_set(struct drm_i915_private *dev_priv, {u32 val, status; - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg); val = enable ? (val |DBUF_POWER_REQUEST ) : (val & ~DBUF_POWER_REQUEST ); -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg);udelay (10 ); - status =I915_READ (reg) &DBUF_POWER_STATE ; + status =intel_de_read (dev_priv, reg) &DBUF_POWER_STATE ;if ((enable && !status) || (!enable && status)) {drm_err (&dev_priv->drm,"DBus power %s timeout!\n" , enable ?"enable" :"disable" );
@@ -4444,14 +4459,16 @@ void icl_dbuf_slices_update(struct drm_i915_private *dev_priv,static void icl_dbuf_enable (struct drm_i915_private *dev_priv) { -I915_WRITE (DBUF_CTL_S1 ,I915_READ (DBUF_CTL_S1 ) |DBUF_POWER_REQUEST ); -I915_WRITE (DBUF_CTL_S2 ,I915_READ (DBUF_CTL_S2 ) |DBUF_POWER_REQUEST ); -POSTING_READ (DBUF_CTL_S2 ); +intel_de_write (dev_priv,DBUF_CTL_S1 , +intel_de_read (dev_priv,DBUF_CTL_S1 ) |DBUF_POWER_REQUEST ); +intel_de_write (dev_priv,DBUF_CTL_S2 , +intel_de_read (dev_priv,DBUF_CTL_S2 ) |DBUF_POWER_REQUEST ); +intel_de_posting_read (dev_priv,DBUF_CTL_S2 );udelay (10 ); -if (!(I915_READ (DBUF_CTL_S1 ) &DBUF_POWER_STATE ) || - !(I915_READ (DBUF_CTL_S2 ) &DBUF_POWER_STATE )) +if (!(intel_de_read (dev_priv,DBUF_CTL_S1 ) &DBUF_POWER_STATE ) || + !(intel_de_read (dev_priv,DBUF_CTL_S2 ) &DBUF_POWER_STATE ))drm_err (&dev_priv->drm,"DBuf power enable timeout\n" );else /*
@@ -4463,14 +4480,16 @@ static void icl_dbuf_enable(struct drm_i915_private *dev_priv)static void icl_dbuf_disable (struct drm_i915_private *dev_priv) { -I915_WRITE (DBUF_CTL_S1 ,I915_READ (DBUF_CTL_S1 ) & ~DBUF_POWER_REQUEST ); -I915_WRITE (DBUF_CTL_S2 ,I915_READ (DBUF_CTL_S2 ) & ~DBUF_POWER_REQUEST ); -POSTING_READ (DBUF_CTL_S2 ); +intel_de_write (dev_priv,DBUF_CTL_S1 , +intel_de_read (dev_priv,DBUF_CTL_S1 ) & ~DBUF_POWER_REQUEST ); +intel_de_write (dev_priv,DBUF_CTL_S2 , +intel_de_read (dev_priv,DBUF_CTL_S2 ) & ~DBUF_POWER_REQUEST ); +intel_de_posting_read (dev_priv,DBUF_CTL_S2 );udelay (10 ); -if ((I915_READ (DBUF_CTL_S1 ) &DBUF_POWER_STATE ) || - (I915_READ (DBUF_CTL_S2 ) &DBUF_POWER_STATE )) +if ((intel_de_read (dev_priv,DBUF_CTL_S1 ) &DBUF_POWER_STATE ) || + (intel_de_read (dev_priv,DBUF_CTL_S2 ) &DBUF_POWER_STATE ))drm_err (&dev_priv->drm,"DBuf power disable timeout!\n" );else /*
@@ -4489,12 +4508,12 @@ static void icl_mbus_init(struct drm_i915_private *dev_priv)MBUS_ABOX_B_CREDIT (1 ) |MBUS_ABOX_BW_CREDIT (1 ); -I915_WRITE (MBUS_ABOX_CTL , val); +intel_de_write (dev_priv,MBUS_ABOX_CTL , val); }static void hsw_assert_cdclk (struct drm_i915_private *dev_priv) { -u32 val =I915_READ (LCPLL_CTL ); +u32 val =intel_de_read (dev_priv,LCPLL_CTL );/* * The LCPLL register should be turned on by the BIOS. For now
@@ -4521,26 +4540,26 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv)I915_STATE_WARN (crtc->active,"CRTC for pipe %c enabled\n" ,pipe_name (crtc->pipe)); -I915_STATE_WARN (I915_READ (HSW_PWR_WELL_CTL2 ), +I915_STATE_WARN (intel_de_read (dev_priv,HSW_PWR_WELL_CTL2 ),"Display power well on\n" ); -I915_STATE_WARN (I915_READ (SPLL_CTL ) &SPLL_PLL_ENABLE , +I915_STATE_WARN (intel_de_read (dev_priv,SPLL_CTL ) &SPLL_PLL_ENABLE ,"SPLL enabled\n" ); -I915_STATE_WARN (I915_READ (WRPLL_CTL (0 )) &WRPLL_PLL_ENABLE , +I915_STATE_WARN (intel_de_read (dev_priv,WRPLL_CTL (0 )) &WRPLL_PLL_ENABLE ,"WRPLL1 enabled\n" ); -I915_STATE_WARN (I915_READ (WRPLL_CTL (1 )) &WRPLL_PLL_ENABLE , +I915_STATE_WARN (intel_de_read (dev_priv,WRPLL_CTL (1 )) &WRPLL_PLL_ENABLE ,"WRPLL2 enabled\n" ); -I915_STATE_WARN (I915_READ (PP_STATUS (0 )) &PP_ON , +I915_STATE_WARN (intel_de_read (dev_priv,PP_STATUS (0 )) &PP_ON ,"Panel power on\n" ); -I915_STATE_WARN (I915_READ (BLC_PWM_CPU_CTL2 ) &BLM_PWM_ENABLE , +I915_STATE_WARN (intel_de_read (dev_priv,BLC_PWM_CPU_CTL2 ) &BLM_PWM_ENABLE ,"CPU PWM1 enabled\n" );if (IS_HASWELL (dev_priv)) -I915_STATE_WARN (I915_READ (HSW_BLC_PWM2_CTL ) &BLM_PWM_ENABLE , +I915_STATE_WARN (intel_de_read (dev_priv,HSW_BLC_PWM2_CTL ) &BLM_PWM_ENABLE ,"CPU PWM2 enabled\n" ); -I915_STATE_WARN (I915_READ (BLC_PWM_PCH_CTL1 ) &BLM_PCH_PWM_ENABLE , +I915_STATE_WARN (intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 ) &BLM_PCH_PWM_ENABLE ,"PCH PWM1 enabled\n" ); -I915_STATE_WARN (I915_READ (UTIL_PIN_CTL ) &UTIL_PIN_ENABLE , +I915_STATE_WARN (intel_de_read (dev_priv,UTIL_PIN_CTL ) &UTIL_PIN_ENABLE ,"Utility pin enabled\n" ); -I915_STATE_WARN (I915_READ (PCH_GTC_CTL ) &PCH_GTC_ENABLE , +I915_STATE_WARN (intel_de_read (dev_priv,PCH_GTC_CTL ) &PCH_GTC_ENABLE ,"PCH GTC enabled\n" );/*
@@ -4555,9 +4574,9 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv)static u32 hsw_read_dcomp (struct drm_i915_private *dev_priv) {if (IS_HASWELL (dev_priv)) -return I915_READ (D_COMP_HSW ); +return intel_de_read (dev_priv,D_COMP_HSW );else -return I915_READ (D_COMP_BDW ); +return intel_de_read (dev_priv,D_COMP_BDW ); }static void hsw_write_dcomp (struct drm_i915_private *dev_priv,u32 val)
@@ -4568,8 +4587,8 @@ static void hsw_write_dcomp(struct drm_i915_private *dev_priv, u32 val)drm_dbg_kms (&dev_priv->drm,"Failed to write to D_COMP\n" ); }else { -I915_WRITE (D_COMP_BDW , val); -POSTING_READ (D_COMP_BDW ); +intel_de_write (dev_priv,D_COMP_BDW , val); +intel_de_posting_read (dev_priv,D_COMP_BDW ); } }
@@ -4588,22 +4607,22 @@ static void hsw_disable_lcpll(struct drm_i915_private *dev_priv,assert_can_disable_lcpll (dev_priv); - val =I915_READ (LCPLL_CTL ); + val =intel_de_read (dev_priv,LCPLL_CTL );if (switch_to_fclk) { val |=LCPLL_CD_SOURCE_FCLK ; -I915_WRITE (LCPLL_CTL , val); +intel_de_write (dev_priv,LCPLL_CTL , val); -if (wait_for_us (I915_READ (LCPLL_CTL ) & +if (wait_for_us (intel_de_read (dev_priv,LCPLL_CTL ) &LCPLL_CD_SOURCE_FCLK_DONE ,1 ))drm_err (&dev_priv->drm,"Switching to FCLK failed\n" ); - val =I915_READ (LCPLL_CTL ); + val =intel_de_read (dev_priv,LCPLL_CTL ); } val |=LCPLL_PLL_DISABLE ; -I915_WRITE (LCPLL_CTL , val); -POSTING_READ (LCPLL_CTL ); +intel_de_write (dev_priv,LCPLL_CTL , val); +intel_de_posting_read (dev_priv,LCPLL_CTL );if (intel_de_wait_for_clear (dev_priv,LCPLL_CTL ,LCPLL_PLL_LOCK ,1 ))drm_err (&dev_priv->drm,"LCPLL still locked\n" );
@@ -4618,10 +4637,10 @@ static void hsw_disable_lcpll(struct drm_i915_private *dev_priv,drm_err (&dev_priv->drm,"D_COMP RCOMP still in progress\n" );if (allow_power_down) { - val =I915_READ (LCPLL_CTL ); + val =intel_de_read (dev_priv,LCPLL_CTL ); val |=LCPLL_POWER_DOWN_ALLOW ; -I915_WRITE (LCPLL_CTL , val); -POSTING_READ (LCPLL_CTL ); +intel_de_write (dev_priv,LCPLL_CTL , val); +intel_de_posting_read (dev_priv,LCPLL_CTL ); } }
@@ -4633,7 +4652,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) {u32 val; - val =I915_READ (LCPLL_CTL ); + val =intel_de_read (dev_priv,LCPLL_CTL );if ((val & (LCPLL_PLL_LOCK |LCPLL_PLL_DISABLE |LCPLL_CD_SOURCE_FCLK |LCPLL_POWER_DOWN_ALLOW )) ==LCPLL_PLL_LOCK )
@@ -4647,8 +4666,8 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)if (val &LCPLL_POWER_DOWN_ALLOW ) { val &= ~LCPLL_POWER_DOWN_ALLOW ; -I915_WRITE (LCPLL_CTL , val); -POSTING_READ (LCPLL_CTL ); +intel_de_write (dev_priv,LCPLL_CTL , val); +intel_de_posting_read (dev_priv,LCPLL_CTL ); } val =hsw_read_dcomp (dev_priv);
@@ -4656,19 +4675,19 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv) val &= ~D_COMP_COMP_DISABLE ;hsw_write_dcomp (dev_priv, val); - val =I915_READ (LCPLL_CTL ); + val =intel_de_read (dev_priv,LCPLL_CTL ); val &= ~LCPLL_PLL_DISABLE ; -I915_WRITE (LCPLL_CTL , val); +intel_de_write (dev_priv,LCPLL_CTL , val);if (intel_de_wait_for_set (dev_priv,LCPLL_CTL ,LCPLL_PLL_LOCK ,5 ))drm_err (&dev_priv->drm,"LCPLL not locked yet\n" );if (val &LCPLL_CD_SOURCE_FCLK ) { - val =I915_READ (LCPLL_CTL ); + val =intel_de_read (dev_priv,LCPLL_CTL ); val &= ~LCPLL_CD_SOURCE_FCLK ; -I915_WRITE (LCPLL_CTL , val); +intel_de_write (dev_priv,LCPLL_CTL , val); -if (wait_for_us ((I915_READ (LCPLL_CTL ) & +if (wait_for_us ((intel_de_read (dev_priv,LCPLL_CTL ) &LCPLL_CD_SOURCE_FCLK_DONE ) ==0 ,1 ))drm_err (&dev_priv->drm,"Switching back to LCPLL failed\n" );
@@ -4710,9 +4729,9 @@ static void hsw_enable_pc8(struct drm_i915_private *dev_priv)drm_dbg_kms (&dev_priv->drm,"Enabling package C8+\n" );if (HAS_PCH_LPT_LP (dev_priv)) { - val =I915_READ (SOUTH_DSPCLK_GATE_D ); + val =intel_de_read (dev_priv,SOUTH_DSPCLK_GATE_D ); val &= ~PCH_LP_PARTITION_LEVEL_DISABLE ; -I915_WRITE (SOUTH_DSPCLK_GATE_D , val); +intel_de_write (dev_priv,SOUTH_DSPCLK_GATE_D , val); }lpt_disable_clkout_dp (dev_priv);
@@ -4729,9 +4748,9 @@ static void hsw_disable_pc8(struct drm_i915_private *dev_priv)intel_init_pch_refclk (dev_priv);if (HAS_PCH_LPT_LP (dev_priv)) { - val =I915_READ (SOUTH_DSPCLK_GATE_D ); + val =intel_de_read (dev_priv,SOUTH_DSPCLK_GATE_D ); val |=PCH_LP_PARTITION_LEVEL_DISABLE ; -I915_WRITE (SOUTH_DSPCLK_GATE_D , val); +intel_de_write (dev_priv,SOUTH_DSPCLK_GATE_D , val); } }
@@ -4749,14 +4768,14 @@ static void intel_pch_reset_handshake(struct drm_i915_private *dev_priv, reset_bits =RESET_PCH_HANDSHAKE_ENABLE ; } - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg);if (enable) val |= reset_bits;else val &= ~reset_bits; -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val); } static void skl_display_core_init(struct drm_i915_private *dev_priv,
@@ -4984,11 +5003,13 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)if (table[i].page_mask ==0 ) {drm_dbg (&dev_priv->drm,"Unknown memory configuration; disabling address buddy logic.\n" ); -I915_WRITE (BW_BUDDY1_CTL ,BW_BUDDY_DISABLE ); -I915_WRITE (BW_BUDDY2_CTL ,BW_BUDDY_DISABLE ); +intel_de_write (dev_priv,BW_BUDDY1_CTL ,BW_BUDDY_DISABLE ); +intel_de_write (dev_priv,BW_BUDDY2_CTL ,BW_BUDDY_DISABLE ); }else { -I915_WRITE (BW_BUDDY1_PAGE_MASK , table[i].page_mask); -I915_WRITE (BW_BUDDY2_PAGE_MASK , table[i].page_mask); +intel_de_write (dev_priv,BW_BUDDY1_PAGE_MASK , + table[i].page_mask); +intel_de_write (dev_priv,BW_BUDDY2_PAGE_MASK , + table[i].page_mask); } }
@@ -5090,7 +5111,7 @@ static void chv_phy_control_init(struct drm_i915_private *dev_priv)* current lane status. */ if (cmn_bc->desc->ops->is_enabled (dev_priv, cmn_bc)) { -u32 status =I915_READ (DPLL (PIPE_A )); +u32 status =intel_de_read (dev_priv,DPLL (PIPE_A ));unsigned int mask; mask = status &DPLL_PORTB_READY_MASK ;
@@ -5121,7 +5142,7 @@ static void chv_phy_control_init(struct drm_i915_private *dev_priv) }if (cmn_d->desc->ops->is_enabled (dev_priv, cmn_d)) { -u32 status =I915_READ (DPIO_PHY_STATUS ); +u32 status =intel_de_read (dev_priv,DPIO_PHY_STATUS );unsigned int mask; mask = status &DPLL_PORTD_READY_MASK ;
@@ -5142,7 +5163,8 @@ static void chv_phy_control_init(struct drm_i915_private *dev_priv) dev_priv->chv_phy_assert[DPIO_PHY1 ] = true; } -I915_WRITE (DISPLAY_PHY_CONTROL , dev_priv->chv_phy_control); +intel_de_write (dev_priv,DISPLAY_PHY_CONTROL , + dev_priv->chv_phy_control);drm_dbg_kms (&dev_priv->drm,"Initial PHY_CONTROL=0x%08x\n" , dev_priv->chv_phy_control);
@@ -5158,7 +5180,7 @@ static void vlv_cmnlane_wa(struct drm_i915_private *dev_priv)/* If the display might be already active skip this */ if (cmn->desc->ops->is_enabled (dev_priv, cmn) && disp2d->desc->ops->is_enabled (dev_priv, disp2d) && -I915_READ (DPIO_CTL ) &DPIO_CMNRST ) +intel_de_read (dev_priv,DPIO_CTL ) &DPIO_CMNRST )return ;drm_dbg_kms (&dev_priv->drm,"toggling display PHY side reset\n" );
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/8 drm/i915/hdcp: use intel_de_*() functions for register access
In reply to Jani NikulaThe implicit "dev_priv" local variable use has been a long-standing pain point in the register access macros I915_READ(), I915_WRITE(), POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register accessors intel_de_read(), intel_de_write(), intel_de_posting_read(), intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
--- drivers/gpu/drm/i915/display/intel_hdcp.c | 142 ++++++++++++---------- 1 file changed, 79 insertions(+), 63 deletions(-)
drivers/gpu/drm/i915/display/intel_hdcp.c +79 -63
@@ -112,7 +112,8 @@ static inlinebool intel_hdcp_in_use (struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder,enum port port) { -return I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, port)) & +return intel_de_read (dev_priv, +HDCP_STATUS (dev_priv, cpu_transcoder, port)) &HDCP_STATUS_ENC ; }
@@ -120,7 +121,8 @@ static inlinebool intel_hdcp2_in_use (struct drm_i915_private *dev_priv,enum transcoder cpu_transcoder,enum port port) { -return I915_READ (HDCP2_STATUS (dev_priv, cpu_transcoder, port)) & +return intel_de_read (dev_priv, +HDCP2_STATUS (dev_priv, cpu_transcoder, port)) &LINK_ENCRYPTION_STATUS ; }
@@ -184,9 +186,9 @@ static bool hdcp_key_loadable(struct drm_i915_private *dev_priv)static void intel_hdcp_clear_keys (struct drm_i915_private *dev_priv) { -I915_WRITE (HDCP_KEY_CONF ,HDCP_CLEAR_KEYS_TRIGGER ); -I915_WRITE (HDCP_KEY_STATUS ,HDCP_KEY_LOAD_DONE |HDCP_KEY_LOAD_STATUS | -HDCP_FUSE_IN_PROGRESS |HDCP_FUSE_ERROR |HDCP_FUSE_DONE ); +intel_de_write (dev_priv,HDCP_KEY_CONF ,HDCP_CLEAR_KEYS_TRIGGER ); +intel_de_write (dev_priv,HDCP_KEY_STATUS , +HDCP_KEY_LOAD_DONE |HDCP_KEY_LOAD_STATUS |HDCP_FUSE_IN_PROGRESS |HDCP_FUSE_ERROR |HDCP_FUSE_DONE ); }static int intel_hdcp_load_keys (struct drm_i915_private *dev_priv)
@@ -194,7 +196,7 @@ static int intel_hdcp_load_keys(struct drm_i915_private *dev_priv)int ret;u32 val; - val =I915_READ (HDCP_KEY_STATUS ); + val =intel_de_read (dev_priv,HDCP_KEY_STATUS );if ((val &HDCP_KEY_LOAD_DONE ) && (val &HDCP_KEY_LOAD_STATUS ))return 0 ;
@@ -203,7 +205,7 @@ static int intel_hdcp_load_keys(struct drm_i915_private *dev_priv)* out of reset. So if Key is not already loaded, its an error state. */ if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) -if (!(I915_READ (HDCP_KEY_STATUS ) &HDCP_KEY_LOAD_DONE )) +if (!(intel_de_read (dev_priv,HDCP_KEY_STATUS ) &HDCP_KEY_LOAD_DONE ))return -ENXIO ;/*
@@ -223,7 +225,7 @@ static int intel_hdcp_load_keys(struct drm_i915_private *dev_priv)return ret; } }else { -I915_WRITE (HDCP_KEY_CONF ,HDCP_KEY_LOAD_TRIGGER ); +intel_de_write (dev_priv,HDCP_KEY_CONF ,HDCP_KEY_LOAD_TRIGGER ); }/* Wait for the keys to load (500us) */
@@ -236,7 +238,7 @@ static int intel_hdcp_load_keys(struct drm_i915_private *dev_priv)return -ENXIO ;/* Send Aksv over to PCH display for use in authentication */ -I915_WRITE (HDCP_KEY_CONF ,HDCP_AKSV_SEND_TRIGGER ); +intel_de_write (dev_priv,HDCP_KEY_CONF ,HDCP_AKSV_SEND_TRIGGER );return 0 ; }
@@ -244,7 +246,7 @@ static int intel_hdcp_load_keys(struct drm_i915_private *dev_priv)/* Returns updated SHA-1 index */ static int intel_write_sha_text (struct drm_i915_private *dev_priv,u32 sha_text) { -I915_WRITE (HDCP_SHA_TEXT , sha_text); +intel_de_write (dev_priv,HDCP_SHA_TEXT , sha_text);if (intel_de_wait_for_set (dev_priv,HDCP_REP_CTL ,HDCP_SHA1_READY ,1 )) {drm_err (&dev_priv->drm,"Timed out waiting for SHA1 ready\n" );return -ETIMEDOUT ;
@@ -311,7 +313,7 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector, ret = shim->read_v_prime_part (intel_dig_port, i, &vprime);if (ret)return ret; -I915_WRITE (HDCP_SHA_V_PRIME (i), vprime); +intel_de_write (dev_priv,HDCP_SHA_V_PRIME (i), vprime); }/*
@@ -328,7 +330,7 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector, sha_text =0 ; sha_leftovers =0 ; rep_ctl =intel_hdcp_get_repeater_ctl (dev_priv, cpu_transcoder, port); -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_32 ); +intel_de_write (dev_priv,HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_32 );for (i =0 ; i < num_downstream; i++) {unsigned int sha_empty;u8 *ksv = &ksv_fifo[i *DRM_HDCP_KSV_LEN ];
@@ -345,7 +347,8 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector,/* Programming guide writes this every 64 bytes */ sha_idx +=sizeof (sha_text);if (!(sha_idx %64 )) -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_32 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_32 );/* Store the leftover bytes from the ksv in sha_text */ sha_leftovers =DRM_HDCP_KSV_LEN - sha_empty;
@@ -377,7 +380,8 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector,*/ if (sha_leftovers ==0 ) {/* Write 16 bits of text, 16 bits of M0 */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_16 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_16 ); ret =intel_write_sha_text (dev_priv, bstatus[0 ] <<8 | bstatus[1 ]);if (ret <0 )
@@ -385,14 +389,16 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector, sha_idx +=sizeof (sha_text);/* Write 32 bits of M0 */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_0 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_0 ); ret =intel_write_sha_text (dev_priv,0 );if (ret <0 )return ret; sha_idx +=sizeof (sha_text);/* Write 16 bits of M0 */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_16 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_16 ); ret =intel_write_sha_text (dev_priv,0 );if (ret <0 )return ret;
@@ -400,7 +406,8 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector, }else if (sha_leftovers ==1 ) {/* Write 24 bits of text, 8 bits of M0 */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_24 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_24 ); sha_text |= bstatus[0 ] <<16 | bstatus[1 ] <<8 ;/* Only 24-bits of data, must be in the LSB */ sha_text = (sha_text &0xffffff00 ) >>8 ;
@@ -410,14 +417,16 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector, sha_idx +=sizeof (sha_text);/* Write 32 bits of M0 */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_0 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_0 ); ret =intel_write_sha_text (dev_priv,0 );if (ret <0 )return ret; sha_idx +=sizeof (sha_text);/* Write 24 bits of M0 */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_8 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_8 ); ret =intel_write_sha_text (dev_priv,0 );if (ret <0 )return ret;
@@ -425,7 +434,8 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector, }else if (sha_leftovers ==2 ) {/* Write 32 bits of text */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_32 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_32 ); sha_text |= bstatus[0 ] <<24 | bstatus[1 ] <<16 ; ret =intel_write_sha_text (dev_priv, sha_text);if (ret <0 )
@@ -433,7 +443,8 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector, sha_idx +=sizeof (sha_text);/* Write 64 bits of M0 */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_0 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_0 );for (i =0 ; i <2 ; i++) { ret =intel_write_sha_text (dev_priv,0 );if (ret <0 )
@@ -442,7 +453,8 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector, } }else if (sha_leftovers ==3 ) {/* Write 32 bits of text */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_32 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_32 ); sha_text |= bstatus[0 ] <<24 ; ret =intel_write_sha_text (dev_priv, sha_text);if (ret <0 )
@@ -450,21 +462,24 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector, sha_idx +=sizeof (sha_text);/* Write 8 bits of text, 24 bits of M0 */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_8 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_8 ); ret =intel_write_sha_text (dev_priv, bstatus[1 ]);if (ret <0 )return ret; sha_idx +=sizeof (sha_text);/* Write 32 bits of M0 */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_0 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_0 ); ret =intel_write_sha_text (dev_priv,0 );if (ret <0 )return ret; sha_idx +=sizeof (sha_text);/* Write 8 bits of M0 */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_24 ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_TEXT_24 ); ret =intel_write_sha_text (dev_priv,0 );if (ret <0 )return ret;
@@ -475,7 +490,7 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector,return -EINVAL ; } -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_32 ); +intel_de_write (dev_priv,HDCP_REP_CTL , rep_ctl |HDCP_SHA1_TEXT_32 );/* Fill up to 64-4 bytes with zeros (leave the last write for length) */ while ((sha_idx %64 ) < (64 -sizeof (sha_text))) { ret =intel_write_sha_text (dev_priv,0 );
@@ -495,13 +510,14 @@ int intel_hdcp_validate_v_prime(struct intel_connector *connector,return ret;/* Tell the HW we're done with the hash and wait for it to ACK */ -I915_WRITE (HDCP_REP_CTL , rep_ctl |HDCP_SHA1_COMPLETE_HASH ); +intel_de_write (dev_priv,HDCP_REP_CTL , + rep_ctl |HDCP_SHA1_COMPLETE_HASH );if (intel_de_wait_for_set (dev_priv,HDCP_REP_CTL ,HDCP_SHA1_COMPLETE ,1 )) {DRM_ERROR ("Timed out waiting for SHA1 complete\n" );return -ETIMEDOUT ; } -if (!(I915_READ (HDCP_REP_CTL ) &HDCP_SHA1_V_MATCH )) { +if (!(intel_de_read (dev_priv,HDCP_REP_CTL ) &HDCP_SHA1_V_MATCH )) {DRM_DEBUG_KMS ("SHA-1 mismatch, HDCP failed\n" );return -ENXIO ; }
@@ -633,10 +649,11 @@ static int intel_hdcp_auth(struct intel_connector *connector)/* Initialize An with 2 random values and acquire it */ for (i =0 ; i <2 ; i++) -I915_WRITE (HDCP_ANINIT (dev_priv, cpu_transcoder, port), -get_random_u32 ()); -I915_WRITE (HDCP_CONF (dev_priv, cpu_transcoder, port), -HDCP_CONF_CAPTURE_AN ); +intel_de_write (dev_priv, +HDCP_ANINIT (dev_priv, cpu_transcoder, port), +get_random_u32 ()); +intel_de_write (dev_priv,HDCP_CONF (dev_priv, cpu_transcoder, port), +HDCP_CONF_CAPTURE_AN );/* Wait for An to be acquired */ if (intel_de_wait_for_set(dev_priv,
@@ -646,8 +663,10 @@ static int intel_hdcp_auth(struct intel_connector *connector)return -ETIMEDOUT ; } - an.reg[0 ] =I915_READ (HDCP_ANLO (dev_priv, cpu_transcoder, port)); - an.reg[1 ] =I915_READ (HDCP_ANHI (dev_priv, cpu_transcoder, port)); + an.reg[0 ] =intel_de_read (dev_priv, +HDCP_ANLO (dev_priv, cpu_transcoder, port)); + an.reg[1 ] =intel_de_read (dev_priv, +HDCP_ANHI (dev_priv, cpu_transcoder, port)); ret = shim->write_an_aksv (intel_dig_port, an.shim);if (ret)return ret;
@@ -665,26 +684,27 @@ static int intel_hdcp_auth(struct intel_connector *connector)return -EPERM ; } -I915_WRITE (HDCP_BKSVLO (dev_priv, cpu_transcoder, port), bksv.reg[0 ]); -I915_WRITE (HDCP_BKSVHI (dev_priv, cpu_transcoder, port), bksv.reg[1 ]); +intel_de_write (dev_priv,HDCP_BKSVLO (dev_priv, cpu_transcoder, port), + bksv.reg[0 ]); +intel_de_write (dev_priv,HDCP_BKSVHI (dev_priv, cpu_transcoder, port), + bksv.reg[1 ]); ret = shim->repeater_present (intel_dig_port, &repeater_present);if (ret)return ret;if (repeater_present) -I915_WRITE (HDCP_REP_CTL , -intel_hdcp_get_repeater_ctl (dev_priv, cpu_transcoder, - port)); +intel_de_write (dev_priv,HDCP_REP_CTL , +intel_hdcp_get_repeater_ctl (dev_priv, cpu_transcoder, port)); ret = shim->toggle_signalling (intel_dig_port, true);if (ret)return ret; -I915_WRITE (HDCP_CONF (dev_priv, cpu_transcoder, port), -HDCP_CONF_AUTH_AND_ENC ); +intel_de_write (dev_priv,HDCP_CONF (dev_priv, cpu_transcoder, port), +HDCP_CONF_AUTH_AND_ENC );/* Wait for R0 ready */ -if (wait_for (I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, port)) & +if (wait_for (intel_de_read (dev_priv,HDCP_STATUS (dev_priv, cpu_transcoder, port)) & (HDCP_STATUS_R0_READY |HDCP_STATUS_ENC ),1 )) {DRM_ERROR ("Timed out waiting for R0 ready\n" );return -ETIMEDOUT ;
@@ -712,19 +732,19 @@ static int intel_hdcp_auth(struct intel_connector *connector) ret = shim->read_ri_prime (intel_dig_port, ri.shim);if (ret)return ret; -I915_WRITE (HDCP_RPRIME (dev_priv, cpu_transcoder, port), ri.reg); +intel_de_write (dev_priv, +HDCP_RPRIME (dev_priv, cpu_transcoder, port), + ri.reg);/* Wait for Ri prime match */ -if (!wait_for (I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, - port)) & - (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 )) +if (!wait_for (intel_de_read (dev_priv,HDCP_STATUS (dev_priv, cpu_transcoder, port)) & + (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 ))break ; }if (i == tries) {DRM_DEBUG_KMS ("Timed out waiting for Ri prime match (%x)\n" , -I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, - port))); +intel_de_read (dev_priv,HDCP_STATUS (dev_priv, cpu_transcoder, port)));return -ETIMEDOUT ; }
@@ -762,7 +782,7 @@ static int _intel_hdcp_disable(struct intel_connector *connector) connector->base.name, connector->base.base.id); hdcp->hdcp_encrypted = false; -I915_WRITE (HDCP_CONF (dev_priv, cpu_transcoder, port),0 ); +intel_de_write (dev_priv,HDCP_CONF (dev_priv, cpu_transcoder, port),0 );if (intel_de_wait_for_clear (dev_priv,HDCP_STATUS (dev_priv, cpu_transcoder, port), ~0 ,ENCRYPT_STATUS_CHANGE_TIMEOUT_MS )) {
@@ -856,8 +876,7 @@ static int intel_hdcp_check_link(struct intel_connector *connector)drm_err (&dev_priv->drm,"%s:%d HDCP link stopped encryption,%x\n" , connector->base.name, connector->base.base.id, -I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, - port))); +intel_de_read (dev_priv,HDCP_STATUS (dev_priv, cpu_transcoder, port))); ret = -ENXIO ; hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;schedule_work (&hdcp->prop_work);
@@ -1542,7 +1561,7 @@ static int hdcp2_enable_encryption(struct intel_connector *connector)enum transcoder cpu_transcoder = hdcp->cpu_transcoder;int ret; -WARN_ON (I915_READ (HDCP2_STATUS (dev_priv, cpu_transcoder, port)) & +WARN_ON (intel_de_read (dev_priv,HDCP2_STATUS (dev_priv, cpu_transcoder, port)) &LINK_ENCRYPTION_STATUS );if (hdcp->shim->toggle_signalling) { ret = hdcp->shim->toggle_signalling (intel_dig_port, true);
@@ -1554,13 +1573,12 @@ static int hdcp2_enable_encryption(struct intel_connector *connector) } } -if (I915_READ (HDCP2_STATUS (dev_priv, cpu_transcoder, port)) & +if (intel_de_read (dev_priv,HDCP2_STATUS (dev_priv, cpu_transcoder, port)) &LINK_AUTH_STATUS ) {/* Link is Authenticated. Now set for Encryption */ -I915_WRITE (HDCP2_CTL (dev_priv, cpu_transcoder, port), -I915_READ (HDCP2_CTL (dev_priv, cpu_transcoder, - port)) | -CTL_LINK_ENCRYPTION_REQ ); +intel_de_write (dev_priv, +HDCP2_CTL (dev_priv, cpu_transcoder, port), +intel_de_read (dev_priv,HDCP2_CTL (dev_priv, cpu_transcoder, port)) |CTL_LINK_ENCRYPTION_REQ ); } ret = intel_de_wait_for_set(dev_priv,
@@ -1581,12 +1599,11 @@ static int hdcp2_disable_encryption(struct intel_connector *connector)enum transcoder cpu_transcoder = hdcp->cpu_transcoder;int ret; -WARN_ON (!(I915_READ (HDCP2_STATUS (dev_priv, cpu_transcoder, port)) & +WARN_ON (!(intel_de_read (dev_priv,HDCP2_STATUS (dev_priv, cpu_transcoder, port)) &LINK_ENCRYPTION_STATUS )); -I915_WRITE (HDCP2_CTL (dev_priv, cpu_transcoder, port), -I915_READ (HDCP2_CTL (dev_priv, cpu_transcoder, port)) & - ~CTL_LINK_ENCRYPTION_REQ ); +intel_de_write (dev_priv,HDCP2_CTL (dev_priv, cpu_transcoder, port), +intel_de_read (dev_priv,HDCP2_CTL (dev_priv, cpu_transcoder, port)) & ~CTL_LINK_ENCRYPTION_REQ ); ret = intel_de_wait_for_clear(dev_priv, HDCP2_STATUS(dev_priv, cpu_transcoder,
@@ -1706,8 +1723,7 @@ static int intel_hdcp2_check_link(struct intel_connector *connector)if (WARN_ON (!intel_hdcp2_in_use (dev_priv, cpu_transcoder, port))) {drm_err (&dev_priv->drm,"HDCP2.2 link stopped the encryption, %x\n" , -I915_READ (HDCP2_STATUS (dev_priv, cpu_transcoder, - port))); +intel_de_read (dev_priv,HDCP2_STATUS (dev_priv, cpu_transcoder, port))); ret = -ENXIO ; hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;schedule_work (&hdcp->prop_work);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: mass conversion to intel_de_*() register accessors (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: mass conversion to intel_de_*() register accessors (rev2)
URL : https://patchwork.freedesktop.org/series/72533/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip e3fe468e8ec9 drm/i915/icl_dsi: use intel_de_*() functions for register access bfcd10dad4e2 drm/i915/combo_phy: use intel_de_*() functions for register access b38e2a044bff drm/i915/ddi: use intel_de_*() functions for register access -:131: WARNING:LONG_LINE: line over 100 characters #131: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:1168: + FDI_RX_PWRDN_LANE1_VAL(2) | FDI_RX_PWRDN_LANE0_VAL(2) | FDI_RX_TP1_TO_TP2_48 | FDI_RX_FDI_DELAY_90);
-:164: WARNING:LONG_LINE: line over 100 characters #164: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:1192:
+ DP_TP_CTL_FDI_AUTOTRAIN | DP_TP_CTL_ENHANCED_FRAME_ENABLE | DP_TP_CTL_LINK_TRAIN_PAT1 | DP_TP_CTL_ENABLE);
-:176: WARNING:LONG_LINE: line over 100 characters #176: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:1199:
+ DDI_BUF_CTL_ENABLE | ((crtc_state->fdi_lanes - 1) << 1) | DDI_BUF_TRANS_SELECT(i / 2));
-:259: WARNING:LONG_LINE: line over 100 characters #259: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:1267:
+ DP_TP_CTL_FDI_AUTOTRAIN | DP_TP_CTL_LINK_TRAIN_NORMAL | DP_TP_CTL_ENHANCED_FRAME_ENABLE | DP_TP_CTL_ENABLE);
-:956: WARNING:LONG_LINE: line over 100 characters #956: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:3211:
+ intel_de_read(dev_priv, DPCLKA_CFGCR0) | DPCLKA_CFGCR0_DDI_CLK_OFF(port));
total: 0 errors, 5 warnings, 0 checks, 1137 lines checked 9e1d8d3f24f2 drm/i915/display: use intel_de_*() functions for register access -:66: WARNING:LONG_LINE: line over 100 characters
#66: FILE: drivers/gpu/drm/i915/display/intel_display.c:523:
+ intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) | DUPS1_GATING_DIS | DUPS2_GATING_DIS);
-:66: ERROR:CODE_INDENT: code indent should use tabs where possible #66: FILE: drivers/gpu/drm/i915/display/intel_display.c:523:
+^I^I intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) | DUPS1_GATING_DIS | DUPS2_GATING_DIS);$
-:72: WARNING:LONG_LINE: line over 100 characters #72: FILE: drivers/gpu/drm/i915/display/intel_display.c:526:
+ intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) & ~(DUPS1_GATING_DIS | DUPS2_GATING_DIS));
-:72: ERROR:CODE_INDENT: code indent should use tabs where possible #72: FILE: drivers/gpu/drm/i915/display/intel_display.c:526:
+^I^I intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) & ~(DUPS1_GATING_DIS | DUPS2_GATING_DIS));$
-:83: ERROR:CODE_INDENT: code indent should use tabs where possible #83: FILE: drivers/gpu/drm/i915/display/intel_display.c:536:
+^I^I intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) | DPFR_GATING_DIS);$
-:88: ERROR:CODE_INDENT: code indent should use tabs where possible #88: FILE: drivers/gpu/drm/i915/display/intel_display.c:539:
+^I^I intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) & ~DPFR_GATING_DIS);$
-:659: WARNING:LONG_LINE: line over 100 characters #659: FILE: drivers/gpu/drm/i915/display/intel_display.c:5035:
+ intel_de_read(dev_priv, reg) | FDI_FS_ERRC_ENABLE | FDI_FE_ERRC_ENABLE);
-:659: ERROR:CODE_INDENT: code indent should use tabs where possible #659: FILE: drivers/gpu/drm/i915/display/intel_display.c:5035:
+^I^I intel_de_read(dev_priv, reg) | FDI_FS_ERRC_ENABLE | FDI_FE_ERRC_ENABLE);$
-:1590: WARNING:LONG_LINE: line over 100 characters #1590: FILE: drivers/gpu/drm/i915/display/intel_display.c:8298:
+ pipe_config->dpll_hw_state.dpll & ~(DPLL_VCO_ENABLE | DPLL_EXT_BUFFER_ENABLE_VLV));
-:1631: ERROR:CODE_INDENT: code indent should use tabs where possible #1631: FILE: drivers/gpu/drm/i915/display/intel_display.c:8699:
+^I^I vsyncshift);$
-:1634: WARNING:LONG_LINE: line over 100 characters #1634: FILE: drivers/gpu/drm/i915/display/intel_display.c:8702:
+ (adjusted_mode->crtc_hdisplay - 1) | ((adjusted_mode->crtc_htotal - 1) << 16));
-:1636: WARNING:LONG_LINE: line over 100 characters #1636: FILE: drivers/gpu/drm/i915/display/intel_display.c:8704:
+ (adjusted_mode->crtc_hblank_start - 1) | ((adjusted_mode->crtc_hblank_end - 1) << 16));
-:1638: WARNING:LONG_LINE: line over 100 characters #1638: FILE: drivers/gpu/drm/i915/display/intel_display.c:8706:
+ (adjusted_mode->crtc_hsync_start - 1) | ((adjusted_mode->crtc_hsync_end - 1) << 16));
-:1645: WARNING:LONG_LINE: line over 100 characters #1645: FILE: drivers/gpu/drm/i915/display/intel_display.c:8713:
+ (adjusted_mode->crtc_vsync_start - 1) | ((adjusted_mode->crtc_vsync_end - 1) << 16));
-:1655: ERROR:CODE_INDENT: code indent should use tabs where possible #1655: FILE: drivers/gpu/drm/i915/display/intel_display.c:8722:
+^I^I intel_de_read(dev_priv, VTOTAL(cpu_transcoder)));$
-:1676: WARNING:LONG_LINE: line over 100 characters #1676: FILE: drivers/gpu/drm/i915/display/intel_display.c:8749:
+ return intel_de_read(dev_priv, PIPECONF(cpu_transcoder)) & PIPECONF_INTERLACE_MASK_HSW;
-:2082: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2082: FILE: drivers/gpu/drm/i915/display/intel_display.c:10311:
+ m2_n2->link_n = intel_de_read(dev_priv,
+ PIPE_LINK_N2(transcoder));
-:2084: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2084: FILE: drivers/gpu/drm/i915/display/intel_display.c:10313:
+ m2_n2->gmch_m = intel_de_read(dev_priv,
+ PIPE_DATA_M2(transcoder))
-:2089: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2089: FILE: drivers/gpu/drm/i915/display/intel_display.c:10316:
+ m2_n2->gmch_n = intel_de_read(dev_priv,
+ PIPE_DATA_N2(transcoder));
-:2329: ERROR:CODE_INDENT: code indent should use tabs where possible #2329: FILE: drivers/gpu/drm/i915/display/intel_display.c:11024:
+^I^I^I^I TRANS_DDI_FUNC_CTL2(cpu_transcoder));$
-:2329: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2329: FILE: drivers/gpu/drm/i915/display/intel_display.c:11024:
+ trans_port_sync = intel_de_read(dev_priv,
+ TRANS_DDI_FUNC_CTL2(cpu_transcoder));
-:2468: CHECK:CAMELCASE: Avoid CamelCase: <ILK_eDP_A_DISABLE> #2468: FILE: drivers/gpu/drm/i915/display/intel_display.c:16754:
+ if (IS_GEN(dev_priv, 5) && (intel_de_read(dev_priv, FUSE_STRAP) & ILK_eDP_A_DISABLE))
total: 8 errors, 9 warnings, 5 checks, 2683 lines checkede1d262411740 drm/i915/display_power: use intel_de_*() functions for register access -:315: WARNING:LONG_LINE: line over 100 characters
#315: FILE: drivers/gpu/drm/i915/display/intel_display_power.c:949:
+ intel_de_read(dev_priv, GEN8_CHICKEN_DCPR_1) | SKL_SELECT_ALTERNATE_DC_EXIT);
-:337: WARNING:LONG_LINE: line over 100 characters
#337: FILE: drivers/gpu/drm/i915/display/intel_display_power.c:973:
+ intel_de_read(dev_priv, GEN8_CHICKEN_DCPR_1) | SKL_SELECT_ALTERNATE_DC_EXIT);
total: 0 errors, 2 warnings, 0 checks, 732 lines checked 34efc8c86da2 drm/i915/dp: use intel_de_*() functions for register access -:714: WARNING:LONG_LINE: line over 100 characters
#714: FILE: drivers/gpu/drm/i915/display/intel_dp.c:6956:
+ REG_FIELD_PREP(PP_REFERENCE_DIVIDER_MASK, (100 * div) / 2 - 1) | REG_FIELD_PREP(PANEL_POWER_CYCLE_DELAY_MASK, DIV_ROUND_UP(seq->t11_t12, 1000)));
-:774: WARNING:LINE_SPACING: Missing a blank line after declarations #774: FILE: drivers/gpu/drm/i915/display/intel_dp.c:7614:
+ u32 temp = intel_de_read(dev_priv, PEG_BAND_GAP_DATA);
+ intel_de_write(dev_priv, PEG_BAND_GAP_DATA,
total: 0 errors, 2 warnings, 0 checks, 662 lines checked ce03b8b21b79 drm/i915/hdcp: use intel_de_*() functions for register access -:63: ERROR:CODE_INDENT: code indent should use tabs where possible #63: FILE: drivers/gpu/drm/i915/display/intel_hdcp.c:116:
+^I HDCP_STATUS(dev_priv, cpu_transcoder, port)) &$
-:73: ERROR:CODE_INDENT: code indent should use tabs where possible #73: FILE: drivers/gpu/drm/i915/display/intel_hdcp.c:125:
+^I HDCP2_STATUS(dev_priv, cpu_transcoder, port)) &$
-:86: WARNING:LONG_LINE: line over 100 characters #86: FILE: drivers/gpu/drm/i915/display/intel_hdcp.c:191:
+ HDCP_KEY_LOAD_DONE | HDCP_KEY_LOAD_STATUS | HDCP_FUSE_IN_PROGRESS | HDCP_FUSE_ERROR | HDCP_FUSE_DONE);
-:438: WARNING:LONG_LINE: line over 100 characters #438: FILE: drivers/gpu/drm/i915/display/intel_hdcp.c:1581:
+ intel_de_read(dev_priv, HDCP2_CTL(dev_priv, cpu_transcoder, port)) | CTL_LINK_ENCRYPTION_REQ);
-:454: WARNING:LONG_LINE: line over 100 characters #454: FILE: drivers/gpu/drm/i915/display/intel_hdcp.c:1606:
+ intel_de_read(dev_priv, HDCP2_CTL(dev_priv, cpu_transcoder, port)) & ~CTL_LINK_ENCRYPTION_REQ);
total: 2 errors, 3 warnings, 0 checks, 380 lines checked 926ad0bb0b63 drm/i915/psr: use intel_de_*() functions for register access
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/display: mass conversion to intel_de_*() register accessors (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: mass conversion to intel_de_*() register accessors (rev2)
URL : https://patchwork.freedesktop.org/series/72533/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.6.0 Commit: drm/i915/icl_dsi: use intel_de_*() functions for register access Okay!
Commit: drm/i915/combo_phy: use intel_de_*() functions for register access Okay!
Commit: drm/i915/ddi: use intel_de_*() functions for register access Okay!
Commit: drm/i915/display: use intel_de_*() functions for register access +drivers/gpu/drm/i915/display/intel_display.c:1218:22: error: Expected constant expression in case statement -O:drivers/gpu/drm/i915/display/intel_display.c:1219:22: error: Expected constant expression in case statement
Commit: drm/i915/display_power: use intel_de_*() functions for register access Okay!
Commit: drm/i915/dp: use intel_de_*() functions for register access Okay!
Commit: drm/i915/hdcp: use intel_de_*() functions for register access Okay!
Commit: drm/i915/psr: use intel_de_*() functions for register access Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: mass conversion to intel_de_*() register accessors (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: mass conversion to intel_de_*() register accessors (rev2)
URL : https://patchwork.freedesktop.org/series/72533/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7827 -> Patchwork_16283
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/index.html
Known issues
------------
Here are the changes found in Patchwork_16283 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_blt:
- fi-hsw-4770r: [PASS][1] -> [DMESG-FAIL][2] ([i915#553] / [i915#725])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/fi-hsw-4770r/igt@i915_selftest@live_blt.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/fi-hsw-4770r/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_gem_contexts:
- fi-hsw-peppy: [PASS][3] -> [DMESG-FAIL][4] ([i915#722])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html
#### Possible fixes ####
* igt@i915_selftest@live_blt:
- fi-hsw-4770: [DMESG-FAIL][5] ([i915#553] / [i915#725]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/fi-hsw-4770/igt@i915_selftest@live_blt.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/fi-hsw-4770/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_hangcheck:
- fi-icl-u3: [INCOMPLETE][7] ([fdo#108569] / [i915#140]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/fi-icl-u3/igt@i915_selftest@live_hangcheck.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/fi-icl-u3/igt@i915_selftest@live_hangcheck.html
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[i915#140]: https://gitlab.freedesktop.org/drm/intel/issues/140
[i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
[i915#722]: https://gitlab.freedesktop.org/drm/intel/issues/722
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
Participating hosts (46 -> 39)
------------------------------
Additional (3): fi-gdg-551 fi-cfl-8109u fi-bsw-n3050
Missing (10): fi-ilk-m540 fi-bdw-5557u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-kbl-7560u fi-byt-clapper fi-bsw-nick fi-bdw-samus fi-snb-2600
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7827 -> Patchwork_16283
CI-20190529: 20190529
CI_DRM_7827: c8969aeacfff681c83a800e82b0f18a6ab3e77ea @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5389: 966c58649dee31bb5bf2fad92f75ffd365968b81 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16283: 926ad0bb0b6374995ae9697bfe561eed406609d8 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
926ad0bb0b63 drm/i915/psr: use intel_de_*() functions for register access ce03b8b21b79 drm/i915/hdcp: use intel_de_*() functions for register access 34efc8c86da2 drm/i915/dp: use intel_de_*() functions for register access e1d262411740 drm/i915/display_power: use intel_de_*() functions for register access 9e1d8d3f24f2 drm/i915/display: use intel_de_*() functions for register access b38e2a044bff drm/i915/ddi: use intel_de_*() functions for register access bfcd10dad4e2 drm/i915/combo_phy: use intel_de_*() functions for register access e3fe468e8ec9 drm/i915/icl_dsi: use intel_de_*() functions for register access
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/display: mass conversion to intel_de_*() register accessors (rev2)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: mass conversion to intel_de_*() register accessors (rev2)
URL : https://patchwork.freedesktop.org/series/72533/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7827_full -> Patchwork_16283_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_16283_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_16283_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_16283_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_partial_pwrite_pread@writes-after-reads-display:
- shard-hsw: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw1/igt@[email protected]
* igt@perf_pmu@semaphore-busy-vecs0:
- shard-skl: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl2/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_16283_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_busy@busy-vcs1:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#112080]) +14 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb1/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb8/igt@[email protected]
* igt@gem_ctx_isolation@vcs1-none:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#109276] / [fdo#112080]) +4 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb8/igt@[email protected]
* igt@gem_eio@kms:
- shard-snb: [PASS][9] -> [INCOMPLETE][10] ([i915#82])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-snb1/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-snb5/igt@[email protected]
* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#110854])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb1/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb8/igt@[email protected]
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#112146]) +6 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb7/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb4/igt@[email protected]
* igt@gem_partial_pwrite_pread@write-snoop:
- shard-hsw: [PASS][15] -> [FAIL][16] ([i915#694]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw1/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw4/igt@[email protected]
* igt@gem_wait@basic-await-all:
- shard-skl: [PASS][17] -> [DMESG-WARN][18] ([i915#109]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl6/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl2/igt@[email protected]
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [PASS][19] -> [DMESG-WARN][20] ([i915#180]) +5 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-apl6/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-apl4/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [PASS][21] -> [DMESG-WARN][22] ([i915#180]) +4 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-kbl3/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-kbl1/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [PASS][23] -> [FAIL][24] ([i915#96])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw4/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw8/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-glk: [PASS][25] -> [FAIL][26] ([i915#79])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-glk7/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-glk1/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [PASS][27] -> [FAIL][28] ([i915#79])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl10/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl6/igt@[email protected]
* igt@kms_flip@plain-flip-fb-recreate-interruptible:
- shard-skl: [PASS][29] -> [FAIL][30] ([i915#34])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl10/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl3/igt@[email protected]
* igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-blt:
- shard-tglb: [PASS][31] -> [SKIP][32] ([i915#668])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-tglb4/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-tglb2/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][33] -> [FAIL][34] ([fdo#108145])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl1/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl2/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][35] -> [FAIL][36] ([fdo#108145] / [i915#265]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl2/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl5/igt@[email protected]
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][37] -> [SKIP][38] ([fdo#109441]) +3 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb1/igt@kms_psr@psr2_no_drrs.html
* igt@kms_setmode@basic:
- shard-glk: [PASS][39] -> [FAIL][40] ([i915#31])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-glk6/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-glk7/igt@[email protected]
* igt@perf@oa-exponents:
- shard-tglb: [PASS][41] -> [INCOMPLETE][42] ([i915#472] / [i915#807])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-tglb5/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-tglb1/igt@[email protected]
* igt@prime_mmap_coherency@ioctl-errors:
- shard-hsw: [PASS][43] -> [FAIL][44] ([i915#831])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw1/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw5/igt@[email protected]
* igt@prime_vgem@fence-wait-bsd2:
- shard-iclb: [PASS][45] -> [SKIP][46] ([fdo#109276]) +22 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb8/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_persistence@vcs1-queued:
- shard-iclb: [SKIP][47] ([fdo#109276] / [fdo#112080]) -> [PASS][48] +3 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb7/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb1/igt@[email protected]
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [SKIP][49] ([fdo#110841]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb4/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb6/igt@[email protected]
* igt@gem_eio@in-flight-suspend:
- shard-skl: [INCOMPLETE][51] ([i915#69]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl5/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl4/igt@[email protected]
* igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [SKIP][53] ([fdo#112080]) -> [PASS][54] +8 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb3/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@independent-bsd2:
- shard-iclb: [SKIP][55] ([fdo#109276]) -> [PASS][56] +25 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb5/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb2/igt@[email protected]
* igt@gem_exec_schedule@pi-common-bsd:
- shard-iclb: [SKIP][57] ([i915#677]) -> [PASS][58] +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb5/igt@[email protected]
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [SKIP][59] ([fdo#112146]) -> [PASS][60] +3 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb8/igt@[email protected]
* igt@gem_exec_suspend@basic-s3:
- shard-kbl: [DMESG-WARN][61] ([i915#180]) -> [PASS][62] +2 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-kbl4/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-kbl6/igt@[email protected]
* igt@gem_softpin@noreloc-s3:
- shard-apl: [DMESG-WARN][63] ([i915#180]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-apl8/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-apl1/igt@[email protected]
* igt@i915_pm_dc@dc5-dpms:
- shard-iclb: [FAIL][65] ([i915#447]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb3/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb1/igt@[email protected]
* igt@i915_pm_rps@waitboost:
- shard-iclb: [FAIL][67] ([i915#413]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb5/igt@[email protected]
* igt@i915_selftest@live_blt:
- shard-hsw: [DMESG-FAIL][69] ([i915#553] / [i915#725]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw1/igt@i915_selftest@live_blt.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw5/igt@i915_selftest@live_blt.html
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-skl: [INCOMPLETE][71] ([i915#300]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl4/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl1/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-skl: [INCOMPLETE][73] ([i915#221]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl3/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl4/igt@[email protected]
* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][75] ([fdo#109441]) -> [PASS][76] +2 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb8/igt@kms_psr@psr2_primary_mmap_cpu.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][77] ([i915#31]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-apl3/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-apl6/igt@[email protected]
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [SKIP][79] ([fdo#109276] / [fdo#112080]) -> [FAIL][80] ([IGT#28]) +1 similar issue
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb3/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb1/igt@[email protected]
* igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing:
- shard-hsw: [FAIL][81] ([i915#1045]) -> [DMESG-FAIL][82] ([i915#1045])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw7/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw5/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing.html
* igt@gem_tiled_blits@interruptible:
- shard-hsw: [FAIL][83] ([i915#818]) -> [FAIL][84] ([i915#694])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw7/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw6/igt@[email protected]
* igt@i915_pm_rpm@gem-evict-pwrite:
- shard-snb: [SKIP][85] ([fdo#109271]) -> [INCOMPLETE][86] ([i915#82])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-snb6/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-snb6/igt@[email protected]
[IGT#28]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/28
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#1045]: https://gitlab.freedesktop.org/drm/intel/issues/1045
[i915#109]: https://gitlab.freedesktop.org/drm/intel/issues/109
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#221]: https://gitlab.freedesktop.org/drm/intel/issues/221
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#413]: https://gitlab.freedesktop.org/drm/intel/issues/413
[i915#447]: https://gitlab.freedesktop.org/drm/intel/issues/447
[i915#472]: https://gitlab.freedesktop.org/drm/intel/issues/472
[i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
[i915#668]: https://gitlab.freedesktop.org/drm/intel/issues/668
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#807]: https://gitlab.freedesktop.org/drm/intel/issues/807
[i915#818]: https://gitlab.freedesktop.org/drm/intel/issues/818
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#831]: https://gitlab.freedesktop.org/drm/intel/issues/831
[i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7827 -> Patchwork_16283
CI-20190529: 20190529
CI_DRM_7827: c8969aeacfff681c83a800e82b0f18a6ab3e77ea @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5389: 966c58649dee31bb5bf2fad92f75ffd365968b81 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16283: 926ad0bb0b6374995ae9697bfe561eed406609d8 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/display: mass conversion to intel_de_*() register accessors (rev2)
Quoted 39 lines · Patchwork
== Series Details ==
Series: drm/i915/display: mass conversion to intel_de_*() register accessors (rev2)
URL : https://patchwork.freedesktop.org/series/72533/
State : failure== Summary ==
CI Bug Log - changes from
CI_DRM_7827_full->Patchwork_16283_full
====================================================Summary
-------**FAILURE**
Serious unknown changes coming with
Patchwork_16283_fullabsolutely need to be verified manually.If you think the reported changes have nothing to do with the changes introduced in
Patchwork_16283_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.Possible new issues
-------------------Here are the unknown changes that may have been introduced in
Patchwork_16283_full:### IGT changes ###
#### Possible regressions ####
* igt@gem_partial_pwrite_pread@writes-after-reads-display:
- shard-hsw: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw1/igt@[email protected]
Quoted 4 lines
* igt@perf_pmu@semaphore-busy-vecs0:
- shard-skl: [PASS][3] -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl2/igt@[email protected]
Unrelated to the patches at hand, pushed the lot to dinq, thanks for the acks.
BR,
Jani.
Quoted 278 lines
Known issues
------------Here are the changes found in
Patchwork_16283_fullthat come from known issues:### IGT changes ###
#### Issues hit ####
* igt@gem_busy@busy-vcs1:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#112080]) +14 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb1/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb8/igt@[email protected]* igt@gem_ctx_isolation@vcs1-none:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#109276] / [fdo#112080]) +4 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb8/igt@[email protected]* igt@gem_eio@kms:
- shard-snb: [PASS][9] -> [INCOMPLETE][10] ([i915#82])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-snb1/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-snb5/igt@[email protected]* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#110854])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb1/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb8/igt@[email protected]* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#112146]) +6 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb7/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb4/igt@[email protected]* igt@gem_partial_pwrite_pread@write-snoop:
- shard-hsw: [PASS][15] -> [FAIL][16] ([i915#694]) +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw1/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw4/igt@[email protected]* igt@gem_wait@basic-await-all:
- shard-skl: [PASS][17] -> [DMESG-WARN][18] ([i915#109]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl6/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl2/igt@[email protected]* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [PASS][19] -> [DMESG-WARN][20] ([i915#180]) +5 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-apl6/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-apl4/igt@[email protected]* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [PASS][21] -> [DMESG-WARN][22] ([i915#180]) +4 similar issues
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-kbl3/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-kbl1/igt@[email protected]* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [PASS][23] -> [FAIL][24] ([i915#96])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw4/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw8/igt@[email protected]* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-glk: [PASS][25] -> [FAIL][26] ([i915#79])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-glk7/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-glk1/igt@[email protected]* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [PASS][27] -> [FAIL][28] ([i915#79])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl10/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl6/igt@[email protected]* igt@kms_flip@plain-flip-fb-recreate-interruptible:
- shard-skl: [PASS][29] -> [FAIL][30] ([i915#34])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl10/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl3/igt@[email protected]* igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-blt:
- shard-tglb: [PASS][31] -> [SKIP][32] ([i915#668])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-tglb4/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-tglb2/igt@[email protected]* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][33] -> [FAIL][34] ([fdo#108145])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl1/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl2/igt@[email protected]* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][35] -> [FAIL][36] ([fdo#108145] / [i915#265]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl2/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl5/igt@[email protected]* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][37] -> [SKIP][38] ([fdo#109441]) +3 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb1/igt@kms_psr@psr2_no_drrs.html* igt@kms_setmode@basic:
- shard-glk: [PASS][39] -> [FAIL][40] ([i915#31])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-glk6/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-glk7/igt@[email protected]* igt@perf@oa-exponents:
- shard-tglb: [PASS][41] -> [INCOMPLETE][42] ([i915#472] / [i915#807])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-tglb5/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-tglb1/igt@[email protected]* igt@prime_mmap_coherency@ioctl-errors:
- shard-hsw: [PASS][43] -> [FAIL][44] ([i915#831])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw1/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw5/igt@[email protected]* igt@prime_vgem@fence-wait-bsd2:
- shard-iclb: [PASS][45] -> [SKIP][46] ([fdo#109276]) +22 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb8/igt@[email protected]#### Possible fixes ####
* igt@gem_ctx_persistence@vcs1-queued:
- shard-iclb: [SKIP][47] ([fdo#109276] / [fdo#112080]) -> [PASS][48] +3 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb7/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb1/igt@[email protected]* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [SKIP][49] ([fdo#110841]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb4/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb6/igt@[email protected]* igt@gem_eio@in-flight-suspend:
- shard-skl: [INCOMPLETE][51] ([i915#69]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl5/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl4/igt@[email protected]* igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [SKIP][53] ([fdo#112080]) -> [PASS][54] +8 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb3/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb4/igt@[email protected]* igt@gem_exec_schedule@independent-bsd2:
- shard-iclb: [SKIP][55] ([fdo#109276]) -> [PASS][56] +25 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb5/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb2/igt@[email protected]* igt@gem_exec_schedule@pi-common-bsd:
- shard-iclb: [SKIP][57] ([i915#677]) -> [PASS][58] +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb5/igt@[email protected]* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [SKIP][59] ([fdo#112146]) -> [PASS][60] +3 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb8/igt@[email protected]* igt@gem_exec_suspend@basic-s3:
- shard-kbl: [DMESG-WARN][61] ([i915#180]) -> [PASS][62] +2 similar issues
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-kbl4/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-kbl6/igt@[email protected]* igt@gem_softpin@noreloc-s3:
- shard-apl: [DMESG-WARN][63] ([i915#180]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-apl8/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-apl1/igt@[email protected]* igt@i915_pm_dc@dc5-dpms:
- shard-iclb: [FAIL][65] ([i915#447]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb3/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb1/igt@[email protected]* igt@i915_pm_rps@waitboost:
- shard-iclb: [FAIL][67] ([i915#413]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb2/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb5/igt@[email protected]* igt@i915_selftest@live_blt:
- shard-hsw: [DMESG-FAIL][69] ([i915#553] / [i915#725]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw1/igt@i915_selftest@live_blt.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw5/igt@i915_selftest@live_blt.html* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-skl: [INCOMPLETE][71] ([i915#300]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl4/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl1/igt@[email protected]* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-skl: [INCOMPLETE][73] ([i915#221]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-skl3/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-skl4/igt@[email protected]* igt@kms_psr@psr2_primary_mmap_cpu:
- shard-iclb: [SKIP][75] ([fdo#109441]) -> [PASS][76] +2 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb8/igt@kms_psr@psr2_primary_mmap_cpu.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html* igt@kms_setmode@basic:
- shard-apl: [FAIL][77] ([i915#31]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-apl3/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-apl6/igt@[email protected]#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [SKIP][79] ([fdo#109276] / [fdo#112080]) -> [FAIL][80] ([IGT#28]) +1 similar issue
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-iclb3/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-iclb1/igt@[email protected]* igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing:
- shard-hsw: [FAIL][81] ([i915#1045]) -> [DMESG-FAIL][82] ([i915#1045])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw7/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw5/igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing.html* igt@gem_tiled_blits@interruptible:
- shard-hsw: [FAIL][83] ([i915#818]) -> [FAIL][84] ([i915#694])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-hsw7/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-hsw6/igt@[email protected]* igt@i915_pm_rpm@gem-evict-pwrite:
- shard-snb: [SKIP][85] ([fdo#109271]) -> [INCOMPLETE][86] ([i915#82])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7827/shard-snb6/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/shard-snb6/igt@[email protected][IGT#28]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/28
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#1045]: https://gitlab.freedesktop.org/drm/intel/issues/1045
[i915#109]: https://gitlab.freedesktop.org/drm/intel/issues/109
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#221]: https://gitlab.freedesktop.org/drm/intel/issues/221
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#300]: https://gitlab.freedesktop.org/drm/intel/issues/300
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#413]: https://gitlab.freedesktop.org/drm/intel/issues/413
[i915#447]: https://gitlab.freedesktop.org/drm/intel/issues/447
[i915#472]: https://gitlab.freedesktop.org/drm/intel/issues/472
[i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
[i915#668]: https://gitlab.freedesktop.org/drm/intel/issues/668
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#807]: https://gitlab.freedesktop.org/drm/intel/issues/807
[i915#818]: https://gitlab.freedesktop.org/drm/intel/issues/818
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#831]: https://gitlab.freedesktop.org/drm/intel/issues/831
[i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96Participating hosts (10 -> 10)
------------------------------No changes in participating hosts
Build changes
-------------* CI: CI-20190529 -> None
* Linux:CI_DRM_7827->Patchwork_16283CI-20190529: 20190529
CI_DRM_7827:c8969aeacfff681c83a800e82b0f18a6ab3e77ea@git://anongit.freedesktop.org/gfx-ci/linux
IGT_5389:966c58649dee31bb5bf2fad92f75ffd365968b81@git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16283:926ad0bb0b6374995ae9697bfe561eed406609d8@git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509:fdc5a4ca11124ab8413c7988896eec4c97336694@git://anongit.freedesktop.org/piglit== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16283/index.html
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx