drm/i915/display: mass conversion to intel_de_*() register accessors
Subsystems (3)
cover drm/i915/display: mass conversion to intel_de_*() register accessors
Hey all,
So I sent [1] to convert some forcewake register accessors... but what if we just ripped off the bandage once and for all? It's going to hurt, a lot, but we'd get it done.
This completely rids us of the "dev_priv" dependency in display/.
All the patches here are per-file and independent of each other. We could also pick and apply the ones that are least likely to conflict.
Opinions?
BR,
Jani.
PS. I didn't bother looking at the checkpatch warnings this may generate at this point. I just used the --linux-spacing option for spatch, and closed my eyes. I completely scripted the generation of the series, apart from just a couple of build fixes.
[1] https://patchwork.freedesktop.org/series/72476/
Jani Nikula (33):
drm/i915/icl_dsi: use intel_de_*() functions for register access drm/i915/audio: use intel_de_*() functions for register access drm/i915/cdclk: use intel_de_*() functions for register access drm/i915/color: use intel_de_*() functions for register access drm/i915/combo_phy: use intel_de_*() functions for register access drm/i915/crt: 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/dpio_phy: use intel_de_*() functions for register access drm/i915/dpll_mgr: use intel_de_*() functions for register access drm/i915/dp_mst: use intel_de_*() functions for register access drm/i915/dsb: use intel_de_*() functions for register access drm/i915/dvo: use intel_de_*() functions for register access drm/i915/fbc: use intel_de_*() functions for register access drm/i915/fifo_underrun: use intel_de_*() functions for register access drm/i915/gmbus: use intel_de_*() functions for register access drm/i915/hdcp: use intel_de_*() functions for register access drm/i915/hdmi: use intel_de_*() functions for register access drm/i915/lpe_audio: use intel_de_*() functions for register access drm/i915/lvds: use intel_de_*() functions for register access drm/i915/overlay: use intel_de_*() functions for register access drm/i915/panel: use intel_de_*() functions for register access drm/i915/pipe_crc: use intel_de_*() functions for register access drm/i915/psr: use intel_de_*() functions for register access drm/i915/sdvo: use intel_de_*() functions for register access drm/i915/sprite: use intel_de_*() functions for register access drm/i915/tv: use intel_de_*() functions for register access drm/i915/vdsc: use intel_de_*() functions for register access drm/i915/vga: use intel_de_*() functions for register access drm/i915/vlv_dsi: use intel_de_*() functions for register access drm/i915/vlv_dsi_pll: use intel_de_*() functions for register access
drivers/gpu/drm/i915/display/icl_dsi.c | 271 ++-- drivers/gpu/drm/i915/display/intel_audio.c | 112 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 133 +- drivers/gpu/drm/i915/display/intel_color.c | 204 +-- .../gpu/drm/i915/display/intel_combo_phy.c | 66 +- drivers/gpu/drm/i915/display/intel_crt.c | 51 +- drivers/gpu/drm/i915/display/intel_ddi.c | 474 +++---- drivers/gpu/drm/i915/display/intel_display.c | 1171 +++++++++-------- .../drm/i915/display/intel_display_power.c | 294 +++-- drivers/gpu/drm/i915/display/intel_dp.c | 234 ++-- drivers/gpu/drm/i915/display/intel_dp_mst.c | 11 +- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 77 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 388 +++--- drivers/gpu/drm/i915/display/intel_dsb.c | 24 +- drivers/gpu/drm/i915/display/intel_dvo.c | 34 +- drivers/gpu/drm/i915/display/intel_fbc.c | 106 +- .../drm/i915/display/intel_fifo_underrun.c | 37 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 74 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 142 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 258 ++-- .../gpu/drm/i915/display/intel_lpe_audio.c | 14 +- drivers/gpu/drm/i915/display/intel_lvds.c | 57 +- drivers/gpu/drm/i915/display/intel_overlay.c | 45 +- drivers/gpu/drm/i915/display/intel_panel.c | 255 ++-- drivers/gpu/drm/i915/display/intel_pipe_crc.c | 20 +- drivers/gpu/drm/i915/display/intel_psr.c | 70 +- drivers/gpu/drm/i915/display/intel_sdvo.c | 30 +- drivers/gpu/drm/i915/display/intel_sprite.c | 320 +++-- drivers/gpu/drm/i915/display/intel_tv.c | 138 +- drivers/gpu/drm/i915/display/intel_vdsc.c | 413 +++--- drivers/gpu/drm/i915/display/intel_vga.c | 7 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 345 ++--- drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 49 +- 33 files changed, 3158 insertions(+), 2766 deletions(-)
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 1/33 drm/i915/icl_dsi: 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/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 ; }
@@ -109,7 +109,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_ERROR ("LPTX bit not cleared\n" ); }
@@ -136,7 +136,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;
@@ -158,7 +158,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 ;
@@ -175,7 +175,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 ; }
@@ -212,53 +212,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); } } }
@@ -270,7 +272,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);
@@ -290,16 +292,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 */
@@ -330,15 +332,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)); } }
@@ -365,9 +367,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);
@@ -394,40 +396,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); } }
@@ -442,12 +450,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); }/*
@@ -456,19 +464,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 */
@@ -476,12 +484,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); } }
@@ -493,11 +501,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_ERROR ("DDI port:%c buffer idle\n" ,port_name (port));
@@ -516,28 +524,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); }/*
@@ -549,25 +559,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); } } }
@@ -580,11 +595,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); }
@@ -596,11 +611,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); }
@@ -615,12 +630,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 )
@@ -628,9 +643,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); }
@@ -649,7 +664,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 ;
@@ -726,16 +741,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 */
@@ -746,7 +763,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);
@@ -772,14 +789,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_ERROR ("DSI link not ready\n" ); } }
@@ -845,8 +862,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 */
@@ -868,8 +885,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 )); } }
@@ -882,8 +899,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)
@@ -895,8 +912,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 )); }/*
@@ -907,15 +924,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 )); } } }
@@ -930,9 +947,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),
@@ -968,26 +985,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); } }
@@ -1041,7 +1058,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 ;
@@ -1113,9 +1130,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),
@@ -1147,13 +1164,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_ERROR ("DSI link not in ULPS\n" ); }
@@ -1161,18 +1178,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); } } }
@@ -1186,11 +1205,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_ERROR("DDI port:%c buffer not idle\n",
@@ -1219,9 +1238,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); } }
@@ -1443,7 +1462,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 ;
@@ -1462,7 +1481,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
RFC 2/33 drm/i915/audio: 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_audio.c | 112 +++++++++++---------- 1 file changed, 58 insertions(+), 54 deletions(-)
drivers/gpu/drm/i915/display/intel_audio.c +58 -54
@@ -291,18 +291,18 @@ static bool intel_eld_uptodate(struct drm_connector *connector,u32 tmp;int i; - tmp =I915_READ (reg_eldv); + tmp =intel_de_read (dev_priv, reg_eldv); tmp &= bits_eldv;if (!tmp)return false; - tmp =I915_READ (reg_elda); + tmp =intel_de_read (dev_priv, reg_elda); tmp &= ~bits_elda; -I915_WRITE (reg_elda, tmp); +intel_de_write (dev_priv, reg_elda, tmp);for (i =0 ; i <drm_eld_size (eld) /4 ; i++) -if (I915_READ (reg_edid) != *((const u32 *)eld + i)) +if (intel_de_read (dev_priv, reg_edid) != *((const u32 *)eld + i))return false;return true;
@@ -317,16 +317,16 @@ static void g4x_audio_codec_disable(struct intel_encoder *encoder,drm_dbg_kms (&dev_priv->drm,"Disable audio codec\n" ); - tmp =I915_READ (G4X_AUD_VID_DID ); + tmp =intel_de_read (dev_priv,G4X_AUD_VID_DID );if (tmp ==INTEL_AUDIO_DEVBLC || tmp ==INTEL_AUDIO_DEVCL ) eldv =G4X_ELDV_DEVCL_DEVBLC ;else eldv =G4X_ELDV_DEVCTG ;/* Invalidate ELD */ - tmp =I915_READ (G4X_AUD_CNTL_ST ); + tmp =intel_de_read (dev_priv,G4X_AUD_CNTL_ST ); tmp &= ~eldv; -I915_WRITE (G4X_AUD_CNTL_ST , tmp); +intel_de_write (dev_priv,G4X_AUD_CNTL_ST , tmp); } static void g4x_audio_codec_enable(struct intel_encoder *encoder,
@@ -343,7 +343,7 @@ static void g4x_audio_codec_enable(struct intel_encoder *encoder,drm_dbg_kms (&dev_priv->drm,"Enable audio codec, %u bytes ELD\n" ,drm_eld_size (eld)); - tmp =I915_READ (G4X_AUD_VID_DID ); + tmp =intel_de_read (dev_priv,G4X_AUD_VID_DID );if (tmp ==INTEL_AUDIO_DEVBLC || tmp ==INTEL_AUDIO_DEVCL ) eldv =G4X_ELDV_DEVCL_DEVBLC ;else
@@ -355,19 +355,20 @@ static void g4x_audio_codec_enable(struct intel_encoder *encoder, G4X_HDMIW_HDMIEDID))return ; - tmp =I915_READ (G4X_AUD_CNTL_ST ); + tmp =intel_de_read (dev_priv,G4X_AUD_CNTL_ST ); tmp &= ~(eldv |G4X_ELD_ADDR_MASK ); len = (tmp >>9 ) &0x1f ;/* ELD buffer size */ -I915_WRITE (G4X_AUD_CNTL_ST , tmp); +intel_de_write (dev_priv,G4X_AUD_CNTL_ST , tmp); len =min (drm_eld_size (eld) /4 , len);drm_dbg (&dev_priv->drm,"ELD size %d\n" , len);for (i =0 ; i < len; i++) -I915_WRITE (G4X_HDMIW_HDMIEDID , *((const u32 *)eld + i)); +intel_de_write (dev_priv,G4X_HDMIW_HDMIEDID , + *((const u32 *)eld + i)); - tmp =I915_READ (G4X_AUD_CNTL_ST ); + tmp =intel_de_read (dev_priv,G4X_AUD_CNTL_ST ); tmp |= eldv; -I915_WRITE (G4X_AUD_CNTL_ST , tmp); +intel_de_write (dev_priv,G4X_AUD_CNTL_ST , tmp); } static void
@@ -390,7 +391,7 @@ hsw_dp_audio_config_update(struct intel_encoder *encoder,else drm_dbg_kms (&dev_priv->drm,"using automatic Maud, Naud\n" ); - tmp =I915_READ (HSW_AUD_CFG (cpu_transcoder)); + tmp =intel_de_read (dev_priv,HSW_AUD_CFG (cpu_transcoder)); tmp &= ~AUD_CONFIG_N_VALUE_INDEX ; tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK ; tmp &= ~AUD_CONFIG_N_PROG_ENABLE ;
@@ -402,9 +403,9 @@ hsw_dp_audio_config_update(struct intel_encoder *encoder, tmp |=AUD_CONFIG_N_PROG_ENABLE ; } -I915_WRITE (HSW_AUD_CFG (cpu_transcoder), tmp); +intel_de_write (dev_priv,HSW_AUD_CFG (cpu_transcoder), tmp); - tmp =I915_READ (HSW_AUD_M_CTS_ENABLE (cpu_transcoder)); + tmp =intel_de_read (dev_priv,HSW_AUD_M_CTS_ENABLE (cpu_transcoder)); tmp &= ~AUD_CONFIG_M_MASK ; tmp &= ~AUD_M_CTS_M_VALUE_INDEX ; tmp &= ~AUD_M_CTS_M_PROG_ENABLE ;
@@ -415,7 +416,7 @@ hsw_dp_audio_config_update(struct intel_encoder *encoder, tmp |=AUD_M_CTS_M_PROG_ENABLE ; } -I915_WRITE (HSW_AUD_M_CTS_ENABLE (cpu_transcoder), tmp); +intel_de_write (dev_priv,HSW_AUD_M_CTS_ENABLE (cpu_transcoder), tmp); } static void
@@ -431,7 +432,7 @@ hsw_hdmi_audio_config_update(struct intel_encoder *encoder, rate = acomp ? acomp->aud_sample_rate[port] :0 ; - tmp =I915_READ (HSW_AUD_CFG (cpu_transcoder)); + tmp =intel_de_read (dev_priv,HSW_AUD_CFG (cpu_transcoder)); tmp &= ~AUD_CONFIG_N_VALUE_INDEX ; tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK ; tmp &= ~AUD_CONFIG_N_PROG_ENABLE ;
@@ -448,16 +449,16 @@ hsw_hdmi_audio_config_update(struct intel_encoder *encoder,drm_dbg_kms (&dev_priv->drm,"using automatic N\n" ); } -I915_WRITE (HSW_AUD_CFG (cpu_transcoder), tmp); +intel_de_write (dev_priv,HSW_AUD_CFG (cpu_transcoder), tmp);/* * Let's disable "Enable CTS or M Prog bit" * and let HW calculate the value */ - tmp =I915_READ (HSW_AUD_M_CTS_ENABLE (cpu_transcoder)); + tmp =intel_de_read (dev_priv,HSW_AUD_M_CTS_ENABLE (cpu_transcoder)); tmp &= ~AUD_M_CTS_M_PROG_ENABLE ; tmp &= ~AUD_M_CTS_M_VALUE_INDEX ; -I915_WRITE (HSW_AUD_M_CTS_ENABLE (cpu_transcoder), tmp); +intel_de_write (dev_priv,HSW_AUD_M_CTS_ENABLE (cpu_transcoder), tmp); } static void
@@ -484,20 +485,20 @@ static void hsw_audio_codec_disable(struct intel_encoder *encoder,mutex_lock (&dev_priv->av_mutex);/* Disable timestamps */ - tmp =I915_READ (HSW_AUD_CFG (cpu_transcoder)); + tmp =intel_de_read (dev_priv,HSW_AUD_CFG (cpu_transcoder)); tmp &= ~AUD_CONFIG_N_VALUE_INDEX ; tmp |=AUD_CONFIG_N_PROG_ENABLE ; tmp &= ~AUD_CONFIG_UPPER_N_MASK ; tmp &= ~AUD_CONFIG_LOWER_N_MASK ;if (intel_crtc_has_dp_encoder (old_crtc_state)) tmp |=AUD_CONFIG_N_VALUE_INDEX ; -I915_WRITE (HSW_AUD_CFG (cpu_transcoder), tmp); +intel_de_write (dev_priv,HSW_AUD_CFG (cpu_transcoder), tmp);/* Invalidate ELD */ - tmp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); + tmp =intel_de_read (dev_priv,HSW_AUD_PIN_ELD_CP_VLD ); tmp &= ~AUDIO_ELD_VALID (cpu_transcoder); tmp &= ~AUDIO_OUTPUT_ENABLE (cpu_transcoder); -I915_WRITE (HSW_AUD_PIN_ELD_CP_VLD , tmp); +intel_de_write (dev_priv,HSW_AUD_PIN_ELD_CP_VLD , tmp);mutex_unlock (&dev_priv->av_mutex); }
@@ -520,10 +521,10 @@ static void hsw_audio_codec_enable(struct intel_encoder *encoder,mutex_lock (&dev_priv->av_mutex);/* Enable audio presence detect, invalidate ELD */ - tmp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); + tmp =intel_de_read (dev_priv,HSW_AUD_PIN_ELD_CP_VLD ); tmp |=AUDIO_OUTPUT_ENABLE (cpu_transcoder); tmp &= ~AUDIO_ELD_VALID (cpu_transcoder); -I915_WRITE (HSW_AUD_PIN_ELD_CP_VLD , tmp); +intel_de_write (dev_priv,HSW_AUD_PIN_ELD_CP_VLD , tmp);/* * FIXME: We're supposed to wait for vblank here, but we have vblanks
@@ -533,19 +534,20 @@ static void hsw_audio_codec_enable(struct intel_encoder *encoder,*/ /* Reset ELD write address */ - tmp =I915_READ (HSW_AUD_DIP_ELD_CTRL (cpu_transcoder)); + tmp =intel_de_read (dev_priv,HSW_AUD_DIP_ELD_CTRL (cpu_transcoder)); tmp &= ~IBX_ELD_ADDRESS_MASK ; -I915_WRITE (HSW_AUD_DIP_ELD_CTRL (cpu_transcoder), tmp); +intel_de_write (dev_priv,HSW_AUD_DIP_ELD_CTRL (cpu_transcoder), tmp);/* Up to 84 bytes of hw ELD buffer */ len =min (drm_eld_size (eld),84 );for (i =0 ; i < len /4 ; i++) -I915_WRITE (HSW_AUD_EDID_DATA (cpu_transcoder), *((const u32 *)eld + i)); +intel_de_write (dev_priv,HSW_AUD_EDID_DATA (cpu_transcoder), + *((const u32 *)eld + i));/* ELD valid */ - tmp =I915_READ (HSW_AUD_PIN_ELD_CP_VLD ); + tmp =intel_de_read (dev_priv,HSW_AUD_PIN_ELD_CP_VLD ); tmp |=AUDIO_ELD_VALID (cpu_transcoder); -I915_WRITE (HSW_AUD_PIN_ELD_CP_VLD , tmp); +intel_de_write (dev_priv,HSW_AUD_PIN_ELD_CP_VLD , tmp);/* Enable timestamps */ hsw_audio_config_update (encoder, crtc_state);
@@ -584,21 +586,21 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder, }/* Disable timestamps */ - tmp =I915_READ (aud_config); + tmp =intel_de_read (dev_priv, aud_config); tmp &= ~AUD_CONFIG_N_VALUE_INDEX ; tmp |=AUD_CONFIG_N_PROG_ENABLE ; tmp &= ~AUD_CONFIG_UPPER_N_MASK ; tmp &= ~AUD_CONFIG_LOWER_N_MASK ;if (intel_crtc_has_dp_encoder (old_crtc_state)) tmp |=AUD_CONFIG_N_VALUE_INDEX ; -I915_WRITE (aud_config, tmp); +intel_de_write (dev_priv, aud_config, tmp); eldv =IBX_ELD_VALID (port);/* Invalidate ELD */ - tmp =I915_READ (aud_cntrl_st2); + tmp =intel_de_read (dev_priv, aud_cntrl_st2); tmp &= ~eldv; -I915_WRITE (aud_cntrl_st2, tmp); +intel_de_write (dev_priv, aud_cntrl_st2, tmp); } static void ilk_audio_codec_enable(struct intel_encoder *encoder,
@@ -651,27 +653,28 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder, eldv =IBX_ELD_VALID (port);/* Invalidate ELD */ - tmp =I915_READ (aud_cntrl_st2); + tmp =intel_de_read (dev_priv, aud_cntrl_st2); tmp &= ~eldv; -I915_WRITE (aud_cntrl_st2, tmp); +intel_de_write (dev_priv, aud_cntrl_st2, tmp);/* Reset ELD write address */ - tmp =I915_READ (aud_cntl_st); + tmp =intel_de_read (dev_priv, aud_cntl_st); tmp &= ~IBX_ELD_ADDRESS_MASK ; -I915_WRITE (aud_cntl_st, tmp); +intel_de_write (dev_priv, aud_cntl_st, tmp);/* Up to 84 bytes of hw ELD buffer */ len =min (drm_eld_size (eld),84 );for (i =0 ; i < len /4 ; i++) -I915_WRITE (hdmiw_hdmiedid, *((const u32 *)eld + i)); +intel_de_write (dev_priv, hdmiw_hdmiedid, + *((const u32 *)eld + i));/* ELD valid */ - tmp =I915_READ (aud_cntrl_st2); + tmp =intel_de_read (dev_priv, aud_cntrl_st2); tmp |= eldv; -I915_WRITE (aud_cntrl_st2, tmp); +intel_de_write (dev_priv, aud_cntrl_st2, tmp);/* Enable timestamps */ - tmp =I915_READ (aud_config); + tmp =intel_de_read (dev_priv, aud_config); tmp &= ~AUD_CONFIG_N_VALUE_INDEX ; tmp &= ~AUD_CONFIG_N_PROG_ENABLE ; tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK ;
@@ -679,7 +682,7 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder, tmp |=AUD_CONFIG_N_VALUE_INDEX ; else tmp |= audio_config_hdmi_pixel_clock(crtc_state); -I915_WRITE (aud_config, tmp); +intel_de_write (dev_priv, aud_config, tmp); }/**
@@ -856,7 +859,8 @@ static unsigned long i915_audio_component_get_power(struct device *kdev)if (dev_priv->audio_power_refcount++ ==0 ) {if (IS_TIGERLAKE (dev_priv) ||IS_ICELAKE (dev_priv)) { -I915_WRITE (AUD_FREQ_CNTRL , dev_priv->audio_freq_cntrl); +intel_de_write (dev_priv,AUD_FREQ_CNTRL , + dev_priv->audio_freq_cntrl);drm_dbg_kms (&dev_priv->drm,"restored AUD_FREQ_CNTRL to 0x%x\n" , dev_priv->audio_freq_cntrl);
@@ -867,9 +871,8 @@ static unsigned long i915_audio_component_get_power(struct device *kdev)glk_force_audio_cdclk (dev_priv, true);if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) -I915_WRITE (AUD_PIN_BUF_CTL , - (I915_READ (AUD_PIN_BUF_CTL ) | -AUD_PIN_BUF_ENABLE )); +intel_de_write (dev_priv,AUD_PIN_BUF_CTL , + (intel_de_read (dev_priv,AUD_PIN_BUF_CTL ) |AUD_PIN_BUF_ENABLE )); }return ret;
@@ -904,15 +907,15 @@ static void i915_audio_component_codec_wake_override(struct device *kdev,* Enable/disable generating the codec wake signal, overriding the * internal logic to generate the codec wake to controller. */ - tmp =I915_READ (HSW_AUD_CHICKENBIT ); + tmp =intel_de_read (dev_priv,HSW_AUD_CHICKENBIT ); tmp &= ~SKL_AUD_CODEC_WAKE_SIGNAL ; -I915_WRITE (HSW_AUD_CHICKENBIT , tmp); +intel_de_write (dev_priv,HSW_AUD_CHICKENBIT , tmp);usleep_range (1000 ,1500 );if (enable) { - tmp =I915_READ (HSW_AUD_CHICKENBIT ); + tmp =intel_de_read (dev_priv,HSW_AUD_CHICKENBIT ); tmp |=SKL_AUD_CODEC_WAKE_SIGNAL ; -I915_WRITE (HSW_AUD_CHICKENBIT , tmp); +intel_de_write (dev_priv,HSW_AUD_CHICKENBIT , tmp);usleep_range (1000 ,1500 ); }
@@ -1135,7 +1138,8 @@ static void i915_audio_component_init(struct drm_i915_private *dev_priv) }if (IS_TIGERLAKE (dev_priv) ||IS_ICELAKE (dev_priv)) { - dev_priv->audio_freq_cntrl =I915_READ (AUD_FREQ_CNTRL ); + dev_priv->audio_freq_cntrl =intel_de_read (dev_priv, +AUD_FREQ_CNTRL );drm_dbg_kms (&dev_priv->drm,"init value of AUD_FREQ_CNTRL of 0x%x\n" , dev_priv->audio_freq_cntrl);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 3/33 drm/i915/cdclk: 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_cdclk.c | 133 +++++++++++---------- 1 file changed, 68 insertions(+), 65 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +68 -65
@@ -237,8 +237,8 @@ static unsigned int intel_hpll_vco(struct drm_i915_private *dev_priv)else return 0 ; - tmp =I915_READ (IS_PINEVIEW (dev_priv) ||IS_MOBILE (dev_priv) ? -HPLLVCO_MOBILE :HPLLVCO ); + tmp =intel_de_read (dev_priv, +IS_PINEVIEW (dev_priv) ||IS_MOBILE (dev_priv) ?HPLLVCO_MOBILE :HPLLVCO ); vco = vco_table[tmp &0x7 ];if (vco ==0 )
@@ -412,12 +412,12 @@ static void gm45_get_cdclk(struct drm_i915_private *dev_priv,static void hsw_get_cdclk (struct drm_i915_private *dev_priv,struct intel_cdclk_state *cdclk_state) { -u32 lcpll =I915_READ (LCPLL_CTL ); +u32 lcpll =intel_de_read (dev_priv,LCPLL_CTL );u32 freq = lcpll &LCPLL_CLK_FREQ_MASK ;if (lcpll &LCPLL_CD_SOURCE_FCLK ) cdclk_state->cdclk =800000 ; -else if (I915_READ (FUSE_STRAP ) &HSW_CDCLK_LIMIT ) +else if (intel_de_read (dev_priv,FUSE_STRAP ) &HSW_CDCLK_LIMIT ) cdclk_state->cdclk =450000 ;else if (freq ==LCPLL_CLK_FREQ_450 ) cdclk_state->cdclk =450000 ;
@@ -515,17 +515,17 @@ static void vlv_program_pfi_credits(struct drm_i915_private *dev_priv)* WA - write default credits before re-programming * FIXME: should we also set the resend bit here? */ -I915_WRITE (GCI_CONTROL ,VGA_FAST_MODE_DISABLE | - default_credits); +intel_de_write (dev_priv,GCI_CONTROL , +VGA_FAST_MODE_DISABLE | default_credits); -I915_WRITE (GCI_CONTROL ,VGA_FAST_MODE_DISABLE | - credits |PFI_CREDIT_RESEND ); +intel_de_write (dev_priv,GCI_CONTROL , +VGA_FAST_MODE_DISABLE | credits |PFI_CREDIT_RESEND );/* * FIXME is this guaranteed to clear * immediately or should we poll for it? */ -WARN_ON (I915_READ (GCI_CONTROL ) &PFI_CREDIT_RESEND ); +WARN_ON (intel_de_read (dev_priv,GCI_CONTROL ) &PFI_CREDIT_RESEND ); } static void vlv_set_cdclk(struct drm_i915_private *dev_priv,
@@ -695,12 +695,12 @@ static u8 bdw_calc_voltage_level(int cdclk)static void bdw_get_cdclk (struct drm_i915_private *dev_priv,struct intel_cdclk_state *cdclk_state) { -u32 lcpll =I915_READ (LCPLL_CTL ); +u32 lcpll =intel_de_read (dev_priv,LCPLL_CTL );u32 freq = lcpll &LCPLL_CLK_FREQ_MASK ;if (lcpll &LCPLL_CD_SOURCE_FCLK ) cdclk_state->cdclk =800000 ; -else if (I915_READ (FUSE_STRAP ) &HSW_CDCLK_LIMIT ) +else if (intel_de_read (dev_priv,FUSE_STRAP ) &HSW_CDCLK_LIMIT ) cdclk_state->cdclk =450000 ;else if (freq ==LCPLL_CLK_FREQ_450 ) cdclk_state->cdclk =450000 ;
@@ -727,7 +727,7 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv,u32 val;int ret; - if (WARN((I915_READ(LCPLL_CTL) & + if (WARN((intel_de_read(dev_priv, LCPLL_CTL) & (LCPLL_PLL_DISABLE | LCPLL_PLL_LOCK | LCPLL_CD_CLOCK_DISABLE | LCPLL_ROOT_CD_CLOCK_DISABLE | LCPLL_CD2X_CLOCK_DISABLE | LCPLL_POWER_DOWN_ALLOW |
@@ -743,19 +743,19 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv,return ; } - 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);/* * According to the spec, it should be enough to poll for this 1 us. * However, extensive testing shows that this can take longer. */ -if (wait_for_us (I915_READ (LCPLL_CTL ) & +if (wait_for_us (intel_de_read (dev_priv,LCPLL_CTL ) &LCPLL_CD_SOURCE_FCLK_DONE ,100 ))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_CLK_FREQ_MASK ;switch (cdclk) {
@@ -776,20 +776,21 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv,break ; } -I915_WRITE (LCPLL_CTL , val); +intel_de_write (dev_priv,LCPLL_CTL , val); - 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 ) & -LCPLL_CD_SOURCE_FCLK_DONE ) ==0 ,1 )) +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" );sandybridge_pcode_write (dev_priv,HSW_PCODE_DE_WRITE_FREQ_REQ , cdclk_state->voltage_level); -I915_WRITE (CDCLK_FREQ ,DIV_ROUND_CLOSEST (cdclk,1000 ) -1 ); +intel_de_write (dev_priv,CDCLK_FREQ , +DIV_ROUND_CLOSEST (cdclk,1000 ) -1 );intel_update_cdclk (dev_priv); }
@@ -837,14 +838,14 @@ static void skl_dpll0_update(struct drm_i915_private *dev_priv, cdclk_state->ref =24000 ; cdclk_state->vco =0 ; - val =I915_READ (LCPLL1_CTL ); + val =intel_de_read (dev_priv,LCPLL1_CTL );if ((val &LCPLL_PLL_ENABLE ) ==0 )return ;if (WARN_ON ((val &LCPLL_PLL_LOCK ) ==0 ))return ; - val =I915_READ (DPLL_CTRL1 ); + val =intel_de_read (dev_priv,DPLL_CTRL1 ); if (WARN_ON((val & (DPLL_CTRL1_HDMI_MODE(SKL_DPLL0) | DPLL_CTRL1_SSC(SKL_DPLL0) |
@@ -881,7 +882,7 @@ static void skl_get_cdclk(struct drm_i915_private *dev_priv,if (cdclk_state->vco ==0 ) goto out; - cdctl =I915_READ (CDCLK_CTL ); + cdctl =intel_de_read (dev_priv,CDCLK_CTL );if (cdclk_state->vco ==8640000 ) {switch (cdctl &CDCLK_FREQ_SEL_MASK ) {
@@ -962,7 +963,7 @@ static void skl_dpll0_enable(struct drm_i915_private *dev_priv, int vco)* rate later on, with the constraint of choosing a frequency that * works with vco. */ - val =I915_READ (DPLL_CTRL1 ); + val =intel_de_read (dev_priv,DPLL_CTRL1 ); val &= ~(DPLL_CTRL1_HDMI_MODE (SKL_DPLL0 ) |DPLL_CTRL1_SSC (SKL_DPLL0 ) |DPLL_CTRL1_LINK_RATE_MASK (SKL_DPLL0 ));
@@ -974,10 +975,11 @@ static void skl_dpll0_enable(struct drm_i915_private *dev_priv, int vco) val |=DPLL_CTRL1_LINK_RATE (DPLL_CTRL1_LINK_RATE_810 ,SKL_DPLL0 ); -I915_WRITE (DPLL_CTRL1 , val); -POSTING_READ (DPLL_CTRL1 ); +intel_de_write (dev_priv,DPLL_CTRL1 , val); +intel_de_posting_read (dev_priv,DPLL_CTRL1 ); -I915_WRITE (LCPLL1_CTL ,I915_READ (LCPLL1_CTL ) |LCPLL_PLL_ENABLE ); +intel_de_write (dev_priv,LCPLL1_CTL , +intel_de_read (dev_priv,LCPLL1_CTL ) |LCPLL_PLL_ENABLE );if (intel_de_wait_for_set (dev_priv,LCPLL1_CTL ,LCPLL_PLL_LOCK ,5 ))drm_err (&dev_priv->drm,"DPLL0 not locked\n" );
@@ -990,7 +992,8 @@ static void skl_dpll0_enable(struct drm_i915_private *dev_priv, int vco)static void skl_dpll0_disable (struct drm_i915_private *dev_priv) { -I915_WRITE (LCPLL1_CTL ,I915_READ (LCPLL1_CTL ) & ~LCPLL_PLL_ENABLE ); +intel_de_write (dev_priv,LCPLL1_CTL , +intel_de_read (dev_priv,LCPLL1_CTL ) & ~LCPLL_PLL_ENABLE );if (intel_de_wait_for_clear (dev_priv,LCPLL1_CTL ,LCPLL_PLL_LOCK ,1 ))drm_err (&dev_priv->drm,"Couldn't disable DPLL0\n" );
@@ -1053,34 +1056,34 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv, dev_priv->cdclk.hw.vco != vco)skl_dpll0_disable (dev_priv); - cdclk_ctl =I915_READ (CDCLK_CTL ); + cdclk_ctl =intel_de_read (dev_priv,CDCLK_CTL );if (dev_priv->cdclk.hw.vco != vco) {/* Wa Display #1183: skl,kbl,cfl */ cdclk_ctl &= ~(CDCLK_FREQ_SEL_MASK |CDCLK_FREQ_DECIMAL_MASK ); cdclk_ctl |= freq_select |skl_cdclk_decimal (cdclk); -I915_WRITE (CDCLK_CTL , cdclk_ctl); +intel_de_write (dev_priv,CDCLK_CTL , cdclk_ctl); }/* Wa Display #1183: skl,kbl,cfl */ cdclk_ctl |=CDCLK_DIVMUX_CD_OVERRIDE ; -I915_WRITE (CDCLK_CTL , cdclk_ctl); -POSTING_READ (CDCLK_CTL ); +intel_de_write (dev_priv,CDCLK_CTL , cdclk_ctl); +intel_de_posting_read (dev_priv,CDCLK_CTL );if (dev_priv->cdclk.hw.vco != vco)skl_dpll0_enable (dev_priv, vco);/* Wa Display #1183: skl,kbl,cfl */ cdclk_ctl &= ~(CDCLK_FREQ_SEL_MASK |CDCLK_FREQ_DECIMAL_MASK ); -I915_WRITE (CDCLK_CTL , cdclk_ctl); +intel_de_write (dev_priv,CDCLK_CTL , cdclk_ctl); cdclk_ctl |= freq_select |skl_cdclk_decimal (cdclk); -I915_WRITE (CDCLK_CTL , cdclk_ctl); +intel_de_write (dev_priv,CDCLK_CTL , cdclk_ctl);/* Wa Display #1183: skl,kbl,cfl */ cdclk_ctl &= ~CDCLK_DIVMUX_CD_OVERRIDE ; -I915_WRITE (CDCLK_CTL , cdclk_ctl); -POSTING_READ (CDCLK_CTL ); +intel_de_write (dev_priv,CDCLK_CTL , cdclk_ctl); +intel_de_posting_read (dev_priv,CDCLK_CTL );/* inform PCU of the change */ sandybridge_pcode_write(dev_priv, SKL_PCODE_CDCLK_CONTROL,
@@ -1098,7 +1101,7 @@ static void skl_sanitize_cdclk(struct drm_i915_private *dev_priv)* There is SWF18 scratchpad register defined which is set by the * pre-os which can be used by the OS drivers to check the status */ -if ((I915_READ (SWF_ILK (0x18 )) &0x00FFFFFF ) ==0 ) +if ((intel_de_read (dev_priv,SWF_ILK (0x18 )) &0x00FFFFFF ) ==0 ) goto sanitize;intel_update_cdclk (dev_priv);
@@ -1115,7 +1118,7 @@ static void skl_sanitize_cdclk(struct drm_i915_private *dev_priv)* decimal part is programmed wrong from BIOS where pre-os does not * enable display. Verify the same as well. */ - cdctl =I915_READ (CDCLK_CTL ); + cdctl =intel_de_read (dev_priv,CDCLK_CTL ); expected = (cdctl &CDCLK_FREQ_SEL_MASK ) |skl_cdclk_decimal (dev_priv->cdclk.hw.cdclk);if (cdctl == expected)
@@ -1295,7 +1298,7 @@ static u8 ehl_calc_voltage_level(int cdclk)static void cnl_readout_refclk (struct drm_i915_private *dev_priv,struct intel_cdclk_state *cdclk_state) { -if (I915_READ (SKL_DSSM ) & CNL_DSSM_CDCLK_PLL_REFCLK_24MHz) +if (intel_de_read (dev_priv,SKL_DSSM ) & CNL_DSSM_CDCLK_PLL_REFCLK_24MHz) cdclk_state->ref =24000 ;else cdclk_state->ref =19200 ;
@@ -1304,7 +1307,7 @@ static void cnl_readout_refclk(struct drm_i915_private *dev_priv,static void icl_readout_refclk (struct drm_i915_private *dev_priv,struct intel_cdclk_state *cdclk_state) { -u32 dssm =I915_READ (SKL_DSSM ) &ICL_DSSM_CDCLK_PLL_REFCLK_MASK ; +u32 dssm =intel_de_read (dev_priv,SKL_DSSM ) &ICL_DSSM_CDCLK_PLL_REFCLK_MASK ;switch (dssm) {default :
@@ -1334,7 +1337,7 @@ static void bxt_de_pll_readout(struct drm_i915_private *dev_priv,else cdclk_state->ref =19200 ; - val =I915_READ (BXT_DE_PLL_ENABLE ); + val =intel_de_read (dev_priv,BXT_DE_PLL_ENABLE );if ((val &BXT_DE_PLL_PLL_ENABLE ) ==0 || (val &BXT_DE_PLL_LOCK ) ==0 ) {/*
@@ -1352,7 +1355,7 @@ static void bxt_de_pll_readout(struct drm_i915_private *dev_priv,if (INTEL_GEN (dev_priv) >=10 ) ratio = val &CNL_CDCLK_PLL_RATIO_MASK ;else - ratio =I915_READ (BXT_DE_PLL_CTL ) &BXT_DE_PLL_RATIO_MASK ; + ratio =intel_de_read (dev_priv,BXT_DE_PLL_CTL ) &BXT_DE_PLL_RATIO_MASK ; cdclk_state->vco = ratio * cdclk_state->ref; }
@@ -1377,7 +1380,7 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv, goto out; } - divider =I915_READ (CDCLK_CTL ) &BXT_CDCLK_CD2X_DIV_SEL_MASK ; + divider =intel_de_read (dev_priv,CDCLK_CTL ) &BXT_CDCLK_CD2X_DIV_SEL_MASK ;switch (divider) {case BXT_CDCLK_CD2X_DIV_SEL_1 :
@@ -1413,7 +1416,7 @@ static void bxt_get_cdclk(struct drm_i915_private *dev_priv,static void bxt_de_pll_disable (struct drm_i915_private *dev_priv) { -I915_WRITE (BXT_DE_PLL_ENABLE ,0 ); +intel_de_write (dev_priv,BXT_DE_PLL_ENABLE ,0 );/* Timeout 200us */ if (intel_de_wait_for_clear(dev_priv,
@@ -1428,12 +1431,12 @@ static void bxt_de_pll_enable(struct drm_i915_private *dev_priv, int vco)int ratio =DIV_ROUND_CLOSEST (vco, dev_priv->cdclk.hw.ref);u32 val; - val =I915_READ (BXT_DE_PLL_CTL ); + val =intel_de_read (dev_priv,BXT_DE_PLL_CTL ); val &= ~BXT_DE_PLL_RATIO_MASK ; val |=BXT_DE_PLL_RATIO (ratio); -I915_WRITE (BXT_DE_PLL_CTL , val); +intel_de_write (dev_priv,BXT_DE_PLL_CTL , val); -I915_WRITE (BXT_DE_PLL_ENABLE ,BXT_DE_PLL_PLL_ENABLE ); +intel_de_write (dev_priv,BXT_DE_PLL_ENABLE ,BXT_DE_PLL_PLL_ENABLE );/* Timeout 200us */ if (intel_de_wait_for_set(dev_priv,
@@ -1447,12 +1450,12 @@ static void cnl_cdclk_pll_disable(struct drm_i915_private *dev_priv) {u32 val; - val =I915_READ (BXT_DE_PLL_ENABLE ); + val =intel_de_read (dev_priv,BXT_DE_PLL_ENABLE ); val &= ~BXT_DE_PLL_PLL_ENABLE ; -I915_WRITE (BXT_DE_PLL_ENABLE , val); +intel_de_write (dev_priv,BXT_DE_PLL_ENABLE , val);/* Timeout 200us */ -if (wait_for ((I915_READ (BXT_DE_PLL_ENABLE ) &BXT_DE_PLL_LOCK ) ==0 ,1 )) +if (wait_for ((intel_de_read (dev_priv,BXT_DE_PLL_ENABLE ) &BXT_DE_PLL_LOCK ) ==0 ,1 ))drm_err (&dev_priv->drm,"timeout waiting for CDCLK PLL unlock\n" );
@@ -1465,13 +1468,13 @@ static void cnl_cdclk_pll_enable(struct drm_i915_private *dev_priv, int vco)u32 val; val =CNL_CDCLK_PLL_RATIO (ratio); -I915_WRITE (BXT_DE_PLL_ENABLE , val); +intel_de_write (dev_priv,BXT_DE_PLL_ENABLE , val); val |=BXT_DE_PLL_PLL_ENABLE ; -I915_WRITE (BXT_DE_PLL_ENABLE , val); +intel_de_write (dev_priv,BXT_DE_PLL_ENABLE , val);/* Timeout 200us */ -if (wait_for ((I915_READ (BXT_DE_PLL_ENABLE ) &BXT_DE_PLL_LOCK ) !=0 ,1 )) +if (wait_for ((intel_de_read (dev_priv,BXT_DE_PLL_ENABLE ) &BXT_DE_PLL_LOCK ) !=0 ,1 ))drm_err (&dev_priv->drm,"timeout waiting for CDCLK PLL lock\n" );
@@ -1578,7 +1581,7 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv,*/ if (IS_GEN9_LP (dev_priv) && cdclk >=500000 ) val |=BXT_CDCLK_SSA_PRECHARGE_ENABLE ; -I915_WRITE (CDCLK_CTL , val); +intel_de_write (dev_priv,CDCLK_CTL , val);if (pipe !=INVALID_PIPE )intel_wait_for_vblank (dev_priv, pipe);
@@ -1634,7 +1637,7 @@ static void bxt_sanitize_cdclk(struct drm_i915_private *dev_priv)* set reserved MBZ bits in CDCLK_CTL at least during exiting from S4, * so sanitize this register. */ - cdctl =I915_READ (CDCLK_CTL ); + cdctl =intel_de_read (dev_priv,CDCLK_CTL );/* * Let's ignore the pipe field, since BIOS could have configured the * dividers both synching to an active pipe, or asynchronously
@@ -2471,7 +2474,7 @@ void intel_update_max_cdclk(struct drm_i915_private *dev_priv) }else if (IS_CANNONLAKE (dev_priv)) { dev_priv->max_cdclk_freq =528000 ; }else if (IS_GEN9_BC (dev_priv)) { -u32 limit =I915_READ (SKL_DFSM ) &SKL_DFSM_CDCLK_LIMIT_MASK ; +u32 limit =intel_de_read (dev_priv,SKL_DFSM ) &SKL_DFSM_CDCLK_LIMIT_MASK ;int max_cdclk, vco; vco = dev_priv->skl_preferred_vco_freq;
@@ -2503,7 +2506,7 @@ void intel_update_max_cdclk(struct drm_i915_private *dev_priv)* How can we know if extra cooling is * available? PCI ID, VTB, something else? */ -if (I915_READ (FUSE_STRAP ) &HSW_CDCLK_LIMIT ) +if (intel_de_read (dev_priv,FUSE_STRAP ) &HSW_CDCLK_LIMIT ) dev_priv->max_cdclk_freq =450000 ;else if (IS_BDW_ULX (dev_priv)) dev_priv->max_cdclk_freq =450000 ;
@@ -2546,8 +2549,8 @@ void intel_update_cdclk(struct drm_i915_private *dev_priv)* generate GMBus clock. This will vary with the cdclk freq. */ if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) -I915_WRITE (GMBUSFREQ_VLV , -DIV_ROUND_UP (dev_priv->cdclk.hw.cdclk,1000 )); +intel_de_write (dev_priv,GMBUSFREQ_VLV , +DIV_ROUND_UP (dev_priv->cdclk.hw.cdclk,1000 )); }static int cnp_rawclk (struct drm_i915_private *dev_priv)
@@ -2555,7 +2558,7 @@ static int cnp_rawclk(struct drm_i915_private *dev_priv)u32 rawclk;int divider, fraction; -if (I915_READ (SFUSE_STRAP ) &SFUSE_STRAP_RAW_FREQUENCY ) { +if (intel_de_read (dev_priv,SFUSE_STRAP ) &SFUSE_STRAP_RAW_FREQUENCY ) {/* 24 MHz */ divider =24000 ; fraction =0 ;
@@ -2575,13 +2578,13 @@ static int cnp_rawclk(struct drm_i915_private *dev_priv) rawclk |=ICP_RAWCLK_NUM (numerator); } -I915_WRITE (PCH_RAWCLK_FREQ , rawclk); +intel_de_write (dev_priv,PCH_RAWCLK_FREQ , rawclk);return divider + fraction; }static int pch_rawclk (struct drm_i915_private *dev_priv) { -return (I915_READ (PCH_RAWCLK_FREQ ) &RAWCLK_FREQ_MASK ) *1000 ; +return (intel_de_read (dev_priv,PCH_RAWCLK_FREQ ) &RAWCLK_FREQ_MASK ) *1000 ; }static int vlv_hrawclk (struct drm_i915_private *dev_priv)
@@ -2596,7 +2599,7 @@ static int g4x_hrawclk(struct drm_i915_private *dev_priv)u32 clkcfg;/* hrawclock is 1/4 the FSB frequency */ - clkcfg =I915_READ (CLKCFG ); + clkcfg =intel_de_read (dev_priv,CLKCFG );switch (clkcfg &CLKCFG_FSB_MASK ) {case CLKCFG_FSB_400 :return 100000 ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 4/33 drm/i915/color: 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_color.c | 204 ++++++++++++--------- 1 file changed, 114 insertions(+), 90 deletions(-)
drivers/gpu/drm/i915/display/intel_color.c +114 -90
@@ -157,23 +157,29 @@ static void ilk_update_pipe_csc(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -I915_WRITE (PIPE_CSC_PREOFF_HI (pipe), preoff[0 ]); -I915_WRITE (PIPE_CSC_PREOFF_ME (pipe), preoff[1 ]); -I915_WRITE (PIPE_CSC_PREOFF_LO (pipe), preoff[2 ]); +intel_de_write (dev_priv,PIPE_CSC_PREOFF_HI (pipe), preoff[0 ]); +intel_de_write (dev_priv,PIPE_CSC_PREOFF_ME (pipe), preoff[1 ]); +intel_de_write (dev_priv,PIPE_CSC_PREOFF_LO (pipe), preoff[2 ]); -I915_WRITE (PIPE_CSC_COEFF_RY_GY (pipe), coeff[0 ] <<16 | coeff[1 ]); -I915_WRITE (PIPE_CSC_COEFF_BY (pipe), coeff[2 ] <<16 ); +intel_de_write (dev_priv,PIPE_CSC_COEFF_RY_GY (pipe), + coeff[0 ] <<16 | coeff[1 ]); +intel_de_write (dev_priv,PIPE_CSC_COEFF_BY (pipe), coeff[2 ] <<16 ); -I915_WRITE (PIPE_CSC_COEFF_RU_GU (pipe), coeff[3 ] <<16 | coeff[4 ]); -I915_WRITE (PIPE_CSC_COEFF_BU (pipe), coeff[5 ] <<16 ); +intel_de_write (dev_priv,PIPE_CSC_COEFF_RU_GU (pipe), + coeff[3 ] <<16 | coeff[4 ]); +intel_de_write (dev_priv,PIPE_CSC_COEFF_BU (pipe), coeff[5 ] <<16 ); -I915_WRITE (PIPE_CSC_COEFF_RV_GV (pipe), coeff[6 ] <<16 | coeff[7 ]); -I915_WRITE (PIPE_CSC_COEFF_BV (pipe), coeff[8 ] <<16 ); +intel_de_write (dev_priv,PIPE_CSC_COEFF_RV_GV (pipe), + coeff[6 ] <<16 | coeff[7 ]); +intel_de_write (dev_priv,PIPE_CSC_COEFF_BV (pipe), coeff[8 ] <<16 );if (INTEL_GEN (dev_priv) >=7 ) { -I915_WRITE (PIPE_CSC_POSTOFF_HI (pipe), postoff[0 ]); -I915_WRITE (PIPE_CSC_POSTOFF_ME (pipe), postoff[1 ]); -I915_WRITE (PIPE_CSC_POSTOFF_LO (pipe), postoff[2 ]); +intel_de_write (dev_priv,PIPE_CSC_POSTOFF_HI (pipe), + postoff[0 ]); +intel_de_write (dev_priv,PIPE_CSC_POSTOFF_ME (pipe), + postoff[1 ]); +intel_de_write (dev_priv,PIPE_CSC_POSTOFF_LO (pipe), + postoff[2 ]); } }
@@ -185,22 +191,28 @@ static void icl_update_output_csc(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -I915_WRITE (PIPE_CSC_OUTPUT_PREOFF_HI (pipe), preoff[0 ]); -I915_WRITE (PIPE_CSC_OUTPUT_PREOFF_ME (pipe), preoff[1 ]); -I915_WRITE (PIPE_CSC_OUTPUT_PREOFF_LO (pipe), preoff[2 ]); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_PREOFF_HI (pipe), preoff[0 ]); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_PREOFF_ME (pipe), preoff[1 ]); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_PREOFF_LO (pipe), preoff[2 ]); -I915_WRITE (PIPE_CSC_OUTPUT_COEFF_RY_GY (pipe), coeff[0 ] <<16 | coeff[1 ]); -I915_WRITE (PIPE_CSC_OUTPUT_COEFF_BY (pipe), coeff[2 ] <<16 ); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_COEFF_RY_GY (pipe), + coeff[0 ] <<16 | coeff[1 ]); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_COEFF_BY (pipe), + coeff[2 ] <<16 ); -I915_WRITE (PIPE_CSC_OUTPUT_COEFF_RU_GU (pipe), coeff[3 ] <<16 | coeff[4 ]); -I915_WRITE (PIPE_CSC_OUTPUT_COEFF_BU (pipe), coeff[5 ] <<16 ); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_COEFF_RU_GU (pipe), + coeff[3 ] <<16 | coeff[4 ]); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_COEFF_BU (pipe), + coeff[5 ] <<16 ); -I915_WRITE (PIPE_CSC_OUTPUT_COEFF_RV_GV (pipe), coeff[6 ] <<16 | coeff[7 ]); -I915_WRITE (PIPE_CSC_OUTPUT_COEFF_BV (pipe), coeff[8 ] <<16 ); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_COEFF_RV_GV (pipe), + coeff[6 ] <<16 | coeff[7 ]); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_COEFF_BV (pipe), + coeff[8 ] <<16 ); -I915_WRITE (PIPE_CSC_OUTPUT_POSTOFF_HI (pipe), postoff[0 ]); -I915_WRITE (PIPE_CSC_OUTPUT_POSTOFF_ME (pipe), postoff[1 ]); -I915_WRITE (PIPE_CSC_OUTPUT_POSTOFF_LO (pipe), postoff[2 ]); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_POSTOFF_HI (pipe), postoff[0 ]); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_POSTOFF_ME (pipe), postoff[1 ]); +intel_de_write (dev_priv,PIPE_CSC_OUTPUT_POSTOFF_LO (pipe), postoff[2 ]); }static bool ilk_csc_limited_range (const struct intel_crtc_state *crtc_state)
@@ -304,7 +316,8 @@ static void ilk_load_csc_matrix(const struct intel_crtc_state *crtc_state) ilk_csc_off_zero); } -I915_WRITE (PIPE_CSC_MODE (crtc->pipe), crtc_state->csc_mode); +intel_de_write (dev_priv,PIPE_CSC_MODE (crtc->pipe), + crtc_state->csc_mode); }static void icl_load_csc_matrix (const struct intel_crtc_state *crtc_state)
@@ -330,7 +343,8 @@ static void icl_load_csc_matrix(const struct intel_crtc_state *crtc_state) ilk_csc_postoff_limited_range); } -I915_WRITE (PIPE_CSC_MODE (crtc->pipe), crtc_state->csc_mode); +intel_de_write (dev_priv,PIPE_CSC_MODE (crtc->pipe), + crtc_state->csc_mode); }/*
@@ -363,18 +377,18 @@ static void cherryview_load_csc_matrix(const struct intel_crtc_state *crtc_state coeffs[i] |= (abs_coeff >>20 ) &0xfff ; } -I915_WRITE (CGM_PIPE_CSC_COEFF01 (pipe), - coeffs[1 ] <<16 | coeffs[0 ]); -I915_WRITE (CGM_PIPE_CSC_COEFF23 (pipe), - coeffs[3 ] <<16 | coeffs[2 ]); -I915_WRITE (CGM_PIPE_CSC_COEFF45 (pipe), - coeffs[5 ] <<16 | coeffs[4 ]); -I915_WRITE (CGM_PIPE_CSC_COEFF67 (pipe), - coeffs[7 ] <<16 | coeffs[6 ]); -I915_WRITE (CGM_PIPE_CSC_COEFF8 (pipe), coeffs[8 ]); +intel_de_write (dev_priv,CGM_PIPE_CSC_COEFF01 (pipe), + coeffs[1 ] <<16 | coeffs[0 ]); +intel_de_write (dev_priv,CGM_PIPE_CSC_COEFF23 (pipe), + coeffs[3 ] <<16 | coeffs[2 ]); +intel_de_write (dev_priv,CGM_PIPE_CSC_COEFF45 (pipe), + coeffs[5 ] <<16 | coeffs[4 ]); +intel_de_write (dev_priv,CGM_PIPE_CSC_COEFF67 (pipe), + coeffs[7 ] <<16 | coeffs[6 ]); +intel_de_write (dev_priv,CGM_PIPE_CSC_COEFF8 (pipe), coeffs[8 ]); } -I915_WRITE (CGM_PIPE_MODE (pipe), crtc_state->cgm_mode); +intel_de_write (dev_priv,CGM_PIPE_MODE (pipe), crtc_state->cgm_mode); }/* i965+ "10.6" bit interpolated format "even DW" (low 8 bits) */
@@ -426,9 +440,11 @@ static void i9xx_load_luts_internal(const struct intel_crtc_state *crtc_state,drm_color_lut_extract (lut[i].blue,8 );if (HAS_GMCH (dev_priv)) -I915_WRITE (PALETTE (pipe, i), word); +intel_de_write (dev_priv,PALETTE (pipe, i), + word);else -I915_WRITE (LGC_PALETTE (pipe, i), word); +intel_de_write (dev_priv,LGC_PALETTE (pipe, i), + word); } } }
@@ -445,10 +461,10 @@ static void i9xx_color_commit(const struct intel_crtc_state *crtc_state)enum pipe pipe = crtc->pipe;u32 val; - val =I915_READ (PIPECONF (pipe)); + val =intel_de_read (dev_priv,PIPECONF (pipe)); val &= ~PIPECONF_GAMMA_MODE_MASK_I9XX ; val |=PIPECONF_GAMMA_MODE (crtc_state->gamma_mode); -I915_WRITE (PIPECONF (pipe), val); +intel_de_write (dev_priv,PIPECONF (pipe), val); }static void ilk_color_commit (const struct intel_crtc_state *crtc_state)
@@ -458,10 +474,10 @@ static void ilk_color_commit(const struct intel_crtc_state *crtc_state)enum pipe pipe = crtc->pipe;u32 val; - val =I915_READ (PIPECONF (pipe)); + val =intel_de_read (dev_priv,PIPECONF (pipe)); val &= ~PIPECONF_GAMMA_MODE_MASK_ILK ; val |=PIPECONF_GAMMA_MODE (crtc_state->gamma_mode); -I915_WRITE (PIPECONF (pipe), val); +intel_de_write (dev_priv,PIPECONF (pipe), val);ilk_load_csc_matrix (crtc_state); }
@@ -471,7 +487,8 @@ static void hsw_color_commit(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 (GAMMA_MODE (crtc->pipe), crtc_state->gamma_mode); +intel_de_write (dev_priv,GAMMA_MODE (crtc->pipe), + crtc_state->gamma_mode);ilk_load_csc_matrix (crtc_state); }
@@ -492,9 +509,10 @@ static void skl_color_commit(const struct intel_crtc_state *crtc_state) val |=SKL_BOTTOM_COLOR_GAMMA_ENABLE ;if (crtc_state->csc_enable) val |=SKL_BOTTOM_COLOR_CSC_ENABLE ; -I915_WRITE (SKL_BOTTOM_COLOR (pipe), val); +intel_de_write (dev_priv,SKL_BOTTOM_COLOR (pipe), val); -I915_WRITE (GAMMA_MODE (crtc->pipe), crtc_state->gamma_mode); +intel_de_write (dev_priv,GAMMA_MODE (crtc->pipe), + crtc_state->gamma_mode);if (INTEL_GEN (dev_priv) >=11 )icl_load_csc_matrix (crtc_state);
@@ -511,15 +529,15 @@ static void i965_load_lut_10p6(struct intel_crtc *crtc,enum pipe pipe = crtc->pipe;for (i =0 ; i < lut_size -1 ; i++) { -I915_WRITE (PALETTE (pipe,2 * i +0 ), -i965_lut_10p6_ldw (&lut[i])); -I915_WRITE (PALETTE (pipe,2 * i +1 ), -i965_lut_10p6_udw (&lut[i])); +intel_de_write (dev_priv,PALETTE (pipe,2 * i +0 ), +i965_lut_10p6_ldw (&lut[i])); +intel_de_write (dev_priv,PALETTE (pipe,2 * i +1 ), +i965_lut_10p6_udw (&lut[i])); } -I915_WRITE (PIPEGCMAX (pipe,0 ), lut[i].red); -I915_WRITE (PIPEGCMAX (pipe,1 ), lut[i].green); -I915_WRITE (PIPEGCMAX (pipe,2 ), lut[i].blue); +intel_de_write (dev_priv,PIPEGCMAX (pipe,0 ), lut[i].red); +intel_de_write (dev_priv,PIPEGCMAX (pipe,1 ), lut[i].green); +intel_de_write (dev_priv,PIPEGCMAX (pipe,2 ), lut[i].blue); }static void i965_load_luts (const struct intel_crtc_state *crtc_state)
@@ -542,7 +560,8 @@ static void ilk_load_lut_10(struct intel_crtc *crtc,enum pipe pipe = crtc->pipe;for (i =0 ; i < lut_size; i++) -I915_WRITE (PREC_PALETTE (pipe, i),ilk_lut_10 (&lut[i])); +intel_de_write (dev_priv,PREC_PALETTE (pipe, i), +ilk_lut_10 (&lut[i])); }static void ilk_load_luts (const struct intel_crtc_state *crtc_state)
@@ -584,15 +603,16 @@ static void ivb_load_lut_10(struct intel_crtc *crtc,const struct drm_color_lut *entry = &lut[i * (lut_size -1 ) / (hw_lut_size -1 )]; -I915_WRITE (PREC_PAL_INDEX (pipe), prec_index++); -I915_WRITE (PREC_PAL_DATA (pipe),ilk_lut_10 (entry)); +intel_de_write (dev_priv,PREC_PAL_INDEX (pipe), prec_index++); +intel_de_write (dev_priv,PREC_PAL_DATA (pipe), +ilk_lut_10 (entry)); }/* * Reset the index, otherwise it prevents the legacy palette to be * written properly. */ -I915_WRITE (PREC_PAL_INDEX (pipe),0 ); +intel_de_write (dev_priv,PREC_PAL_INDEX (pipe),0 ); }/* On BDW+ the index auto increment mode actually works */
@@ -606,22 +626,23 @@ static void bdw_load_lut_10(struct intel_crtc *crtc,int i, lut_size =drm_color_lut_size (blob);enum pipe pipe = crtc->pipe; -I915_WRITE (PREC_PAL_INDEX (pipe), prec_index | -PAL_PREC_AUTO_INCREMENT ); +intel_de_write (dev_priv,PREC_PAL_INDEX (pipe), + prec_index |PAL_PREC_AUTO_INCREMENT );for (i =0 ; i < hw_lut_size; i++) {/* We discard half the user entries in split gamma mode */ const struct drm_color_lut *entry = &lut[i * (lut_size -1 ) / (hw_lut_size -1 )]; -I915_WRITE (PREC_PAL_DATA (pipe),ilk_lut_10 (entry)); +intel_de_write (dev_priv,PREC_PAL_DATA (pipe), +ilk_lut_10 (entry)); }/* * Reset the index, otherwise it prevents the legacy palette to be * written properly. */ -I915_WRITE (PREC_PAL_INDEX (pipe),0 ); +intel_de_write (dev_priv,PREC_PAL_INDEX (pipe),0 ); }static void ivb_load_lut_ext_max (struct intel_crtc *crtc)
@@ -712,8 +733,9 @@ static void glk_load_degamma_lut(const struct intel_crtc_state *crtc_state)* ignore the index bits, so we need to reset it to index 0 * separately. */ -I915_WRITE (PRE_CSC_GAMC_INDEX (pipe),0 ); -I915_WRITE (PRE_CSC_GAMC_INDEX (pipe),PRE_CSC_GAMC_AUTO_INCREMENT ); +intel_de_write (dev_priv,PRE_CSC_GAMC_INDEX (pipe),0 ); +intel_de_write (dev_priv,PRE_CSC_GAMC_INDEX (pipe), +PRE_CSC_GAMC_AUTO_INCREMENT );for (i =0 ; i < lut_size; i++) {/*
@@ -729,12 +751,13 @@ static void glk_load_degamma_lut(const struct intel_crtc_state *crtc_state)* ToDo: Extend to max 7.0. Enable 32 bit input value * as compared to just 16 to achieve this. */ -I915_WRITE (PRE_CSC_GAMC_DATA (pipe), lut[i].green); +intel_de_write (dev_priv,PRE_CSC_GAMC_DATA (pipe), + lut[i].green); }/* Clamp values > 1.0. */ while (i++ <35 ) -I915_WRITE (PRE_CSC_GAMC_DATA (pipe),1 <<16 ); +intel_de_write (dev_priv,PRE_CSC_GAMC_DATA (pipe),1 <<16 ); }static void glk_load_degamma_lut_linear (const struct intel_crtc_state *crtc_state)
@@ -750,18 +773,19 @@ static void glk_load_degamma_lut_linear(const struct intel_crtc_state *crtc_stat* ignore the index bits, so we need to reset it to index 0 * separately. */ -I915_WRITE (PRE_CSC_GAMC_INDEX (pipe),0 ); -I915_WRITE (PRE_CSC_GAMC_INDEX (pipe),PRE_CSC_GAMC_AUTO_INCREMENT ); +intel_de_write (dev_priv,PRE_CSC_GAMC_INDEX (pipe),0 ); +intel_de_write (dev_priv,PRE_CSC_GAMC_INDEX (pipe), +PRE_CSC_GAMC_AUTO_INCREMENT );for (i =0 ; i < lut_size; i++) {u32 v = (i <<16 ) / (lut_size -1 ); -I915_WRITE (PRE_CSC_GAMC_DATA (pipe), v); +intel_de_write (dev_priv,PRE_CSC_GAMC_DATA (pipe), v); }/* Clamp values > 1.0. */ while (i++ <35 ) -I915_WRITE (PRE_CSC_GAMC_DATA (pipe),1 <<16 ); +intel_de_write (dev_priv,PRE_CSC_GAMC_DATA (pipe),1 <<16 ); }static void glk_load_luts (const struct intel_crtc_state *crtc_state)
@@ -954,10 +978,10 @@ static void chv_load_cgm_degamma(struct intel_crtc *crtc,enum pipe pipe = crtc->pipe;for (i =0 ; i < lut_size; i++) { -I915_WRITE (CGM_PIPE_DEGAMMA (pipe, i,0 ), -chv_cgm_degamma_ldw (&lut[i])); -I915_WRITE (CGM_PIPE_DEGAMMA (pipe, i,1 ), -chv_cgm_degamma_udw (&lut[i])); +intel_de_write (dev_priv,CGM_PIPE_DEGAMMA (pipe, i,0 ), +chv_cgm_degamma_ldw (&lut[i])); +intel_de_write (dev_priv,CGM_PIPE_DEGAMMA (pipe, i,1 ), +chv_cgm_degamma_udw (&lut[i])); } }
@@ -981,10 +1005,10 @@ static void chv_load_cgm_gamma(struct intel_crtc *crtc,enum pipe pipe = crtc->pipe;for (i =0 ; i < lut_size; i++) { -I915_WRITE (CGM_PIPE_GAMMA (pipe, i,0 ), -chv_cgm_gamma_ldw (&lut[i])); -I915_WRITE (CGM_PIPE_GAMMA (pipe, i,1 ), -chv_cgm_gamma_udw (&lut[i])); +intel_de_write (dev_priv,CGM_PIPE_GAMMA (pipe, i,0 ), +chv_cgm_gamma_ldw (&lut[i])); +intel_de_write (dev_priv,CGM_PIPE_GAMMA (pipe, i,1 ), +chv_cgm_gamma_udw (&lut[i])); } }
@@ -1663,9 +1687,9 @@ i9xx_read_lut_8(const struct intel_crtc_state *crtc_state)for (i =0 ; i <LEGACY_LUT_LENGTH ; i++) {if (HAS_GMCH (dev_priv)) - val =I915_READ (PALETTE (pipe, i)); + val =intel_de_read (dev_priv,PALETTE (pipe, i));else - val =I915_READ (LGC_PALETTE (pipe, i)); + val =intel_de_read (dev_priv,LGC_PALETTE (pipe, i)); blob_data[i].red =intel_color_lut_pack (REG_FIELD_GET (LGC_PALETTE_RED_MASK , val),8 );
@@ -1706,8 +1730,8 @@ i965_read_lut_10p6(const struct intel_crtc_state *crtc_state) blob_data = blob->data;for (i =0 ; i < lut_size -1 ; i++) { - val1 =I915_READ (PALETTE (pipe,2 * i +0 )); - val2 =I915_READ (PALETTE (pipe,2 * i +1 )); + val1 =intel_de_read (dev_priv,PALETTE (pipe,2 * i +0 )); + val2 =intel_de_read (dev_priv,PALETTE (pipe,2 * i +1 )); blob_data[i].red =REG_FIELD_GET (PALETTE_RED_MASK , val2) <<8 |REG_FIELD_GET (PALETTE_RED_MASK , val1);
@@ -1718,11 +1742,11 @@ i965_read_lut_10p6(const struct intel_crtc_state *crtc_state) } blob_data[i].red =REG_FIELD_GET (PIPEGCMAX_RGB_MASK , -I915_READ (PIPEGCMAX (pipe,0 ))); +intel_de_read (dev_priv,PIPEGCMAX (pipe,0 ))); blob_data[i].green =REG_FIELD_GET (PIPEGCMAX_RGB_MASK , -I915_READ (PIPEGCMAX (pipe,1 ))); +intel_de_read (dev_priv,PIPEGCMAX (pipe,1 ))); blob_data[i].blue =REG_FIELD_GET (PIPEGCMAX_RGB_MASK , -I915_READ (PIPEGCMAX (pipe,2 ))); +intel_de_read (dev_priv,PIPEGCMAX (pipe,2 )));return blob; }
@@ -1758,13 +1782,13 @@ chv_read_cgm_lut(const struct intel_crtc_state *crtc_state) blob_data = blob->data;for (i =0 ; i < lut_size; i++) { - val =I915_READ (CGM_PIPE_GAMMA (pipe, i,0 )); + val =intel_de_read (dev_priv,CGM_PIPE_GAMMA (pipe, i,0 )); blob_data[i].green =intel_color_lut_pack (REG_FIELD_GET (CGM_PIPE_GAMMA_GREEN_MASK , val),10 ); blob_data[i].blue =intel_color_lut_pack (REG_FIELD_GET (CGM_PIPE_GAMMA_BLUE_MASK , val),10 ); - val =I915_READ (CGM_PIPE_GAMMA (pipe, i,1 )); + val =intel_de_read (dev_priv,CGM_PIPE_GAMMA (pipe, i,1 )); blob_data[i].red =intel_color_lut_pack (REG_FIELD_GET (CGM_PIPE_GAMMA_RED_MASK , val),10 ); }
@@ -1800,7 +1824,7 @@ ilk_read_lut_10(const struct intel_crtc_state *crtc_state) blob_data = blob->data;for (i =0 ; i < lut_size; i++) { - val =I915_READ (PREC_PALETTE (pipe, i)); + val =intel_de_read (dev_priv,PREC_PALETTE (pipe, i)); blob_data[i].red =intel_color_lut_pack (REG_FIELD_GET (PREC_PALETTE_RED_MASK , val),10 );
@@ -1846,11 +1870,11 @@ glk_read_lut_10(const struct intel_crtc_state *crtc_state, u32 prec_index) blob_data = blob->data; -I915_WRITE (PREC_PAL_INDEX (pipe), prec_index | -PAL_PREC_AUTO_INCREMENT ); +intel_de_write (dev_priv,PREC_PAL_INDEX (pipe), + prec_index |PAL_PREC_AUTO_INCREMENT );for (i =0 ; i < hw_lut_size; i++) { - val =I915_READ (PREC_PAL_DATA (pipe)); + val =intel_de_read (dev_priv,PREC_PAL_DATA (pipe)); blob_data[i].red =intel_color_lut_pack (REG_FIELD_GET (PREC_PAL_DATA_RED_MASK , val),10 );
@@ -1860,7 +1884,7 @@ glk_read_lut_10(const struct intel_crtc_state *crtc_state, u32 prec_index) PREC_PAL_DATA_BLUE_MASK, val), 10); } -I915_WRITE (PREC_PAL_INDEX (pipe),0 ); +intel_de_write (dev_priv,PREC_PAL_INDEX (pipe),0 );return blob; }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 5/33 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 icl_combo_phy_verify_state(struct drm_i915_private *dev_priv,
@@ -257,10 +257,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 u32 ehl_combo_phy_a_mux (struct drm_i915_private *i915,u32 val)
@@ -318,28 +318,28 @@ 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 =ehl_combo_phy_a_mux (dev_priv, val); 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); } }
@@ -363,14 +363,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
Re: [Intel-gfx] [RFC 05/33] drm/i915/combo_phy: use intel_de_*() functions for register access
Quoted 105 lines · Jani Nikula
The implicit "
dev_priv" local variable use has been a long-standing pain point in the register access macrosI915_READ(),I915_WRITE(),POSTING_READ(),I915_READ_FW(), andI915_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(), andintel_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)Signed-off-by Jani Nikula <[email protected]>--- .../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 +9
-10@@ -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);
drivers/gpu/drm/i915/display/intel_combo_phy.c static void cnl_combo_phys_init(struct drm_i915_private *dev_priv) · line 163
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_combo_phy.c +3
-2+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);
Drive by comment...could some fancier coccinelle usage change these to intel_de_rmw() instead? We have a lot of rmw behavior for PHY registers, and I believe some for pre-ilk watermarks and clock gating workarounds in intel_pm.c too.
Matt
Quoted 112 lines
drivers/gpu/drm/i915/display/intel_combo_phy.c +21
-21- 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 icl_combo_phy_verify_state(struct drm_i915_private *dev_priv,@@ -257,10 +257,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 u32 ehl_combo_phy_a_mux (struct drm_i915_private *i915,u32 val)@@ -318,28 +318,28 @@ 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 =ehl_combo_phy_a_mux (dev_priv, val); 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); } }@@ -363,14 +363,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
Signature · 9 lines
Matt Roper Graphics Software Engineer VTT-OSGC Platform Enablement Intel Corporation (916) 356-2795 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [RFC 05/33] drm/i915/combo_phy: use intel_de_*() functions for register access
Quoted 14 lines · Matt Roper
Quoted 13 lines · Jani Nikula
drivers/gpu/drm/i915/display/intel_combo_phy.c +2
-2@@ -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 );
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_combo_phy.c static void cnl_combo_phys_init(struct drm_i915_private *dev_priv) · line 163
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_combo_phy.c +2
-2- 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);Drive by comment...could some fancier coccinelle usage change these to
intel_de_rmw()instead? We have a lot of rmw behavior for PHY registers, and I believe some for pre-ilk watermarks and clock gating workarounds inintel_pm.ctoo.
I decided I wanted to get these merged, as folks seemed to agree with the approach. The fancy cocci would take a while to figure out. But I'll look into it as a follow-up.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 6/33 drm/i915/crt: 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_crt.c | 51 ++++++++++++------------ 1 file changed, 26 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/display/intel_crt.c +26 -25
@@ -75,7 +75,7 @@ bool intel_crt_port_enabled(struct drm_i915_private *dev_priv, {u32 val; - val =I915_READ (adpa_reg); + val =intel_de_read (dev_priv, adpa_reg);/* asserts want to know the pipe even if the port is disabled */ if (HAS_PCH_CPT (dev_priv))
@@ -112,7 +112,7 @@ static unsigned int intel_crt_get_flags(struct intel_encoder *encoder)struct intel_crt *crt =intel_encoder_to_crt (encoder);u32 tmp, flags =0 ; - tmp =I915_READ (crt->adpa_reg); + tmp =intel_de_read (dev_priv, crt->adpa_reg);if (tmp &ADPA_HSYNC_ACTIVE_HIGH ) flags |=DRM_MODE_FLAG_PHSYNC ;
@@ -184,7 +184,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder, adpa |=ADPA_PIPE_SEL (crtc->pipe);if (!HAS_PCH_SPLIT (dev_priv)) -I915_WRITE (BCLRPAT (crtc->pipe),0 ); +intel_de_write (dev_priv,BCLRPAT (crtc->pipe),0 );switch (mode) {case DRM_MODE_DPMS_ON :
@@ -201,7 +201,7 @@ static void intel_crt_set_dpms(struct intel_encoder *encoder,break ; } -I915_WRITE (crt->adpa_reg, adpa); +intel_de_write (dev_priv, crt->adpa_reg, adpa); } static void intel_disable_crt(struct intel_encoder *encoder,
@@ -442,14 +442,14 @@ static bool ilk_crt_detect_hotplug(struct drm_connector *connector) crt->force_hotplug_required = false; - save_adpa = adpa =I915_READ (crt->adpa_reg); + save_adpa = adpa =intel_de_read (dev_priv, crt->adpa_reg);DRM_DEBUG_KMS ("trigger hotplug detect cycle: adpa=0x%x\n" , adpa); adpa |=ADPA_CRT_HOTPLUG_FORCE_TRIGGER ;if (turn_off_dac) adpa &= ~ADPA_DAC_ENABLE ; -I915_WRITE (crt->adpa_reg, adpa); +intel_de_write (dev_priv, crt->adpa_reg, adpa); if (intel_de_wait_for_clear(dev_priv, crt->adpa_reg,
@@ -458,13 +458,13 @@ static bool ilk_crt_detect_hotplug(struct drm_connector *connector)DRM_DEBUG_KMS ("timed out waiting for FORCE_TRIGGER" );if (turn_off_dac) { -I915_WRITE (crt->adpa_reg, save_adpa); -POSTING_READ (crt->adpa_reg); +intel_de_write (dev_priv, crt->adpa_reg, save_adpa); +intel_de_posting_read (dev_priv, crt->adpa_reg); } }/* Check the status to see if both blue and green are on now */ - adpa =I915_READ (crt->adpa_reg); + adpa =intel_de_read (dev_priv, crt->adpa_reg);if ((adpa &ADPA_CRT_HOTPLUG_MONITOR_MASK ) !=0 ) ret = true;else
@@ -498,21 +498,21 @@ static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)*/ reenable_hpd =intel_hpd_disable (dev_priv, crt->base.hpd_pin); - save_adpa = adpa =I915_READ (crt->adpa_reg); + save_adpa = adpa =intel_de_read (dev_priv, crt->adpa_reg);DRM_DEBUG_KMS ("trigger hotplug detect cycle: adpa=0x%x\n" , adpa); adpa |=ADPA_CRT_HOTPLUG_FORCE_TRIGGER ; -I915_WRITE (crt->adpa_reg, adpa); +intel_de_write (dev_priv, crt->adpa_reg, adpa);if (intel_de_wait_for_clear (dev_priv, crt->adpa_reg,ADPA_CRT_HOTPLUG_FORCE_TRIGGER ,1000 )) {DRM_DEBUG_KMS ("timed out waiting for FORCE_TRIGGER" ); -I915_WRITE (crt->adpa_reg, save_adpa); +intel_de_write (dev_priv, crt->adpa_reg, save_adpa); }/* Check the status to see if both blue and green are on now */ - adpa =I915_READ (crt->adpa_reg); + adpa =intel_de_read (dev_priv, crt->adpa_reg);if ((adpa &ADPA_CRT_HOTPLUG_MONITOR_MASK ) !=0 ) ret = true;else
@@ -561,12 +561,12 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)DRM_DEBUG_KMS ("timed out waiting for FORCE_DETECT to go off" ); } - stat =I915_READ (PORT_HOTPLUG_STAT ); + stat =intel_de_read (dev_priv,PORT_HOTPLUG_STAT );if ((stat &CRT_HOTPLUG_MONITOR_MASK ) !=CRT_HOTPLUG_MONITOR_NONE ) ret = true;/* clear the interrupt we just generated, if any */ -I915_WRITE (PORT_HOTPLUG_STAT ,CRT_HOTPLUG_INT_STATUS ); +intel_de_write (dev_priv,PORT_HOTPLUG_STAT ,CRT_HOTPLUG_INT_STATUS );i915_hotplug_interrupt_update (dev_priv,CRT_HOTPLUG_FORCE_DETECT ,0 );
@@ -706,7 +706,7 @@ intel_crt_load_detect(struct intel_crt *crt, u32 pipe)* Yes, this will flicker */ if (vblank_start <= vactive && vblank_end >= vtotal) { -u32 vsync =I915_READ (vsync_reg); +u32 vsync =intel_de_read (dev_priv, vsync_reg);u32 vsync_start = (vsync &0xffff ) +1 ; vblank_start = vsync_start;
@@ -918,11 +918,11 @@ void intel_crt_reset(struct drm_encoder *encoder)if (INTEL_GEN (dev_priv) >=5 ) {u32 adpa; - adpa =I915_READ (crt->adpa_reg); + adpa =intel_de_read (dev_priv, crt->adpa_reg); adpa &= ~ADPA_CRT_HOTPLUG_MASK ; adpa |=ADPA_HOTPLUG_BITS ; -I915_WRITE (crt->adpa_reg, adpa); -POSTING_READ (crt->adpa_reg); +intel_de_write (dev_priv, crt->adpa_reg, adpa); +intel_de_posting_read (dev_priv, crt->adpa_reg);DRM_DEBUG_KMS ("crt adpa set to 0x%x\n" , adpa); crt->force_hotplug_required = true;
@@ -969,7 +969,7 @@ void intel_crt_init(struct drm_i915_private *dev_priv)else adpa_reg =ADPA ; - adpa =I915_READ (adpa_reg); + adpa =intel_de_read (dev_priv, adpa_reg);if ((adpa &ADPA_DAC_ENABLE ) ==0 ) {/* * On some machines (some IVB at least) CRT can be
@@ -979,11 +979,11 @@ void intel_crt_init(struct drm_i915_private *dev_priv)* take. So the only way to tell is attempt to enable * it and see what happens. */ -I915_WRITE (adpa_reg, adpa |ADPA_DAC_ENABLE | -ADPA_HSYNC_CNTL_DISABLE |ADPA_VSYNC_CNTL_DISABLE ); -if ((I915_READ (adpa_reg) &ADPA_DAC_ENABLE ) ==0 ) +intel_de_write (dev_priv, adpa_reg, + adpa |ADPA_DAC_ENABLE |ADPA_HSYNC_CNTL_DISABLE |ADPA_VSYNC_CNTL_DISABLE ); +if ((intel_de_read (dev_priv, adpa_reg) &ADPA_DAC_ENABLE ) ==0 )return ; -I915_WRITE (adpa_reg, adpa); +intel_de_write (dev_priv, adpa_reg, adpa); } crt =kzalloc (sizeof (struct intel_crt ),GFP_KERNEL );
@@ -1074,7 +1074,8 @@ void intel_crt_init(struct drm_i915_private *dev_priv)u32 fdi_config =FDI_RX_POLARITY_REVERSED_LPT |FDI_RX_LINK_REVERSAL_OVERRIDE ; - dev_priv->fdi_rx_config =I915_READ (FDI_RX_CTL (PIPE_A )) & fdi_config; + dev_priv->fdi_rx_config =intel_de_read (dev_priv, +FDI_RX_CTL (PIPE_A )) & fdi_config; }intel_crt_reset (&crt->base.base);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 7/33 drm/i915/ddi: 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_ddi.c | 474 ++++++++++++----------- 1 file changed, 245 insertions(+), 229 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +245 -229
@@ -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
@@ -3354,9 +3364,9 @@ tgl_clear_psr2_transcoder_exitline(const struct intel_crtc_state *cstate)if (!cstate->dc3co_exitline)return ; - val =I915_READ (EXITLINE (cstate->cpu_transcoder)); + val =intel_de_read (dev_priv,EXITLINE (cstate->cpu_transcoder)); val &= ~(EXITLINE_MASK |EXITLINE_ENABLE ); -I915_WRITE (EXITLINE (cstate->cpu_transcoder), val); +intel_de_write (dev_priv,EXITLINE (cstate->cpu_transcoder), val); } static void
@@ -3370,11 +3380,11 @@ tgl_set_psr2_transcoder_exitline(const struct intel_crtc_state *cstate) exit_scanlines = cstate->dc3co_exitline; exit_scanlines <<=EXITLINE_SHIFT ; - val =I915_READ (EXITLINE (cstate->cpu_transcoder)); + val =intel_de_read (dev_priv,EXITLINE (cstate->cpu_transcoder)); val &= ~(EXITLINE_MASK |EXITLINE_ENABLE ); val |= exit_scanlines; val |=EXITLINE_ENABLE ; -I915_WRITE (EXITLINE (cstate->cpu_transcoder), val); +intel_de_write (dev_priv,EXITLINE (cstate->cpu_transcoder), val); } static void tgl_dc3co_exitline_compute_config(struct intel_encoder *encoder,
@@ -3419,7 +3429,7 @@ static void tgl_dc3co_exitline_get_config(struct intel_crtc_state *crtc_state)if (INTEL_GEN (dev_priv) <12 )return ; - val =I915_READ (EXITLINE (crtc_state->cpu_transcoder)); + val =intel_de_read (dev_priv,EXITLINE (crtc_state->cpu_transcoder));if (val &EXITLINE_ENABLE ) crtc_state->dc3co_exitline = val &EXITLINE_MASK ;
@@ -3750,20 +3760,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 */
@@ -3795,9 +3805,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)
@@ -3860,7 +3873,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,
@@ -3934,25 +3948,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,
@@ -4022,7 +4036,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 |
@@ -4031,8 +4045,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 );
@@ -4043,15 +4057,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);
@@ -4241,20 +4255,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);
@@ -4269,12 +4283,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 ); }
@@ -4288,7 +4302,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); }
@@ -4315,7 +4329,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
@@ -4384,7 +4398,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,
@@ -4759,7 +4773,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 */
@@ -4839,10 +4853,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
RFC 8/33 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
@@ -518,13 +518,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 */
@@ -533,11 +531,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
@@ -1049,9 +1047,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; }
@@ -1103,7 +1101,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",
@@ -1139,10 +1137,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,
@@ -1158,7 +1157,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",
@@ -1180,7 +1179,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" ); }
@@ -1190,7 +1189,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",
@@ -1211,7 +1210,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 :
@@ -1238,13 +1237,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;
@@ -1268,7 +1267,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);
@@ -1318,7 +1317,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",
@@ -1392,8 +1391,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 ))
@@ -1414,8 +1413,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)); }
@@ -1442,7 +1442,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 ))
@@ -1470,19 +1470,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)); } }
@@ -1513,29 +1515,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 */ } }
@@ -1553,8 +1555,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)
@@ -1569,8 +1571,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)
@@ -1586,8 +1588,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);
@@ -1628,7 +1630,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)
@@ -1648,7 +1651,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.
@@ -1657,12 +1660,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 */
@@ -1692,7 +1695,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_ERROR ("failed to enable transcoder %c\n" ,pipe_name (pipe)); }
@@ -1706,16 +1709,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 )
@@ -1723,7 +1726,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_ERROR ("Failed to enable PCH transcoder\n" );
@@ -1743,9 +1746,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_ERROR ("failed to disable transcoder %c\n" ,pipe_name (pipe));
@@ -1753,9 +1756,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); } }
@@ -1763,18 +1766,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_ERROR ("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)
@@ -1862,15 +1865,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,
@@ -1903,7 +1906,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 ;
@@ -1918,7 +1921,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); }
@@ -4331,7 +4334,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 ) {/*
@@ -4339,21 +4343,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); }/*
@@ -4361,15 +4370,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); }
@@ -4396,11 +4403,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); }
@@ -4425,7 +4432,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 ;
@@ -4445,9 +4452,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 ); }/*
@@ -4915,7 +4922,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
@@ -4930,7 +4937,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)
@@ -4959,8 +4966,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)
@@ -4973,7 +4981,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 ;
@@ -4981,10 +4989,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 ;
@@ -4992,16 +5000,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. */
@@ -5020,44 +5028,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_DEBUG_KMS ("FDI_RX_IIR 0x%x\n" , temp);if ((temp &FDI_RX_BIT_LOCK )) {DRM_DEBUG_KMS ("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 ; } }
@@ -5066,27 +5075,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_DEBUG_KMS ("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_DEBUG_KMS ("FDI train 2 done.\n" );break ; }
@@ -5118,17 +5128,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 ;
@@ -5136,13 +5146,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 ;
@@ -5150,27 +5160,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_DEBUG_KMS ("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_DEBUG_KMS ("FDI train 1 done.\n" );break ; }
@@ -5184,7 +5195,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 )) {
@@ -5192,10 +5203,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 ;
@@ -5203,27 +5214,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_DEBUG_KMS ("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_DEBUG_KMS ("FDI train 2 done.\n" );break ; }
@@ -5251,64 +5263,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_DEBUG_KMS ("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_DEBUG_KMS ("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_DEBUG_KMS ("FDI train 1 done, level %i.\n" , i);break ;
@@ -5322,28 +5335,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_DEBUG_KMS ("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_DEBUG_KMS ("FDI train 2 done, level %i.\n" , i); goto train_done;
@@ -5368,29 +5382,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 ); } }
@@ -5405,23 +5419,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 ); }
@@ -5434,32 +5448,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 ;
@@ -5469,10 +5484,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 ); }
@@ -5505,7 +5520,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);
@@ -5592,7 +5607,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)
@@ -5603,7 +5618,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);
@@ -5639,41 +5654,41 @@ 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) temp |=FDI_BC_BIFURCATION_SELECT ;DRM_DEBUG_KMS ("%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)
@@ -5754,8 +5769,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);
@@ -5765,7 +5780,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 ==
@@ -5773,7 +5788,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
@@ -5796,11 +5811,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 );
@@ -5816,7 +5831,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);
@@ -5845,10 +5860,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_ERROR ("mode set failed: pipe %c stuck\n" ,pipe_name (pipe)); } }
@@ -6173,14 +6188,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); } }
@@ -6196,12 +6213,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); } }
@@ -6230,7 +6250,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
@@ -6260,8 +6280,8 @@ void hsw_disable_ips(const struct intel_crtc_state *crtc_state)if (intel_de_wait_for_clear (dev_priv,IPS_CTL ,IPS_ENABLE ,100 ))DRM_ERROR ("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. */
@@ -6856,7 +6876,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)
@@ -6864,7 +6884,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)
@@ -6883,7 +6903,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)
@@ -6893,10 +6913,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,
@@ -6932,8 +6952,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,
@@ -7016,9 +7036,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 ); } }
@@ -7060,16 +7080,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);
@@ -7102,15 +7122,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)
@@ -7307,8 +7328,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);
@@ -7349,8 +7370,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,
@@ -7412,8 +7435,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_DEBUG_KMS ("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,
@@ -7990,7 +8013,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) {
@@ -8083,10 +8107,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,
@@ -8112,27 +8137,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); } }
@@ -8205,9 +8238,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 )
@@ -8307,8 +8339,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 )
@@ -8607,27 +8639,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
@@ -8635,7 +8662,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))); }
@@ -8648,9 +8676,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)
@@ -8663,9 +8690,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,
@@ -8676,33 +8703,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 ;
@@ -8720,7 +8747,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 ;
@@ -8761,7 +8788,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 ;
@@ -8808,8 +8835,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,
@@ -9018,7 +9045,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 ;
@@ -9032,7 +9059,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,
@@ -9092,7 +9120,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 ) {
@@ -9113,24 +9141,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);
@@ -9185,7 +9215,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 */
@@ -9207,7 +9237,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;
@@ -9238,7 +9268,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;
@@ -9267,7 +9297,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);
@@ -9285,14 +9316,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 ;
@@ -9302,10 +9333,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 |
@@ -9375,7 +9409,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 ;
@@ -9395,7 +9429,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
@@ -9453,8 +9487,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 ;
@@ -9469,8 +9503,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_DEBUG_KMS ("Disabling CPU source output\n" );
@@ -9480,8 +9514,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) {
@@ -9494,8 +9528,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 ); } }
@@ -9507,19 +9541,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_ERROR ("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_ERROR ("FDI mPHY reset de-assert timeout\n" ); }
@@ -9733,8 +9767,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;
@@ -9753,8 +9787,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;
@@ -9891,8 +9925,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)
@@ -9914,8 +9948,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)
@@ -9958,7 +9992,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)
@@ -9966,7 +10000,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 :
@@ -10164,12 +10198,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 ; }
@@ -10182,30 +10216,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 ; } }
@@ -10240,12 +10282,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 ; }
@@ -10289,7 +10333,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 ;
@@ -10297,7 +10341,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 ;
@@ -10361,16 +10406,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;
@@ -10397,12 +10442,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
@@ -10434,7 +10481,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;
@@ -10471,18 +10518,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 ;
@@ -10495,7 +10543,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
@@ -10560,7 +10608,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 ))
@@ -10578,12 +10626,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,
@@ -10635,7 +10683,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 ))
@@ -10648,7 +10696,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 :
@@ -10716,7 +10764,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 ;
@@ -10773,7 +10822,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 ; }
@@ -10818,11 +10867,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 ;
@@ -10846,7 +10895,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
@@ -10876,10 +10926,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 ;
@@ -10892,7 +10942,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 ;
@@ -10983,7 +11034,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 ;
@@ -11006,12 +11058,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;
@@ -11040,7 +11095,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
@@ -11054,7 +11110,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 ; }
@@ -11315,17 +11372,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);
@@ -11350,7 +11407,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 ;
@@ -11566,17 +11623,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);
@@ -11607,7 +11665,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 ;
@@ -11924,7 +11982,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) {
@@ -16547,10 +16606,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;
@@ -16565,11 +16624,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)
@@ -16595,10 +16654,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); } }
@@ -16678,14 +16737,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 );
@@ -16718,25 +16777,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;
@@ -16761,16 +16820,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)) {
@@ -16779,9 +16838,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 ); }
@@ -16797,7 +16856,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_DEBUG_KMS ("probing SDVOB\n" ); found =intel_sdvo_init (dev_priv,GEN3_SDVOB ,PORT_B );if (!found &&IS_G4X (dev_priv)) {
@@ -16811,12 +16870,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_DEBUG_KMS ("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_DEBUG_KMS ("probing HDMI on SDVOC\n" );
@@ -16826,7 +16885,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))
@@ -17388,7 +17447,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)) {
@@ -17637,27 +17696,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
@@ -17665,17 +17724,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); }
@@ -17687,19 +17747,19 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe)DRM_DEBUG_KMS ("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
@@ -17773,18 +17833,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)
@@ -17794,19 +17854,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); } }
@@ -17838,9 +17898,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
@@ -18227,23 +18286,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 ))
@@ -18255,13 +18314,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 ))
@@ -18273,7 +18332,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)
@@ -18575,7 +18634,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 =
@@ -18584,27 +18644,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++) {
@@ -18622,13 +18688,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
RFC 9/33 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 | 294 ++++++++++-------- 1 file changed, 158 insertions(+), 136 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +158 -136
@@ -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)
@@ -372,17 +372,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)
@@ -403,8 +404,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); }
@@ -421,12 +423,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);
@@ -434,9 +438,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); } }
@@ -451,11 +455,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); }
@@ -552,11 +558,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);
@@ -564,7 +570,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 ))
@@ -596,7 +603,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
@@ -606,18 +613,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),
@@ -636,7 +643,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" );/*
@@ -655,7 +662,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
@@ -663,10 +670,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) {
@@ -708,7 +715,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_DEBUG_KMS ("Resetting DC state tracking from %02x to %02x\n" , dev_priv->csr.dc_state, val);
@@ -746,7 +753,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_DEBUG_KMS ("Setting DC state from %02x to %02x\n" , val & mask, state);
@@ -800,9 +807,9 @@ static void tgl_disable_dc3co(struct drm_i915_private *dev_priv)u32 val;DRM_DEBUG_KMS ("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
@@ -838,10 +845,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 *
@@ -917,7 +925,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);
@@ -932,17 +940,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);
@@ -956,8 +964,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 ); }
@@ -968,15 +976,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); } }
@@ -1022,13 +1030,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),
@@ -1108,9 +1116,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 ); }
@@ -1124,8 +1132,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,
@@ -1231,21 +1239,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)
@@ -1262,13 +1271,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);
@@ -1348,7 +1357,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,
@@ -1360,7 +1370,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); }
@@ -1422,7 +1433,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,
@@ -1468,8 +1479,8 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv)if (intel_de_wait_for_register (dev_priv,DISPLAY_PHY_STATUS , phy_status_mask, phy_status,10 ))DRM_ERROR ("Unexpected PHY_STATUS 0x%08x, expected 0x%08x (PHY_CONTROL=0x%08x)\n" , -I915_READ (DISPLAY_PHY_STATUS ) & phy_status_mask, - phy_status, dev_priv->chv_phy_control); +intel_de_read (dev_priv,DISPLAY_PHY_STATUS ) & phy_status_mask, + phy_status, dev_priv->chv_phy_control); }#undef BITS_SET
@@ -1527,7 +1538,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_DEBUG_KMS ("Enabled DPIO PHY%d (PHY_CONTROL=0x%08x)\n" , phy, dev_priv->chv_phy_control);
@@ -1553,7 +1565,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);
@@ -1646,7 +1659,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_DEBUG_KMS ("Power gating DPIO PHY%d CH%d (DPIO_PHY_CONTROL=0x%08x)\n" , phy, ch, dev_priv->chv_phy_control);
@@ -1677,7 +1691,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_DEBUG_KMS ("Power gating DPIO PHY%d CH%d lanes 0x%x (PHY_CONTROL=0x%08x)\n" , phy, ch, mask, dev_priv->chv_phy_control);
@@ -4371,13 +4386,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_ERROR ("DBus power %s timeout!\n" , enable ?"enable" :"disable" );
@@ -4428,14 +4443,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_ERROR ("DBuf power enable timeout\n" );else /*
@@ -4447,14 +4464,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_ERROR ("DBuf power disable timeout!\n" );else /*
@@ -4473,12 +4492,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
@@ -4505,26 +4524,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" );/*
@@ -4539,9 +4558,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)
@@ -4551,8 +4570,8 @@ static void hsw_write_dcomp(struct drm_i915_private *dev_priv, u32 val) GEN6_PCODE_WRITE_D_COMP, val))DRM_DEBUG_KMS ("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 ); } }
@@ -4571,22 +4590,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_ERROR ("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_ERROR ("LCPLL still locked\n" );
@@ -4601,10 +4620,10 @@ static void hsw_disable_lcpll(struct drm_i915_private *dev_priv,DRM_ERROR ("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 ); } }
@@ -4616,7 +4635,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 )
@@ -4630,8 +4649,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);
@@ -4639,19 +4658,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_ERROR ("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_ERROR ("Switching back to LCPLL failed\n" ); }
@@ -4692,9 +4711,9 @@ static void hsw_enable_pc8(struct drm_i915_private *dev_priv)DRM_DEBUG_KMS ("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);
@@ -4711,9 +4730,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); } }
@@ -4731,14 +4750,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,
@@ -4965,11 +4984,13 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)if (table[i].page_mask ==0 ) {DRM_DEBUG_DRIVER ("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); } }
@@ -5071,7 +5092,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 ;
@@ -5102,7 +5123,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 ;
@@ -5123,7 +5144,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_DEBUG_KMS ("Initial PHY_CONTROL=0x%08x\n" , dev_priv->chv_phy_control);
@@ -5139,7 +5161,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_DEBUG_KMS ("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
RFC 10/33 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 )
@@ -755,7 +755,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))
@@ -768,7 +768,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 ;
@@ -778,7 +778,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.
@@ -802,14 +802,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);
@@ -930,13 +930,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,
@@ -953,7 +953,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))
@@ -1114,12 +1114,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); } }
@@ -1137,7 +1138,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)
@@ -1150,7 +1151,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
@@ -1164,8 +1165,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_DEBUG_KMS ("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))); } }
@@ -2510,7 +2511,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 ;
@@ -2534,12 +2535,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 ;
@@ -2587,14 +2588,14 @@ static void wait_panel_status(struct intel_dp *intel_dp,DRM_DEBUG_KMS ("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_ERROR ("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_DEBUG_KMS ("Wait complete\n" ); }
@@ -2655,7 +2656,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 ;
@@ -2704,10 +2705,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_DEBUG_KMS ("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 */
@@ -2769,12 +2771,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_DEBUG_KMS ("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 ();
@@ -2863,24 +2866,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); } }
@@ -2924,8 +2927,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 ();
@@ -2966,8 +2969,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); } }
@@ -3002,8 +3005,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;
@@ -3054,7 +3057,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",
@@ -3065,7 +3068,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",
@@ -3094,8 +3097,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 );/*
@@ -3109,8 +3112,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 ); }
@@ -3128,8 +3131,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 ); }
@@ -3209,7 +3212,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;
@@ -3232,7 +3235,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 ;
@@ -3284,12 +3287,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 ;
@@ -3323,7 +3327,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 ;
@@ -3446,7 +3450,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 ;
@@ -3472,7 +3476,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 )) {
@@ -3534,8 +3538,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,
@@ -3545,7 +3549,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;
@@ -3639,8 +3643,8 @@ static void vlv_detach_power_sequencer(struct intel_dp *intel_dp)DRM_DEBUG_KMS ("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 ; }
@@ -4148,8 +4152,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
@@ -4162,8 +4166,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)
@@ -4176,10 +4180,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
@@ -4206,7 +4210,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_DEBUG_KMS ("\n" );
@@ -4219,12 +4223,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
@@ -4243,12 +4247,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);
@@ -5369,7 +5373,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)
@@ -5392,7 +5396,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)
@@ -5411,7 +5415,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)
@@ -5434,7 +5438,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)
@@ -5457,7 +5461,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)
@@ -5465,7 +5469,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); }
@@ -5475,7 +5479,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); }
@@ -5485,7 +5489,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); }
@@ -5495,7 +5499,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); }
@@ -5520,16 +5524,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)
@@ -6518,7 +6522,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);
@@ -6696,10 +6700,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);
@@ -6710,7 +6714,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 {
@@ -6871,7 +6875,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) |
@@ -6902,31 +6906,30 @@ 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_DEBUG_KMS ("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)
@@ -7013,7 +7016,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 ;
@@ -7025,7 +7028,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;
@@ -7474,7 +7477,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)) {
@@ -7553,8 +7556,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
RFC 11/33 drm/i915/dpio_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)
--- drivers/gpu/drm/i915/display/intel_dpio_phy.c | 77 ++++++++++--------- 1 file changed, 40 insertions(+), 37 deletions(-)
drivers/gpu/drm/i915/display/intel_dpio_phy.c +40 -37
@@ -278,16 +278,16 @@ void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,* While we write to the group register to program all lanes at once we * can read only lane registers and we pick lanes 0/1 for that. */ - val =I915_READ (BXT_PORT_PCS_DW10_LN01 (phy, ch)); + val =intel_de_read (dev_priv,BXT_PORT_PCS_DW10_LN01 (phy, ch)); val &= ~(TX2_SWING_CALC_INIT |TX1_SWING_CALC_INIT ); -I915_WRITE (BXT_PORT_PCS_DW10_GRP (phy, ch), val); +intel_de_write (dev_priv,BXT_PORT_PCS_DW10_GRP (phy, ch), val); - val =I915_READ (BXT_PORT_TX_DW2_LN0 (phy, ch)); + val =intel_de_read (dev_priv,BXT_PORT_TX_DW2_LN0 (phy, ch)); val &= ~(MARGIN_000 |UNIQ_TRANS_SCALE ); val |= margin <<MARGIN_000_SHIFT | scale <<UNIQ_TRANS_SCALE_SHIFT ; -I915_WRITE (BXT_PORT_TX_DW2_GRP (phy, ch), val); +intel_de_write (dev_priv,BXT_PORT_TX_DW2_GRP (phy, ch), val); - val =I915_READ (BXT_PORT_TX_DW3_LN0 (phy, ch)); + val =intel_de_read (dev_priv,BXT_PORT_TX_DW3_LN0 (phy, ch)); val &= ~SCALE_DCOMP_METHOD ;if (enable) val |=SCALE_DCOMP_METHOD ;
@@ -295,16 +295,16 @@ void bxt_ddi_phy_set_signal_level(struct drm_i915_private *dev_priv,if ((val &UNIQUE_TRANGE_EN_METHOD ) && !(val &SCALE_DCOMP_METHOD ))DRM_ERROR ("Disabled scaling while ouniqetrangenmethod was set" ); -I915_WRITE (BXT_PORT_TX_DW3_GRP (phy, ch), val); +intel_de_write (dev_priv,BXT_PORT_TX_DW3_GRP (phy, ch), val); - val =I915_READ (BXT_PORT_TX_DW4_LN0 (phy, ch)); + val =intel_de_read (dev_priv,BXT_PORT_TX_DW4_LN0 (phy, ch)); val &= ~DE_EMPHASIS ; val |= deemphasis <<DEEMPH_SHIFT ; -I915_WRITE (BXT_PORT_TX_DW4_GRP (phy, ch), val); +intel_de_write (dev_priv,BXT_PORT_TX_DW4_GRP (phy, ch), val); - val =I915_READ (BXT_PORT_PCS_DW10_LN01 (phy, ch)); + val =intel_de_read (dev_priv,BXT_PORT_PCS_DW10_LN01 (phy, ch)); val |=TX2_SWING_CALC_INIT |TX1_SWING_CALC_INIT ; -I915_WRITE (BXT_PORT_PCS_DW10_GRP (phy, ch), val); +intel_de_write (dev_priv,BXT_PORT_PCS_DW10_GRP (phy, ch), val); } bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,
@@ -314,10 +314,10 @@ bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv, phy_info =bxt_get_phy_info (dev_priv, phy); -if (!(I915_READ (BXT_P_CR_GT_DISP_PWRON ) & phy_info->pwron_mask)) +if (!(intel_de_read (dev_priv,BXT_P_CR_GT_DISP_PWRON ) & phy_info->pwron_mask))return false; -if ((I915_READ (BXT_PORT_CL1CM_DW0 (phy)) & +if ((intel_de_read (dev_priv,BXT_PORT_CL1CM_DW0 (phy)) & (PHY_POWER_GOOD |PHY_RESERVED )) !=PHY_POWER_GOOD ) {DRM_DEBUG_DRIVER ("DDI PHY %d powered, but power hasn't settled\n" , phy);
@@ -325,7 +325,7 @@ bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,return false; } -if (!(I915_READ (BXT_PHY_CTL_FAMILY (phy)) &COMMON_RESET_DIS )) { +if (!(intel_de_read (dev_priv,BXT_PHY_CTL_FAMILY (phy)) &COMMON_RESET_DIS )) {DRM_DEBUG_DRIVER ("DDI PHY %d powered, but still in reset\n" , phy);
@@ -337,7 +337,7 @@ bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv,static u32 bxt_get_grc (struct drm_i915_private *dev_priv,enum dpio_phy phy) { -u32 val =I915_READ (BXT_PORT_REF_DW6 (phy)); +u32 val =intel_de_read (dev_priv,BXT_PORT_REF_DW6 (phy));return (val &GRC_CODE_MASK ) >>GRC_CODE_SHIFT ; }
@@ -373,9 +373,9 @@ static void _bxt_ddi_phy_init(struct drm_i915_private *dev_priv, "force reprogramming it\n", phy); } - val =I915_READ (BXT_P_CR_GT_DISP_PWRON ); + val =intel_de_read (dev_priv,BXT_P_CR_GT_DISP_PWRON ); val |= phy_info->pwron_mask; -I915_WRITE (BXT_P_CR_GT_DISP_PWRON , val); +intel_de_write (dev_priv,BXT_P_CR_GT_DISP_PWRON , val);/* * The PHY registers start out inaccessible and respond to reads with
@@ -393,26 +393,26 @@ static void _bxt_ddi_phy_init(struct drm_i915_private *dev_priv,DRM_ERROR ("timeout during PHY%d power on\n" , phy);/* Program PLL Rcomp code offset */ - val =I915_READ (BXT_PORT_CL1CM_DW9 (phy)); + val =intel_de_read (dev_priv,BXT_PORT_CL1CM_DW9 (phy)); val &= ~IREF0RC_OFFSET_MASK ; val |=0xE4 <<IREF0RC_OFFSET_SHIFT ; -I915_WRITE (BXT_PORT_CL1CM_DW9 (phy), val); +intel_de_write (dev_priv,BXT_PORT_CL1CM_DW9 (phy), val); - val =I915_READ (BXT_PORT_CL1CM_DW10 (phy)); + val =intel_de_read (dev_priv,BXT_PORT_CL1CM_DW10 (phy)); val &= ~IREF1RC_OFFSET_MASK ; val |=0xE4 <<IREF1RC_OFFSET_SHIFT ; -I915_WRITE (BXT_PORT_CL1CM_DW10 (phy), val); +intel_de_write (dev_priv,BXT_PORT_CL1CM_DW10 (phy), val);/* Program power gating */ - val =I915_READ (BXT_PORT_CL1CM_DW28 (phy)); + val =intel_de_read (dev_priv,BXT_PORT_CL1CM_DW28 (phy)); val |=OCL1_POWER_DOWN_EN |DW28_OLDO_DYN_PWR_DOWN_EN |SUS_CLK_CONFIG ; -I915_WRITE (BXT_PORT_CL1CM_DW28 (phy), val); +intel_de_write (dev_priv,BXT_PORT_CL1CM_DW28 (phy), val);if (phy_info->dual_channel) { - val =I915_READ (BXT_PORT_CL2CM_DW6 (phy)); + val =intel_de_read (dev_priv,BXT_PORT_CL2CM_DW6 (phy)); val |=DW6_OLDO_DYN_PWR_DOWN_EN ; -I915_WRITE (BXT_PORT_CL2CM_DW6 (phy), val); +intel_de_write (dev_priv,BXT_PORT_CL2CM_DW6 (phy), val); }if (phy_info->rcomp_phy !=-1 ) {
@@ -430,19 +430,19 @@ static void _bxt_ddi_phy_init(struct drm_i915_private *dev_priv, grc_code = val <<GRC_CODE_FAST_SHIFT | val <<GRC_CODE_SLOW_SHIFT | val; -I915_WRITE (BXT_PORT_REF_DW6 (phy), grc_code); +intel_de_write (dev_priv,BXT_PORT_REF_DW6 (phy), grc_code); - val =I915_READ (BXT_PORT_REF_DW8 (phy)); + val =intel_de_read (dev_priv,BXT_PORT_REF_DW8 (phy)); val |=GRC_DIS |GRC_RDY_OVRD ; -I915_WRITE (BXT_PORT_REF_DW8 (phy), val); +intel_de_write (dev_priv,BXT_PORT_REF_DW8 (phy), val); }if (phy_info->reset_delay)udelay (phy_info->reset_delay); - val =I915_READ (BXT_PHY_CTL_FAMILY (phy)); + val =intel_de_read (dev_priv,BXT_PHY_CTL_FAMILY (phy)); val |=COMMON_RESET_DIS ; -I915_WRITE (BXT_PHY_CTL_FAMILY (phy), val); +intel_de_write (dev_priv,BXT_PHY_CTL_FAMILY (phy), val); }void bxt_ddi_phy_uninit (struct drm_i915_private *dev_priv,enum dpio_phy phy)
@@ -452,13 +452,13 @@ void bxt_ddi_phy_uninit(struct drm_i915_private *dev_priv, enum dpio_phy phy) phy_info =bxt_get_phy_info (dev_priv, phy); - val =I915_READ (BXT_PHY_CTL_FAMILY (phy)); + val =intel_de_read (dev_priv,BXT_PHY_CTL_FAMILY (phy)); val &= ~COMMON_RESET_DIS ; -I915_WRITE (BXT_PHY_CTL_FAMILY (phy), val); +intel_de_write (dev_priv,BXT_PHY_CTL_FAMILY (phy), val); - val =I915_READ (BXT_P_CR_GT_DISP_PWRON ); + val =intel_de_read (dev_priv,BXT_P_CR_GT_DISP_PWRON ); val &= ~phy_info->pwron_mask; -I915_WRITE (BXT_P_CR_GT_DISP_PWRON , val); +intel_de_write (dev_priv,BXT_P_CR_GT_DISP_PWRON , val); }void bxt_ddi_phy_init (struct drm_i915_private *dev_priv,enum dpio_phy phy)
@@ -496,7 +496,7 @@ __phy_reg_verify_state(struct drm_i915_private *dev_priv, enum dpio_phy phy,va_list args;u32 val; - val =I915_READ (reg); + val =intel_de_read (dev_priv, reg);if ((val & mask) == expected)return true;
@@ -599,7 +599,8 @@ void bxt_ddi_phy_set_lane_optim_mask(struct intel_encoder *encoder,bxt_port_to_phy_channel (dev_priv, port, &phy, &ch);for (lane =0 ; lane <4 ; lane++) { -u32 val =I915_READ (BXT_PORT_TX_DW14_LN (phy, ch, lane)); +u32 val =intel_de_read (dev_priv, +BXT_PORT_TX_DW14_LN (phy, ch, lane));/* * Note that on CHV this flag is called UPAR, but has
@@ -609,7 +610,8 @@ void bxt_ddi_phy_set_lane_optim_mask(struct intel_encoder *encoder,if (lane_lat_optim_mask &BIT (lane)) val |=LATENCY_OPTIM ; -I915_WRITE (BXT_PORT_TX_DW14_LN (phy, ch, lane), val); +intel_de_write (dev_priv,BXT_PORT_TX_DW14_LN (phy, ch, lane), + val); } }
@@ -627,7 +629,8 @@ bxt_ddi_phy_get_lane_lat_optim_mask(struct intel_encoder *encoder) mask =0 ;for (lane =0 ; lane <4 ; lane++) { -u32 val =I915_READ (BXT_PORT_TX_DW14_LN (phy, ch, lane)); +u32 val =intel_de_read (dev_priv, +BXT_PORT_TX_DW14_LN (phy, ch, lane));if (val &LATENCY_OPTIM ) mask |=BIT (lane);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 12/33 drm/i915/dpll_mgr: 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_dpll_mgr.c | 388 +++++++++--------- 1 file changed, 201 insertions(+), 187 deletions(-)
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +201 -187
@@ -378,10 +378,10 @@ static bool ibx_pch_dpll_get_hw_state(struct drm_i915_private *dev_priv,if (!wakeref)return false; - val =I915_READ (PCH_DPLL (id)); + val =intel_de_read (dev_priv,PCH_DPLL (id)); hw_state->dpll = val; - hw_state->fp0 =I915_READ (PCH_FP0 (id)); - hw_state->fp1 =I915_READ (PCH_FP1 (id)); + hw_state->fp0 =intel_de_read (dev_priv,PCH_FP0 (id)); + hw_state->fp1 =intel_de_read (dev_priv,PCH_FP1 (id));intel_display_power_put (dev_priv,POWER_DOMAIN_DISPLAY_CORE , wakeref);
@@ -393,8 +393,8 @@ static void ibx_pch_dpll_prepare(struct drm_i915_private *dev_priv, {const enum intel_dpll_id id = pll->info->id; -I915_WRITE (PCH_FP0 (id), pll->state.hw_state.fp0); -I915_WRITE (PCH_FP1 (id), pll->state.hw_state.fp1); +intel_de_write (dev_priv,PCH_FP0 (id), pll->state.hw_state.fp0); +intel_de_write (dev_priv,PCH_FP1 (id), pll->state.hw_state.fp1); }static void ibx_assert_pch_refclk_enabled (struct drm_i915_private *dev_priv)
@@ -404,7 +404,7 @@ static void ibx_assert_pch_refclk_enabled(struct drm_i915_private *dev_priv)I915_STATE_WARN_ON (!(HAS_PCH_IBX (dev_priv) ||HAS_PCH_CPT (dev_priv))); - val =I915_READ (PCH_DREF_CONTROL ); + val =intel_de_read (dev_priv,PCH_DREF_CONTROL ); enabled = !!(val & (DREF_SSC_SOURCE_MASK |DREF_NONSPREAD_SOURCE_MASK |DREF_SUPERSPREAD_SOURCE_MASK ));I915_STATE_WARN (!enabled,"PCH refclk assertion failure, should be active but is disabled\n" );
@@ -418,10 +418,10 @@ static void ibx_pch_dpll_enable(struct drm_i915_private *dev_priv,/* PCH refclock must be enabled first */ ibx_assert_pch_refclk_enabled (dev_priv); -I915_WRITE (PCH_DPLL (id), pll->state.hw_state.dpll); +intel_de_write (dev_priv,PCH_DPLL (id), pll->state.hw_state.dpll);/* Wait for the clocks to stabilize. */ -POSTING_READ (PCH_DPLL (id)); +intel_de_posting_read (dev_priv,PCH_DPLL (id));udelay (150 );/* The pixel multiplier can only be updated once the
@@ -429,8 +429,8 @@ static void ibx_pch_dpll_enable(struct drm_i915_private *dev_priv,* * So write it again. */ -I915_WRITE (PCH_DPLL (id), pll->state.hw_state.dpll); -POSTING_READ (PCH_DPLL (id)); +intel_de_write (dev_priv,PCH_DPLL (id), pll->state.hw_state.dpll); +intel_de_posting_read (dev_priv,PCH_DPLL (id));udelay (200 ); }
@@ -439,8 +439,8 @@ static void ibx_pch_dpll_disable(struct drm_i915_private *dev_priv, {const enum intel_dpll_id id = pll->info->id; -I915_WRITE (PCH_DPLL (id),0 ); -POSTING_READ (PCH_DPLL (id)); +intel_de_write (dev_priv,PCH_DPLL (id),0 ); +intel_de_posting_read (dev_priv,PCH_DPLL (id));udelay (200 ); }
@@ -504,16 +504,16 @@ static void hsw_ddi_wrpll_enable(struct drm_i915_private *dev_priv, {const enum intel_dpll_id id = pll->info->id; -I915_WRITE (WRPLL_CTL (id), pll->state.hw_state.wrpll); -POSTING_READ (WRPLL_CTL (id)); +intel_de_write (dev_priv,WRPLL_CTL (id), pll->state.hw_state.wrpll); +intel_de_posting_read (dev_priv,WRPLL_CTL (id));udelay (20 ); }static void hsw_ddi_spll_enable (struct drm_i915_private *dev_priv,struct intel_shared_dpll *pll) { -I915_WRITE (SPLL_CTL , pll->state.hw_state.spll); -POSTING_READ (SPLL_CTL ); +intel_de_write (dev_priv,SPLL_CTL , pll->state.hw_state.spll); +intel_de_posting_read (dev_priv,SPLL_CTL );udelay (20 ); }
@@ -523,9 +523,9 @@ static void hsw_ddi_wrpll_disable(struct drm_i915_private *dev_priv,const enum intel_dpll_id id = pll->info->id;u32 val; - val =I915_READ (WRPLL_CTL (id)); -I915_WRITE (WRPLL_CTL (id), val & ~WRPLL_PLL_ENABLE ); -POSTING_READ (WRPLL_CTL (id)); + val =intel_de_read (dev_priv,WRPLL_CTL (id)); +intel_de_write (dev_priv,WRPLL_CTL (id), val & ~WRPLL_PLL_ENABLE ); +intel_de_posting_read (dev_priv,WRPLL_CTL (id));/* * Try to set up the PCH reference clock once all DPLLs
@@ -541,9 +541,9 @@ static void hsw_ddi_spll_disable(struct drm_i915_private *dev_priv,enum intel_dpll_id id = pll->info->id;u32 val; - val =I915_READ (SPLL_CTL ); -I915_WRITE (SPLL_CTL , val & ~SPLL_PLL_ENABLE ); -POSTING_READ (SPLL_CTL ); + val =intel_de_read (dev_priv,SPLL_CTL ); +intel_de_write (dev_priv,SPLL_CTL , val & ~SPLL_PLL_ENABLE ); +intel_de_posting_read (dev_priv,SPLL_CTL );/* * Try to set up the PCH reference clock once all DPLLs
@@ -566,7 +566,7 @@ static bool hsw_ddi_wrpll_get_hw_state(struct drm_i915_private *dev_priv,if (!wakeref)return false; - val =I915_READ (WRPLL_CTL (id)); + val =intel_de_read (dev_priv,WRPLL_CTL (id)); hw_state->wrpll = val;intel_display_power_put (dev_priv,POWER_DOMAIN_DISPLAY_CORE , wakeref);
@@ -586,7 +586,7 @@ static bool hsw_ddi_spll_get_hw_state(struct drm_i915_private *dev_priv,if (!wakeref)return false; - val =I915_READ (SPLL_CTL ); + val =intel_de_read (dev_priv,SPLL_CTL ); hw_state->spll = val;intel_display_power_put (dev_priv,POWER_DOMAIN_DISPLAY_CORE , wakeref);
@@ -989,15 +989,15 @@ static void skl_ddi_pll_write_ctrl1(struct drm_i915_private *dev_priv,const enum intel_dpll_id id = pll->info->id;u32 val; - val =I915_READ (DPLL_CTRL1 ); + val =intel_de_read (dev_priv,DPLL_CTRL1 ); val &= ~(DPLL_CTRL1_HDMI_MODE (id) |DPLL_CTRL1_SSC (id) |DPLL_CTRL1_LINK_RATE_MASK (id)); val |= pll->state.hw_state.ctrl1 << (id *6 ); -I915_WRITE (DPLL_CTRL1 , val); -POSTING_READ (DPLL_CTRL1 ); +intel_de_write (dev_priv,DPLL_CTRL1 , val); +intel_de_posting_read (dev_priv,DPLL_CTRL1 ); } static void skl_ddi_pll_enable(struct drm_i915_private *dev_priv,
@@ -1008,14 +1008,14 @@ static void skl_ddi_pll_enable(struct drm_i915_private *dev_priv,skl_ddi_pll_write_ctrl1 (dev_priv, pll); -I915_WRITE (regs[id].cfgcr1, pll->state.hw_state.cfgcr1); -I915_WRITE (regs[id].cfgcr2, pll->state.hw_state.cfgcr2); -POSTING_READ (regs[id].cfgcr1); -POSTING_READ (regs[id].cfgcr2); +intel_de_write (dev_priv, regs[id].cfgcr1, pll->state.hw_state.cfgcr1); +intel_de_write (dev_priv, regs[id].cfgcr2, pll->state.hw_state.cfgcr2); +intel_de_posting_read (dev_priv, regs[id].cfgcr1); +intel_de_posting_read (dev_priv, regs[id].cfgcr2);/* the enable bit is always bit 31 */ -I915_WRITE (regs[id].ctl, -I915_READ (regs[id].ctl) |LCPLL_PLL_ENABLE ); +intel_de_write (dev_priv, regs[id].ctl, +intel_de_read (dev_priv, regs[id].ctl) |LCPLL_PLL_ENABLE );if (intel_de_wait_for_set (dev_priv,DPLL_STATUS ,DPLL_LOCK (id),5 ))DRM_ERROR ("DPLL %d not locked\n" , id);
@@ -1034,9 +1034,9 @@ static void skl_ddi_pll_disable(struct drm_i915_private *dev_priv,const enum intel_dpll_id id = pll->info->id;/* the enable bit is always bit 31 */ -I915_WRITE (regs[id].ctl, -I915_READ (regs[id].ctl) & ~LCPLL_PLL_ENABLE ); -POSTING_READ (regs[id].ctl); +intel_de_write (dev_priv, regs[id].ctl, +intel_de_read (dev_priv, regs[id].ctl) & ~LCPLL_PLL_ENABLE ); +intel_de_posting_read (dev_priv, regs[id].ctl); } static void skl_ddi_dpll0_disable(struct drm_i915_private *dev_priv,
@@ -1061,17 +1061,17 @@ static bool skl_ddi_pll_get_hw_state(struct drm_i915_private *dev_priv, ret = false; - val =I915_READ (regs[id].ctl); + val =intel_de_read (dev_priv, regs[id].ctl);if (!(val &LCPLL_PLL_ENABLE )) goto out; - val =I915_READ (DPLL_CTRL1 ); + val =intel_de_read (dev_priv,DPLL_CTRL1 ); hw_state->ctrl1 = (val >> (id *6 )) &0x3f ;/* avoid reading back stale values if HDMI mode is not enabled */ if (val &DPLL_CTRL1_HDMI_MODE (id)) { - hw_state->cfgcr1 =I915_READ (regs[id].cfgcr1); - hw_state->cfgcr2 =I915_READ (regs[id].cfgcr2); + hw_state->cfgcr1 =intel_de_read (dev_priv, regs[id].cfgcr1); + hw_state->cfgcr2 =intel_de_read (dev_priv, regs[id].cfgcr2); } ret = true;
@@ -1099,11 +1099,11 @@ static bool skl_ddi_dpll0_get_hw_state(struct drm_i915_private *dev_priv, ret = false;/* DPLL0 is always enabled since it drives CDCLK */ - val =I915_READ (regs[id].ctl); + val =intel_de_read (dev_priv, regs[id].ctl);if (WARN_ON (!(val &LCPLL_PLL_ENABLE ))) goto out; - val =I915_READ (DPLL_CTRL1 ); + val =intel_de_read (dev_priv,DPLL_CTRL1 ); hw_state->ctrl1 = (val >> (id *6 )) &0x3f ; ret = true;
@@ -1515,113 +1515,113 @@ static void bxt_ddi_pll_enable(struct drm_i915_private *dev_priv,bxt_port_to_phy_channel (dev_priv, port, &phy, &ch);/* Non-SSC reference */ - temp =I915_READ (BXT_PORT_PLL_ENABLE (port)); + temp =intel_de_read (dev_priv,BXT_PORT_PLL_ENABLE (port)); temp |=PORT_PLL_REF_SEL ; -I915_WRITE (BXT_PORT_PLL_ENABLE (port), temp); +intel_de_write (dev_priv,BXT_PORT_PLL_ENABLE (port), temp);if (IS_GEMINILAKE (dev_priv)) { - temp =I915_READ (BXT_PORT_PLL_ENABLE (port)); + temp =intel_de_read (dev_priv,BXT_PORT_PLL_ENABLE (port)); temp |=PORT_PLL_POWER_ENABLE ; -I915_WRITE (BXT_PORT_PLL_ENABLE (port), temp); +intel_de_write (dev_priv,BXT_PORT_PLL_ENABLE (port), temp); -if (wait_for_us ((I915_READ (BXT_PORT_PLL_ENABLE (port)) & +if (wait_for_us ((intel_de_read (dev_priv,BXT_PORT_PLL_ENABLE (port)) &PORT_PLL_POWER_STATE ),200 ))DRM_ERROR ("Power state not set for PLL:%d\n" , port); }/* Disable 10 bit clock */ - temp =I915_READ (BXT_PORT_PLL_EBB_4 (phy, ch)); + temp =intel_de_read (dev_priv,BXT_PORT_PLL_EBB_4 (phy, ch)); temp &= ~PORT_PLL_10BIT_CLK_ENABLE ; -I915_WRITE (BXT_PORT_PLL_EBB_4 (phy, ch), temp); +intel_de_write (dev_priv,BXT_PORT_PLL_EBB_4 (phy, ch), temp);/* Write P1 & P2 */ - temp =I915_READ (BXT_PORT_PLL_EBB_0 (phy, ch)); + temp =intel_de_read (dev_priv,BXT_PORT_PLL_EBB_0 (phy, ch)); temp &= ~(PORT_PLL_P1_MASK |PORT_PLL_P2_MASK ); temp |= pll->state.hw_state.ebb0; -I915_WRITE (BXT_PORT_PLL_EBB_0 (phy, ch), temp); +intel_de_write (dev_priv,BXT_PORT_PLL_EBB_0 (phy, ch), temp);/* Write M2 integer */ - temp =I915_READ (BXT_PORT_PLL (phy, ch,0 )); + temp =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,0 )); temp &= ~PORT_PLL_M2_MASK ; temp |= pll->state.hw_state.pll0; -I915_WRITE (BXT_PORT_PLL (phy, ch,0 ), temp); +intel_de_write (dev_priv,BXT_PORT_PLL (phy, ch,0 ), temp);/* Write N */ - temp =I915_READ (BXT_PORT_PLL (phy, ch,1 )); + temp =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,1 )); temp &= ~PORT_PLL_N_MASK ; temp |= pll->state.hw_state.pll1; -I915_WRITE (BXT_PORT_PLL (phy, ch,1 ), temp); +intel_de_write (dev_priv,BXT_PORT_PLL (phy, ch,1 ), temp);/* Write M2 fraction */ - temp =I915_READ (BXT_PORT_PLL (phy, ch,2 )); + temp =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,2 )); temp &= ~PORT_PLL_M2_FRAC_MASK ; temp |= pll->state.hw_state.pll2; -I915_WRITE (BXT_PORT_PLL (phy, ch,2 ), temp); +intel_de_write (dev_priv,BXT_PORT_PLL (phy, ch,2 ), temp);/* Write M2 fraction enable */ - temp =I915_READ (BXT_PORT_PLL (phy, ch,3 )); + temp =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,3 )); temp &= ~PORT_PLL_M2_FRAC_ENABLE ; temp |= pll->state.hw_state.pll3; -I915_WRITE (BXT_PORT_PLL (phy, ch,3 ), temp); +intel_de_write (dev_priv,BXT_PORT_PLL (phy, ch,3 ), temp);/* Write coeff */ - temp =I915_READ (BXT_PORT_PLL (phy, ch,6 )); + temp =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,6 )); temp &= ~PORT_PLL_PROP_COEFF_MASK ; temp &= ~PORT_PLL_INT_COEFF_MASK ; temp &= ~PORT_PLL_GAIN_CTL_MASK ; temp |= pll->state.hw_state.pll6; -I915_WRITE (BXT_PORT_PLL (phy, ch,6 ), temp); +intel_de_write (dev_priv,BXT_PORT_PLL (phy, ch,6 ), temp);/* Write calibration val */ - temp =I915_READ (BXT_PORT_PLL (phy, ch,8 )); + temp =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,8 )); temp &= ~PORT_PLL_TARGET_CNT_MASK ; temp |= pll->state.hw_state.pll8; -I915_WRITE (BXT_PORT_PLL (phy, ch,8 ), temp); +intel_de_write (dev_priv,BXT_PORT_PLL (phy, ch,8 ), temp); - temp =I915_READ (BXT_PORT_PLL (phy, ch,9 )); + temp =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,9 )); temp &= ~PORT_PLL_LOCK_THRESHOLD_MASK ; temp |= pll->state.hw_state.pll9; -I915_WRITE (BXT_PORT_PLL (phy, ch,9 ), temp); +intel_de_write (dev_priv,BXT_PORT_PLL (phy, ch,9 ), temp); - temp =I915_READ (BXT_PORT_PLL (phy, ch,10 )); + temp =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,10 )); temp &= ~PORT_PLL_DCO_AMP_OVR_EN_H ; temp &= ~PORT_PLL_DCO_AMP_MASK ; temp |= pll->state.hw_state.pll10; -I915_WRITE (BXT_PORT_PLL (phy, ch,10 ), temp); +intel_de_write (dev_priv,BXT_PORT_PLL (phy, ch,10 ), temp);/* Recalibrate with new settings */ - temp =I915_READ (BXT_PORT_PLL_EBB_4 (phy, ch)); + temp =intel_de_read (dev_priv,BXT_PORT_PLL_EBB_4 (phy, ch)); temp |=PORT_PLL_RECALIBRATE ; -I915_WRITE (BXT_PORT_PLL_EBB_4 (phy, ch), temp); +intel_de_write (dev_priv,BXT_PORT_PLL_EBB_4 (phy, ch), temp); temp &= ~PORT_PLL_10BIT_CLK_ENABLE ; temp |= pll->state.hw_state.ebb4; -I915_WRITE (BXT_PORT_PLL_EBB_4 (phy, ch), temp); +intel_de_write (dev_priv,BXT_PORT_PLL_EBB_4 (phy, ch), temp);/* Enable PLL */ - temp =I915_READ (BXT_PORT_PLL_ENABLE (port)); + temp =intel_de_read (dev_priv,BXT_PORT_PLL_ENABLE (port)); temp |=PORT_PLL_ENABLE ; -I915_WRITE (BXT_PORT_PLL_ENABLE (port), temp); -POSTING_READ (BXT_PORT_PLL_ENABLE (port)); +intel_de_write (dev_priv,BXT_PORT_PLL_ENABLE (port), temp); +intel_de_posting_read (dev_priv,BXT_PORT_PLL_ENABLE (port)); -if (wait_for_us ((I915_READ (BXT_PORT_PLL_ENABLE (port)) &PORT_PLL_LOCK ), +if (wait_for_us ((intel_de_read (dev_priv,BXT_PORT_PLL_ENABLE (port)) &PORT_PLL_LOCK ),200 ))DRM_ERROR ("PLL %d not locked\n" , port);if (IS_GEMINILAKE (dev_priv)) { - temp =I915_READ (BXT_PORT_TX_DW5_LN0 (phy, ch)); + temp =intel_de_read (dev_priv,BXT_PORT_TX_DW5_LN0 (phy, ch)); temp |=DCC_DELAY_RANGE_2 ; -I915_WRITE (BXT_PORT_TX_DW5_GRP (phy, ch), temp); +intel_de_write (dev_priv,BXT_PORT_TX_DW5_GRP (phy, ch), temp); }/* * While we write to the group register to program all lanes at once we * can read only lane registers and we pick lanes 0/1 for that. */ - temp =I915_READ (BXT_PORT_PCS_DW12_LN01 (phy, ch)); + temp =intel_de_read (dev_priv,BXT_PORT_PCS_DW12_LN01 (phy, ch)); temp &= ~LANE_STAGGER_MASK ; temp &= ~LANESTAGGER_STRAP_OVRD ; temp |= pll->state.hw_state.pcsdw12; -I915_WRITE (BXT_PORT_PCS_DW12_GRP (phy, ch), temp); +intel_de_write (dev_priv,BXT_PORT_PCS_DW12_GRP (phy, ch), temp); } static void bxt_ddi_pll_disable(struct drm_i915_private *dev_priv,
@@ -1630,18 +1630,18 @@ static void bxt_ddi_pll_disable(struct drm_i915_private *dev_priv,enum port port = (enum port )pll->info->id;/* 1:1 port->PLL mapping */ u32 temp; - temp =I915_READ (BXT_PORT_PLL_ENABLE (port)); + temp =intel_de_read (dev_priv,BXT_PORT_PLL_ENABLE (port)); temp &= ~PORT_PLL_ENABLE ; -I915_WRITE (BXT_PORT_PLL_ENABLE (port), temp); -POSTING_READ (BXT_PORT_PLL_ENABLE (port)); +intel_de_write (dev_priv,BXT_PORT_PLL_ENABLE (port), temp); +intel_de_posting_read (dev_priv,BXT_PORT_PLL_ENABLE (port));if (IS_GEMINILAKE (dev_priv)) { - temp =I915_READ (BXT_PORT_PLL_ENABLE (port)); + temp =intel_de_read (dev_priv,BXT_PORT_PLL_ENABLE (port)); temp &= ~PORT_PLL_POWER_ENABLE ; -I915_WRITE (BXT_PORT_PLL_ENABLE (port), temp); +intel_de_write (dev_priv,BXT_PORT_PLL_ENABLE (port), temp); -if (wait_for_us (!(I915_READ (BXT_PORT_PLL_ENABLE (port)) & -PORT_PLL_POWER_STATE ),200 )) +if (wait_for_us (!(intel_de_read (dev_priv,BXT_PORT_PLL_ENABLE (port)) & +PORT_PLL_POWER_STATE ),200 ))DRM_ERROR ("Power state not reset for PLL:%d\n" , port); } }
@@ -1666,40 +1666,40 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *dev_priv, ret = false; - val =I915_READ (BXT_PORT_PLL_ENABLE (port)); + val =intel_de_read (dev_priv,BXT_PORT_PLL_ENABLE (port));if (!(val &PORT_PLL_ENABLE )) goto out; - hw_state->ebb0 =I915_READ (BXT_PORT_PLL_EBB_0 (phy, ch)); + hw_state->ebb0 =intel_de_read (dev_priv,BXT_PORT_PLL_EBB_0 (phy, ch)); hw_state->ebb0 &=PORT_PLL_P1_MASK |PORT_PLL_P2_MASK ; - hw_state->ebb4 =I915_READ (BXT_PORT_PLL_EBB_4 (phy, ch)); + hw_state->ebb4 =intel_de_read (dev_priv,BXT_PORT_PLL_EBB_4 (phy, ch)); hw_state->ebb4 &=PORT_PLL_10BIT_CLK_ENABLE ; - hw_state->pll0 =I915_READ (BXT_PORT_PLL (phy, ch,0 )); + hw_state->pll0 =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,0 )); hw_state->pll0 &=PORT_PLL_M2_MASK ; - hw_state->pll1 =I915_READ (BXT_PORT_PLL (phy, ch,1 )); + hw_state->pll1 =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,1 )); hw_state->pll1 &=PORT_PLL_N_MASK ; - hw_state->pll2 =I915_READ (BXT_PORT_PLL (phy, ch,2 )); + hw_state->pll2 =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,2 )); hw_state->pll2 &=PORT_PLL_M2_FRAC_MASK ; - hw_state->pll3 =I915_READ (BXT_PORT_PLL (phy, ch,3 )); + hw_state->pll3 =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,3 )); hw_state->pll3 &=PORT_PLL_M2_FRAC_ENABLE ; - hw_state->pll6 =I915_READ (BXT_PORT_PLL (phy, ch,6 )); + hw_state->pll6 =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,6 )); hw_state->pll6 &=PORT_PLL_PROP_COEFF_MASK |PORT_PLL_INT_COEFF_MASK |PORT_PLL_GAIN_CTL_MASK ; - hw_state->pll8 =I915_READ (BXT_PORT_PLL (phy, ch,8 )); + hw_state->pll8 =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,8 )); hw_state->pll8 &=PORT_PLL_TARGET_CNT_MASK ; - hw_state->pll9 =I915_READ (BXT_PORT_PLL (phy, ch,9 )); + hw_state->pll9 =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,9 )); hw_state->pll9 &=PORT_PLL_LOCK_THRESHOLD_MASK ; - hw_state->pll10 =I915_READ (BXT_PORT_PLL (phy, ch,10 )); + hw_state->pll10 =intel_de_read (dev_priv,BXT_PORT_PLL (phy, ch,10 )); hw_state->pll10 &=PORT_PLL_DCO_AMP_OVR_EN_H |PORT_PLL_DCO_AMP_MASK ;
@@ -1708,11 +1708,12 @@ static bool bxt_ddi_pll_get_hw_state(struct drm_i915_private *dev_priv,* can read only lane registers. We configure all lanes the same way, so * here just read out lanes 0/1 and output a note if lanes 2/3 differ. */ - hw_state->pcsdw12 =I915_READ (BXT_PORT_PCS_DW12_LN01 (phy, ch)); -if (I915_READ (BXT_PORT_PCS_DW12_LN23 (phy, ch)) != hw_state->pcsdw12) + hw_state->pcsdw12 =intel_de_read (dev_priv, +BXT_PORT_PCS_DW12_LN01 (phy, ch)); +if (intel_de_read (dev_priv,BXT_PORT_PCS_DW12_LN23 (phy, ch)) != hw_state->pcsdw12)DRM_DEBUG_DRIVER ("lane stagger config different for lane 01 (%08x) and 23 (%08x)\n" , hw_state->pcsdw12, -I915_READ (BXT_PORT_PCS_DW12_LN23 (phy, ch))); +intel_de_read (dev_priv,BXT_PORT_PCS_DW12_LN23 (phy, ch))); hw_state->pcsdw12 &=LANE_STAGGER_MASK |LANESTAGGER_STRAP_OVRD ; ret = true;
@@ -2024,9 +2025,9 @@ static void cnl_ddi_pll_enable(struct drm_i915_private *dev_priv,u32 val;/* 1. Enable DPLL power in DPLL_ENABLE. */ - val =I915_READ (CNL_DPLL_ENABLE (id)); + val =intel_de_read (dev_priv,CNL_DPLL_ENABLE (id)); val |=PLL_POWER_ENABLE ; -I915_WRITE (CNL_DPLL_ENABLE (id), val); +intel_de_write (dev_priv,CNL_DPLL_ENABLE (id), val);/* 2. Wait for DPLL power state enabled in DPLL_ENABLE. */ if (intel_de_wait_for_set(dev_priv, CNL_DPLL_ENABLE(id),
@@ -2038,18 +2039,18 @@ static void cnl_ddi_pll_enable(struct drm_i915_private *dev_priv,* select DP mode, and set DP link rate. */ val = pll->state.hw_state.cfgcr0; -I915_WRITE (CNL_DPLL_CFGCR0 (id), val); +intel_de_write (dev_priv,CNL_DPLL_CFGCR0 (id), val);/* 4. Reab back to ensure writes completed */ -POSTING_READ (CNL_DPLL_CFGCR0 (id)); +intel_de_posting_read (dev_priv,CNL_DPLL_CFGCR0 (id));/* 3. Configure DPLL_CFGCR0 */ /* Avoid touch CFGCR1 if HDMI mode is not enabled */ if (pll->state.hw_state.cfgcr0 &DPLL_CFGCR0_HDMI_MODE ) { val = pll->state.hw_state.cfgcr1; -I915_WRITE (CNL_DPLL_CFGCR1 (id), val); +intel_de_write (dev_priv,CNL_DPLL_CFGCR1 (id), val);/* 4. Reab back to ensure writes completed */ -POSTING_READ (CNL_DPLL_CFGCR1 (id)); +intel_de_posting_read (dev_priv,CNL_DPLL_CFGCR1 (id)); }/*
@@ -2062,9 +2063,9 @@ static void cnl_ddi_pll_enable(struct drm_i915_private *dev_priv,*/ /* 6. Enable DPLL in DPLL_ENABLE. */ - val =I915_READ (CNL_DPLL_ENABLE (id)); + val =intel_de_read (dev_priv,CNL_DPLL_ENABLE (id)); val |=PLL_ENABLE ; -I915_WRITE (CNL_DPLL_ENABLE (id), val); +intel_de_write (dev_priv,CNL_DPLL_ENABLE (id), val);/* 7. Wait for PLL lock status in DPLL_ENABLE. */ if (intel_de_wait_for_set (dev_priv,CNL_DPLL_ENABLE (id),PLL_LOCK ,5 ))
@@ -2106,9 +2107,9 @@ static void cnl_ddi_pll_disable(struct drm_i915_private *dev_priv,*/ /* 3. Disable DPLL through DPLL_ENABLE. */ - val =I915_READ (CNL_DPLL_ENABLE (id)); + val =intel_de_read (dev_priv,CNL_DPLL_ENABLE (id)); val &= ~PLL_ENABLE ; -I915_WRITE (CNL_DPLL_ENABLE (id), val); +intel_de_write (dev_priv,CNL_DPLL_ENABLE (id), val);/* 4. Wait for PLL not locked status in DPLL_ENABLE. */ if (intel_de_wait_for_clear (dev_priv,CNL_DPLL_ENABLE (id),PLL_LOCK ,5 ))
@@ -2124,9 +2125,9 @@ static void cnl_ddi_pll_disable(struct drm_i915_private *dev_priv,*/ /* 6. Disable DPLL power in DPLL_ENABLE. */ - val =I915_READ (CNL_DPLL_ENABLE (id)); + val =intel_de_read (dev_priv,CNL_DPLL_ENABLE (id)); val &= ~PLL_POWER_ENABLE ; -I915_WRITE (CNL_DPLL_ENABLE (id), val); +intel_de_write (dev_priv,CNL_DPLL_ENABLE (id), val);/* 7. Wait for DPLL power state disabled in DPLL_ENABLE. */ if (intel_de_wait_for_clear(dev_priv, CNL_DPLL_ENABLE(id),
@@ -2150,16 +2151,17 @@ static bool cnl_ddi_pll_get_hw_state(struct drm_i915_private *dev_priv, ret = false; - val =I915_READ (CNL_DPLL_ENABLE (id)); + val =intel_de_read (dev_priv,CNL_DPLL_ENABLE (id));if (!(val &PLL_ENABLE )) goto out; - val =I915_READ (CNL_DPLL_CFGCR0 (id)); + val =intel_de_read (dev_priv,CNL_DPLL_CFGCR0 (id)); hw_state->cfgcr0 = val;/* avoid reading back stale values if HDMI mode is not enabled */ if (val &DPLL_CFGCR0_HDMI_MODE ) { - hw_state->cfgcr1 =I915_READ (CNL_DPLL_CFGCR1 (id)); + hw_state->cfgcr1 =intel_de_read (dev_priv, +CNL_DPLL_CFGCR1 (id)); } ret = true;
@@ -3140,35 +3142,37 @@ static bool mg_pll_get_hw_state(struct drm_i915_private *dev_priv,if (!wakeref)return false; - val =I915_READ (MG_PLL_ENABLE (tc_port)); + val =intel_de_read (dev_priv,MG_PLL_ENABLE (tc_port));if (!(val &PLL_ENABLE )) goto out; - hw_state->mg_refclkin_ctl =I915_READ (MG_REFCLKIN_CTL (tc_port)); + hw_state->mg_refclkin_ctl =intel_de_read (dev_priv, +MG_REFCLKIN_CTL (tc_port)); hw_state->mg_refclkin_ctl &=MG_REFCLKIN_CTL_OD_2_MUX_MASK ; hw_state->mg_clktop2_coreclkctl1 = -I915_READ (MG_CLKTOP2_CORECLKCTL1 (tc_port)); +intel_de_read (dev_priv,MG_CLKTOP2_CORECLKCTL1 (tc_port)); hw_state->mg_clktop2_coreclkctl1 &=MG_CLKTOP2_CORECLKCTL1_A_DIVRATIO_MASK ; hw_state->mg_clktop2_hsclkctl = -I915_READ (MG_CLKTOP2_HSCLKCTL (tc_port)); +intel_de_read (dev_priv,MG_CLKTOP2_HSCLKCTL (tc_port)); hw_state->mg_clktop2_hsclkctl &=MG_CLKTOP2_HSCLKCTL_TLINEDRV_CLKSEL_MASK |MG_CLKTOP2_HSCLKCTL_CORE_INPUTSEL_MASK |MG_CLKTOP2_HSCLKCTL_HSDIV_RATIO_MASK |MG_CLKTOP2_HSCLKCTL_DSDIV_RATIO_MASK ; - hw_state->mg_pll_div0 =I915_READ (MG_PLL_DIV0 (tc_port)); - hw_state->mg_pll_div1 =I915_READ (MG_PLL_DIV1 (tc_port)); - hw_state->mg_pll_lf =I915_READ (MG_PLL_LF (tc_port)); - hw_state->mg_pll_frac_lock =I915_READ (MG_PLL_FRAC_LOCK (tc_port)); - hw_state->mg_pll_ssc =I915_READ (MG_PLL_SSC (tc_port)); + hw_state->mg_pll_div0 =intel_de_read (dev_priv,MG_PLL_DIV0 (tc_port)); + hw_state->mg_pll_div1 =intel_de_read (dev_priv,MG_PLL_DIV1 (tc_port)); + hw_state->mg_pll_lf =intel_de_read (dev_priv,MG_PLL_LF (tc_port)); + hw_state->mg_pll_frac_lock =intel_de_read (dev_priv, +MG_PLL_FRAC_LOCK (tc_port)); + hw_state->mg_pll_ssc =intel_de_read (dev_priv,MG_PLL_SSC (tc_port)); - hw_state->mg_pll_bias =I915_READ (MG_PLL_BIAS (tc_port)); + hw_state->mg_pll_bias =intel_de_read (dev_priv,MG_PLL_BIAS (tc_port)); hw_state->mg_pll_tdc_coldst_bias = -I915_READ (MG_PLL_TDC_COLDST_BIAS (tc_port)); +intel_de_read (dev_priv,MG_PLL_TDC_COLDST_BIAS (tc_port));if (dev_priv->cdclk.hw.ref ==38400 ) { hw_state->mg_pll_tdc_coldst_bias_mask =MG_PLL_TDC_COLDST_COLDSTART ;
@@ -3202,7 +3206,7 @@ static bool dkl_pll_get_hw_state(struct drm_i915_private *dev_priv,if (!wakeref)return false; - val =I915_READ (MG_PLL_ENABLE (tc_port)); + val =intel_de_read (dev_priv,MG_PLL_ENABLE (tc_port));if (!(val &PLL_ENABLE )) goto out;
@@ -3210,13 +3214,15 @@ static bool dkl_pll_get_hw_state(struct drm_i915_private *dev_priv,* All registers read here have the same HIP_INDEX_REG even though * they are on different building blocks */ -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 )); - hw_state->mg_refclkin_ctl =I915_READ (DKL_REFCLKIN_CTL (tc_port)); + hw_state->mg_refclkin_ctl =intel_de_read (dev_priv, +DKL_REFCLKIN_CTL (tc_port)); hw_state->mg_refclkin_ctl &=MG_REFCLKIN_CTL_OD_2_MUX_MASK ; hw_state->mg_clktop2_hsclkctl = -I915_READ (DKL_CLKTOP2_HSCLKCTL (tc_port)); +intel_de_read (dev_priv,DKL_CLKTOP2_HSCLKCTL (tc_port)); hw_state->mg_clktop2_hsclkctl &=MG_CLKTOP2_HSCLKCTL_TLINEDRV_CLKSEL_MASK | MG_CLKTOP2_HSCLKCTL_CORE_INPUTSEL_MASK |
@@ -3224,32 +3230,32 @@ static bool dkl_pll_get_hw_state(struct drm_i915_private *dev_priv,MG_CLKTOP2_HSCLKCTL_DSDIV_RATIO_MASK ; hw_state->mg_clktop2_coreclkctl1 = -I915_READ (DKL_CLKTOP2_CORECLKCTL1 (tc_port)); +intel_de_read (dev_priv,DKL_CLKTOP2_CORECLKCTL1 (tc_port)); hw_state->mg_clktop2_coreclkctl1 &=MG_CLKTOP2_CORECLKCTL1_A_DIVRATIO_MASK ; - hw_state->mg_pll_div0 =I915_READ (DKL_PLL_DIV0 (tc_port)); + hw_state->mg_pll_div0 =intel_de_read (dev_priv,DKL_PLL_DIV0 (tc_port)); hw_state->mg_pll_div0 &= (DKL_PLL_DIV0_INTEG_COEFF_MASK |DKL_PLL_DIV0_PROP_COEFF_MASK |DKL_PLL_DIV0_FBPREDIV_MASK |DKL_PLL_DIV0_FBDIV_INT_MASK ); - hw_state->mg_pll_div1 =I915_READ (DKL_PLL_DIV1 (tc_port)); + hw_state->mg_pll_div1 =intel_de_read (dev_priv,DKL_PLL_DIV1 (tc_port)); hw_state->mg_pll_div1 &= (DKL_PLL_DIV1_IREF_TRIM_MASK |DKL_PLL_DIV1_TDC_TARGET_CNT_MASK ); - hw_state->mg_pll_ssc =I915_READ (DKL_PLL_SSC (tc_port)); + hw_state->mg_pll_ssc =intel_de_read (dev_priv,DKL_PLL_SSC (tc_port)); hw_state->mg_pll_ssc &= (DKL_PLL_SSC_IREF_NDIV_RATIO_MASK |DKL_PLL_SSC_STEP_LEN_MASK |DKL_PLL_SSC_STEP_NUM_MASK |DKL_PLL_SSC_EN ); - hw_state->mg_pll_bias =I915_READ (DKL_PLL_BIAS (tc_port)); + hw_state->mg_pll_bias =intel_de_read (dev_priv,DKL_PLL_BIAS (tc_port)); hw_state->mg_pll_bias &= (DKL_PLL_BIAS_FRAC_EN_H |DKL_PLL_BIAS_FBDIV_FRAC_MASK ); hw_state->mg_pll_tdc_coldst_bias = -I915_READ (DKL_PLL_TDC_COLDST_BIAS (tc_port)); +intel_de_read (dev_priv,DKL_PLL_TDC_COLDST_BIAS (tc_port)); hw_state->mg_pll_tdc_coldst_bias &= (DKL_PLL_TDC_SSC_STEP_SIZE_MASK |DKL_PLL_TDC_FEED_FWD_GAIN_MASK );
@@ -3274,20 +3280,26 @@ static bool icl_pll_get_hw_state(struct drm_i915_private *dev_priv,if (!wakeref)return false; - val =I915_READ (enable_reg); + val =intel_de_read (dev_priv, enable_reg);if (!(val &PLL_ENABLE )) goto out;if (INTEL_GEN (dev_priv) >=12 ) { - hw_state->cfgcr0 =I915_READ (TGL_DPLL_CFGCR0 (id)); - hw_state->cfgcr1 =I915_READ (TGL_DPLL_CFGCR1 (id)); + hw_state->cfgcr0 =intel_de_read (dev_priv, +TGL_DPLL_CFGCR0 (id)); + hw_state->cfgcr1 =intel_de_read (dev_priv, +TGL_DPLL_CFGCR1 (id)); }else {if (IS_ELKHARTLAKE (dev_priv) && id ==DPLL_ID_EHL_DPLL4 ) { - hw_state->cfgcr0 =I915_READ (ICL_DPLL_CFGCR0 (4 )); - hw_state->cfgcr1 =I915_READ (ICL_DPLL_CFGCR1 (4 )); + hw_state->cfgcr0 =intel_de_read (dev_priv, +ICL_DPLL_CFGCR0 (4 )); + hw_state->cfgcr1 =intel_de_read (dev_priv, +ICL_DPLL_CFGCR1 (4 )); }else { - hw_state->cfgcr0 =I915_READ (ICL_DPLL_CFGCR0 (id)); - hw_state->cfgcr1 =I915_READ (ICL_DPLL_CFGCR1 (id)); + hw_state->cfgcr0 =intel_de_read (dev_priv, +ICL_DPLL_CFGCR0 (id)); + hw_state->cfgcr1 =intel_de_read (dev_priv, +ICL_DPLL_CFGCR1 (id)); } }
@@ -3338,9 +3350,9 @@ static void icl_dpll_write(struct drm_i915_private *dev_priv, } } -I915_WRITE (cfgcr0_reg, hw_state->cfgcr0); -I915_WRITE (cfgcr1_reg, hw_state->cfgcr1); -POSTING_READ (cfgcr1_reg); +intel_de_write (dev_priv, cfgcr0_reg, hw_state->cfgcr0); +intel_de_write (dev_priv, cfgcr1_reg, hw_state->cfgcr1); +intel_de_posting_read (dev_priv, cfgcr1_reg); } static void icl_mg_pll_write(struct drm_i915_private *dev_priv,
@@ -3356,41 +3368,42 @@ static void icl_mg_pll_write(struct drm_i915_private *dev_priv,* during the calc/readout phase if the mask depends on some other HW * state like refclk, see icl_calc_mg_pll_state(). */ - val =I915_READ (MG_REFCLKIN_CTL (tc_port)); + val =intel_de_read (dev_priv,MG_REFCLKIN_CTL (tc_port)); val &= ~MG_REFCLKIN_CTL_OD_2_MUX_MASK ; val |= hw_state->mg_refclkin_ctl; -I915_WRITE (MG_REFCLKIN_CTL (tc_port), val); +intel_de_write (dev_priv,MG_REFCLKIN_CTL (tc_port), val); - val =I915_READ (MG_CLKTOP2_CORECLKCTL1 (tc_port)); + val =intel_de_read (dev_priv,MG_CLKTOP2_CORECLKCTL1 (tc_port)); val &= ~MG_CLKTOP2_CORECLKCTL1_A_DIVRATIO_MASK ; val |= hw_state->mg_clktop2_coreclkctl1; -I915_WRITE (MG_CLKTOP2_CORECLKCTL1 (tc_port), val); +intel_de_write (dev_priv,MG_CLKTOP2_CORECLKCTL1 (tc_port), val); - val =I915_READ (MG_CLKTOP2_HSCLKCTL (tc_port)); + val =intel_de_read (dev_priv,MG_CLKTOP2_HSCLKCTL (tc_port)); val &= ~(MG_CLKTOP2_HSCLKCTL_TLINEDRV_CLKSEL_MASK |MG_CLKTOP2_HSCLKCTL_CORE_INPUTSEL_MASK |MG_CLKTOP2_HSCLKCTL_HSDIV_RATIO_MASK |MG_CLKTOP2_HSCLKCTL_DSDIV_RATIO_MASK ); val |= hw_state->mg_clktop2_hsclkctl; -I915_WRITE (MG_CLKTOP2_HSCLKCTL (tc_port), val); +intel_de_write (dev_priv,MG_CLKTOP2_HSCLKCTL (tc_port), val); -I915_WRITE (MG_PLL_DIV0 (tc_port), hw_state->mg_pll_div0); -I915_WRITE (MG_PLL_DIV1 (tc_port), hw_state->mg_pll_div1); -I915_WRITE (MG_PLL_LF (tc_port), hw_state->mg_pll_lf); -I915_WRITE (MG_PLL_FRAC_LOCK (tc_port), hw_state->mg_pll_frac_lock); -I915_WRITE (MG_PLL_SSC (tc_port), hw_state->mg_pll_ssc); +intel_de_write (dev_priv,MG_PLL_DIV0 (tc_port), hw_state->mg_pll_div0); +intel_de_write (dev_priv,MG_PLL_DIV1 (tc_port), hw_state->mg_pll_div1); +intel_de_write (dev_priv,MG_PLL_LF (tc_port), hw_state->mg_pll_lf); +intel_de_write (dev_priv,MG_PLL_FRAC_LOCK (tc_port), + hw_state->mg_pll_frac_lock); +intel_de_write (dev_priv,MG_PLL_SSC (tc_port), hw_state->mg_pll_ssc); - val =I915_READ (MG_PLL_BIAS (tc_port)); + val =intel_de_read (dev_priv,MG_PLL_BIAS (tc_port)); val &= ~hw_state->mg_pll_bias_mask; val |= hw_state->mg_pll_bias; -I915_WRITE (MG_PLL_BIAS (tc_port), val); +intel_de_write (dev_priv,MG_PLL_BIAS (tc_port), val); - val =I915_READ (MG_PLL_TDC_COLDST_BIAS (tc_port)); + val =intel_de_read (dev_priv,MG_PLL_TDC_COLDST_BIAS (tc_port)); val &= ~hw_state->mg_pll_tdc_coldst_bias_mask; val |= hw_state->mg_pll_tdc_coldst_bias; -I915_WRITE (MG_PLL_TDC_COLDST_BIAS (tc_port), val); +intel_de_write (dev_priv,MG_PLL_TDC_COLDST_BIAS (tc_port), val); -POSTING_READ (MG_PLL_TDC_COLDST_BIAS (tc_port)); +intel_de_posting_read (dev_priv,MG_PLL_TDC_COLDST_BIAS (tc_port)); } static void dkl_pll_write(struct drm_i915_private *dev_priv,
@@ -3404,62 +3417,63 @@ static void dkl_pll_write(struct drm_i915_private *dev_priv,* All registers programmed here have the same HIP_INDEX_REG even * though on different building block */ -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 ));/* All the registers are RMW */ - val =I915_READ (DKL_REFCLKIN_CTL (tc_port)); + val =intel_de_read (dev_priv,DKL_REFCLKIN_CTL (tc_port)); val &= ~MG_REFCLKIN_CTL_OD_2_MUX_MASK ; val |= hw_state->mg_refclkin_ctl; -I915_WRITE (DKL_REFCLKIN_CTL (tc_port), val); +intel_de_write (dev_priv,DKL_REFCLKIN_CTL (tc_port), val); - val =I915_READ (DKL_CLKTOP2_CORECLKCTL1 (tc_port)); + val =intel_de_read (dev_priv,DKL_CLKTOP2_CORECLKCTL1 (tc_port)); val &= ~MG_CLKTOP2_CORECLKCTL1_A_DIVRATIO_MASK ; val |= hw_state->mg_clktop2_coreclkctl1; -I915_WRITE (DKL_CLKTOP2_CORECLKCTL1 (tc_port), val); +intel_de_write (dev_priv,DKL_CLKTOP2_CORECLKCTL1 (tc_port), val); - val =I915_READ (DKL_CLKTOP2_HSCLKCTL (tc_port)); + val =intel_de_read (dev_priv,DKL_CLKTOP2_HSCLKCTL (tc_port)); val &= ~(MG_CLKTOP2_HSCLKCTL_TLINEDRV_CLKSEL_MASK |MG_CLKTOP2_HSCLKCTL_CORE_INPUTSEL_MASK |MG_CLKTOP2_HSCLKCTL_HSDIV_RATIO_MASK |MG_CLKTOP2_HSCLKCTL_DSDIV_RATIO_MASK ); val |= hw_state->mg_clktop2_hsclkctl; -I915_WRITE (DKL_CLKTOP2_HSCLKCTL (tc_port), val); +intel_de_write (dev_priv,DKL_CLKTOP2_HSCLKCTL (tc_port), val); - val =I915_READ (DKL_PLL_DIV0 (tc_port)); + val =intel_de_read (dev_priv,DKL_PLL_DIV0 (tc_port)); val &= ~(DKL_PLL_DIV0_INTEG_COEFF_MASK |DKL_PLL_DIV0_PROP_COEFF_MASK |DKL_PLL_DIV0_FBPREDIV_MASK |DKL_PLL_DIV0_FBDIV_INT_MASK ); val |= hw_state->mg_pll_div0; -I915_WRITE (DKL_PLL_DIV0 (tc_port), val); +intel_de_write (dev_priv,DKL_PLL_DIV0 (tc_port), val); - val =I915_READ (DKL_PLL_DIV1 (tc_port)); + val =intel_de_read (dev_priv,DKL_PLL_DIV1 (tc_port)); val &= ~(DKL_PLL_DIV1_IREF_TRIM_MASK |DKL_PLL_DIV1_TDC_TARGET_CNT_MASK ); val |= hw_state->mg_pll_div1; -I915_WRITE (DKL_PLL_DIV1 (tc_port), val); +intel_de_write (dev_priv,DKL_PLL_DIV1 (tc_port), val); - val =I915_READ (DKL_PLL_SSC (tc_port)); + val =intel_de_read (dev_priv,DKL_PLL_SSC (tc_port)); val &= ~(DKL_PLL_SSC_IREF_NDIV_RATIO_MASK |DKL_PLL_SSC_STEP_LEN_MASK |DKL_PLL_SSC_STEP_NUM_MASK |DKL_PLL_SSC_EN ); val |= hw_state->mg_pll_ssc; -I915_WRITE (DKL_PLL_SSC (tc_port), val); +intel_de_write (dev_priv,DKL_PLL_SSC (tc_port), val); - val =I915_READ (DKL_PLL_BIAS (tc_port)); + val =intel_de_read (dev_priv,DKL_PLL_BIAS (tc_port)); val &= ~(DKL_PLL_BIAS_FRAC_EN_H |DKL_PLL_BIAS_FBDIV_FRAC_MASK ); val |= hw_state->mg_pll_bias; -I915_WRITE (DKL_PLL_BIAS (tc_port), val); +intel_de_write (dev_priv,DKL_PLL_BIAS (tc_port), val); - val =I915_READ (DKL_PLL_TDC_COLDST_BIAS (tc_port)); + val =intel_de_read (dev_priv,DKL_PLL_TDC_COLDST_BIAS (tc_port)); val &= ~(DKL_PLL_TDC_SSC_STEP_SIZE_MASK |DKL_PLL_TDC_FEED_FWD_GAIN_MASK ); val |= hw_state->mg_pll_tdc_coldst_bias; -I915_WRITE (DKL_PLL_TDC_COLDST_BIAS (tc_port), val); +intel_de_write (dev_priv,DKL_PLL_TDC_COLDST_BIAS (tc_port), val); -POSTING_READ (DKL_PLL_TDC_COLDST_BIAS (tc_port)); +intel_de_posting_read (dev_priv,DKL_PLL_TDC_COLDST_BIAS (tc_port)); } static void icl_pll_power_enable(struct drm_i915_private *dev_priv,
@@ -3468,9 +3482,9 @@ static void icl_pll_power_enable(struct drm_i915_private *dev_priv, {u32 val; - val =I915_READ (enable_reg); + val =intel_de_read (dev_priv, enable_reg); val |=PLL_POWER_ENABLE ; -I915_WRITE (enable_reg, val); +intel_de_write (dev_priv, enable_reg, val);/* * The spec says we need to "wait" but it also says it should be
@@ -3486,9 +3500,9 @@ static void icl_pll_enable(struct drm_i915_private *dev_priv, {u32 val; - val =I915_READ (enable_reg); + val =intel_de_read (dev_priv, enable_reg); val |=PLL_ENABLE ; -I915_WRITE (enable_reg, val); +intel_de_write (dev_priv, enable_reg, val);/* Timeout is actually 600us. */ if (intel_de_wait_for_set (dev_priv, enable_reg,PLL_LOCK ,1 ))
@@ -3584,9 +3598,9 @@ static void icl_pll_disable(struct drm_i915_private *dev_priv,* nothign here. */ - val =I915_READ (enable_reg); + val =intel_de_read (dev_priv, enable_reg); val &= ~PLL_ENABLE ; -I915_WRITE (enable_reg, val); +intel_de_write (dev_priv, enable_reg, val);/* Timeout is actually 1us. */ if (intel_de_wait_for_clear (dev_priv, enable_reg,PLL_LOCK ,1 ))
@@ -3594,9 +3608,9 @@ static void icl_pll_disable(struct drm_i915_private *dev_priv,/* DVFS post sequence would be here. See the comment above. */ - val =I915_READ (enable_reg); + val =intel_de_read (dev_priv, enable_reg); val &= ~PLL_POWER_ENABLE ; -I915_WRITE (enable_reg, val); +intel_de_write (dev_priv, enable_reg, val);/* * The spec says we need to "wait" but it also says it should be
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 13/33 drm/i915/dp_mst: 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_mst.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_mst.c +7 -4
@@ -361,9 +361,12 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,drm_dp_update_payload_part2 (&intel_dp->mst_mgr); - val =I915_READ (TRANS_DDI_FUNC_CTL (old_crtc_state->cpu_transcoder)); + val =intel_de_read (dev_priv, +TRANS_DDI_FUNC_CTL (old_crtc_state->cpu_transcoder)); val &= ~TRANS_DDI_DP_VC_PAYLOAD_ALLOC ; -I915_WRITE (TRANS_DDI_FUNC_CTL (old_crtc_state->cpu_transcoder), val); +intel_de_write (dev_priv, +TRANS_DDI_FUNC_CTL (old_crtc_state->cpu_transcoder), + val);if (intel_de_wait_for_set (dev_priv, intel_dp->regs.dp_tp_status,DP_TP_STATUS_ACT_SENT ,1 ))
@@ -459,8 +462,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,DRM_ERROR ("failed to allocate vcpi\n" ); intel_dp->active_mst_links++; - temp =I915_READ (intel_dp->regs.dp_tp_status); -I915_WRITE (intel_dp->regs.dp_tp_status, temp); + temp =intel_de_read (dev_priv, intel_dp->regs.dp_tp_status); +intel_de_write (dev_priv, intel_dp->regs.dp_tp_status, temp); ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 14/33 drm/i915/dsb: 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_dsb.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_dsb.c +13 -11
@@ -40,7 +40,7 @@ static inline bool is_dsb_busy(struct intel_dsb *dsb)struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -return DSB_STATUS &I915_READ (DSB_CTRL (pipe, dsb->id)); +return DSB_STATUS &intel_de_read (dev_priv,DSB_CTRL (pipe, dsb->id)); }static inline bool intel_dsb_enable_engine (struct intel_dsb *dsb)
@@ -50,16 +50,16 @@ static inline bool intel_dsb_enable_engine(struct intel_dsb *dsb)enum pipe pipe = crtc->pipe;u32 dsb_ctrl; - dsb_ctrl =I915_READ (DSB_CTRL (pipe, dsb->id)); + dsb_ctrl =intel_de_read (dev_priv,DSB_CTRL (pipe, dsb->id));if (DSB_STATUS & dsb_ctrl) {DRM_DEBUG_KMS ("DSB engine is busy.\n" );return false; } dsb_ctrl |=DSB_ENABLE ; -I915_WRITE (DSB_CTRL (pipe, dsb->id), dsb_ctrl); +intel_de_write (dev_priv,DSB_CTRL (pipe, dsb->id), dsb_ctrl); -POSTING_READ (DSB_CTRL (pipe, dsb->id)); +intel_de_posting_read (dev_priv,DSB_CTRL (pipe, dsb->id));return true; }
@@ -70,16 +70,16 @@ static inline bool intel_dsb_disable_engine(struct intel_dsb *dsb)enum pipe pipe = crtc->pipe;u32 dsb_ctrl; - dsb_ctrl =I915_READ (DSB_CTRL (pipe, dsb->id)); + dsb_ctrl =intel_de_read (dev_priv,DSB_CTRL (pipe, dsb->id));if (DSB_STATUS & dsb_ctrl) {DRM_DEBUG_KMS ("DSB engine is busy.\n" );return false; } dsb_ctrl &= ~DSB_ENABLE ; -I915_WRITE (DSB_CTRL (pipe, dsb->id), dsb_ctrl); +intel_de_write (dev_priv,DSB_CTRL (pipe, dsb->id), dsb_ctrl); -POSTING_READ (DSB_CTRL (pipe, dsb->id)); +intel_de_posting_read (dev_priv,DSB_CTRL (pipe, dsb->id));return true; }
@@ -198,7 +198,7 @@ void intel_dsb_indexed_reg_write(struct intel_dsb *dsb, i915_reg_t reg,u32 reg_val;if (!buf) { -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val);return ; }
@@ -272,7 +272,7 @@ void intel_dsb_reg_write(struct intel_dsb *dsb, i915_reg_t reg, u32 val)u32 *buf = dsb->cmd_buf;if (!buf) { -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val);return ; }
@@ -313,7 +313,8 @@ void intel_dsb_commit(struct intel_dsb *dsb)DRM_ERROR ("HEAD_PTR write failed - dsb engine is busy.\n" ); goto reset; } -I915_WRITE (DSB_HEAD (pipe, dsb->id),i915_ggtt_offset (dsb->vma)); +intel_de_write (dev_priv,DSB_HEAD (pipe, dsb->id), +i915_ggtt_offset (dsb->vma)); tail =ALIGN (dsb->free_pos *4 ,CACHELINE_BYTES );if (tail > dsb->free_pos *4 )
@@ -326,7 +327,8 @@ void intel_dsb_commit(struct intel_dsb *dsb) }DRM_DEBUG_KMS ("DSB execution started - head 0x%x, tail 0x%x\n" ,i915_ggtt_offset (dsb->vma), tail); -I915_WRITE (DSB_TAIL (pipe, dsb->id),i915_ggtt_offset (dsb->vma) + tail); +intel_de_write (dev_priv,DSB_TAIL (pipe, dsb->id), +i915_ggtt_offset (dsb->vma) + tail);if (wait_for (!is_dsb_busy (dsb),1 )) {DRM_ERROR ("Timed out waiting for DSB workload completion.\n" ); goto reset;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 15/33 drm/i915/dvo: 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_dvo.c | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/display/intel_dvo.c +17 -17
@@ -137,7 +137,7 @@ static bool intel_dvo_connector_get_hw_state(struct intel_connector *connector)struct intel_dvo *intel_dvo =intel_attached_dvo (connector);u32 tmp; - tmp =I915_READ (intel_dvo->dev.dvo_reg); + tmp =intel_de_read (dev_priv, intel_dvo->dev.dvo_reg);if (!(tmp &DVO_ENABLE ))return false;
@@ -152,7 +152,7 @@ static bool intel_dvo_get_hw_state(struct intel_encoder *encoder,struct intel_dvo *intel_dvo =enc_to_dvo (encoder);u32 tmp; - tmp =I915_READ (intel_dvo->dev.dvo_reg); + tmp =intel_de_read (dev_priv, intel_dvo->dev.dvo_reg); *pipe = (tmp &DVO_PIPE_SEL_MASK ) >>DVO_PIPE_SEL_SHIFT ;
@@ -168,7 +168,7 @@ static void intel_dvo_get_config(struct intel_encoder *encoder, pipe_config->output_types |=BIT (INTEL_OUTPUT_DVO ); - tmp =I915_READ (intel_dvo->dev.dvo_reg); + tmp =intel_de_read (dev_priv, intel_dvo->dev.dvo_reg);if (tmp &DVO_HSYNC_ACTIVE_HIGH ) flags |=DRM_MODE_FLAG_PHSYNC ;else
@@ -190,11 +190,11 @@ static void intel_disable_dvo(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dvo *intel_dvo =enc_to_dvo (encoder);i915_reg_t dvo_reg = intel_dvo->dev.dvo_reg; -u32 temp =I915_READ (dvo_reg); +u32 temp =intel_de_read (dev_priv, dvo_reg); intel_dvo->dev.dev_ops->dpms (&intel_dvo->dev, false); -I915_WRITE (dvo_reg, temp & ~DVO_ENABLE ); -I915_READ (dvo_reg); +intel_de_write (dev_priv, dvo_reg, temp & ~DVO_ENABLE ); +intel_de_read (dev_priv, dvo_reg); } static void intel_enable_dvo(struct intel_encoder *encoder,
@@ -204,14 +204,14 @@ static void intel_enable_dvo(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dvo *intel_dvo =enc_to_dvo (encoder);i915_reg_t dvo_reg = intel_dvo->dev.dvo_reg; -u32 temp =I915_READ (dvo_reg); +u32 temp =intel_de_read (dev_priv, dvo_reg); intel_dvo->dev.dev_ops->mode_set (&intel_dvo->dev, &pipe_config->hw.mode, &pipe_config->hw.adjusted_mode); -I915_WRITE (dvo_reg, temp |DVO_ENABLE ); -I915_READ (dvo_reg); +intel_de_write (dev_priv, dvo_reg, temp |DVO_ENABLE ); +intel_de_read (dev_priv, dvo_reg); intel_dvo->dev.dev_ops->dpms (&intel_dvo->dev, true); }
@@ -286,7 +286,7 @@ static void intel_dvo_pre_enable(struct intel_encoder *encoder,i915_reg_t dvo_srcdim_reg = intel_dvo->dev.dvo_srcdim_reg;/* Save the data order, since I don't know what it should be set to. */ - dvo_val =I915_READ (dvo_reg) & + dvo_val =intel_de_read (dev_priv, dvo_reg) & (DVO_PRESERVE_MASK |DVO_DATA_ORDER_GBRG ); dvo_val |=DVO_DATA_ORDER_FP |DVO_BORDER_ENABLE |DVO_BLANK_ACTIVE_HIGH ;
@@ -301,11 +301,10 @@ static void intel_dvo_pre_enable(struct intel_encoder *encoder,/*I915_WRITE(DVOB_SRCDIM, (adjusted_mode->crtc_hdisplay << DVO_SRCDIM_HORIZONTAL_SHIFT) | (adjusted_mode->crtc_vdisplay << DVO_SRCDIM_VERTICAL_SHIFT));*/ -I915_WRITE (dvo_srcdim_reg, - (adjusted_mode->crtc_hdisplay <<DVO_SRCDIM_HORIZONTAL_SHIFT ) | - (adjusted_mode->crtc_vdisplay <<DVO_SRCDIM_VERTICAL_SHIFT )); +intel_de_write (dev_priv, dvo_srcdim_reg, + (adjusted_mode->crtc_hdisplay <<DVO_SRCDIM_HORIZONTAL_SHIFT ) | (adjusted_mode->crtc_vdisplay <<DVO_SRCDIM_VERTICAL_SHIFT ));/*I915_WRITE(DVOB, dvo_val);*/ -I915_WRITE (dvo_reg, dvo_val); +intel_de_write (dev_priv, dvo_reg, dvo_val); } static enum drm_connector_status
@@ -481,15 +480,16 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)* initialize the device. */ for_each_pipe (dev_priv, pipe) { - dpll[pipe] =I915_READ (DPLL (pipe)); -I915_WRITE (DPLL (pipe), dpll[pipe] |DPLL_DVO_2X_MODE ); + dpll[pipe] =intel_de_read (dev_priv,DPLL (pipe)); +intel_de_write (dev_priv,DPLL (pipe), + dpll[pipe] |DPLL_DVO_2X_MODE ); } dvoinit = dvo->dev_ops->init (&intel_dvo->dev, i2c);/* restore the DVO 2x clock state to original */ for_each_pipe (dev_priv, pipe) { -I915_WRITE (DPLL (pipe), dpll[pipe]); +intel_de_write (dev_priv,DPLL (pipe), dpll[pipe]); }intel_gmbus_force_bit (i2c, false);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 16/33 drm/i915/fbc: 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_fbc.c | 106 ++++++++++++----------- 1 file changed, 55 insertions(+), 51 deletions(-)
drivers/gpu/drm/i915/display/intel_fbc.c +55 -51
@@ -93,12 +93,12 @@ static void i8xx_fbc_deactivate(struct drm_i915_private *dev_priv)u32 fbc_ctl;/* Disable compression */ - fbc_ctl =I915_READ (FBC_CONTROL ); + fbc_ctl =intel_de_read (dev_priv,FBC_CONTROL );if ((fbc_ctl &FBC_CTL_EN ) ==0 )return ; fbc_ctl &= ~FBC_CTL_EN ; -I915_WRITE (FBC_CONTROL , fbc_ctl); +intel_de_write (dev_priv,FBC_CONTROL , fbc_ctl);/* Wait for compressing bit to clear */ if (intel_de_wait_for_clear(dev_priv, FBC_STATUS,
@@ -128,7 +128,7 @@ static void i8xx_fbc_activate(struct drm_i915_private *dev_priv)/* Clear old tags */ for (i =0 ; i < (FBC_LL_SIZE /32 ) +1 ; i++) -I915_WRITE (FBC_TAG (i),0 ); +intel_de_write (dev_priv,FBC_TAG (i),0 );if (IS_GEN (dev_priv,4 )) {u32 fbc_ctl2;
@@ -138,12 +138,13 @@ static void i8xx_fbc_activate(struct drm_i915_private *dev_priv) fbc_ctl2 |=FBC_CTL_PLANE (params->crtc.i9xx_plane);if (params->fence_id >=0 ) fbc_ctl2 |=FBC_CTL_CPU_FENCE ; -I915_WRITE (FBC_CONTROL2 , fbc_ctl2); -I915_WRITE (FBC_FENCE_OFF , params->crtc.fence_y_offset); +intel_de_write (dev_priv,FBC_CONTROL2 , fbc_ctl2); +intel_de_write (dev_priv,FBC_FENCE_OFF , + params->crtc.fence_y_offset); }/* enable it... */ - fbc_ctl =I915_READ (FBC_CONTROL ); + fbc_ctl =intel_de_read (dev_priv,FBC_CONTROL ); fbc_ctl &=0x3fff <<FBC_CTL_INTERVAL_SHIFT ; fbc_ctl |=FBC_CTL_EN |FBC_CTL_PERIODIC ;if (IS_I945GM (dev_priv))
@@ -151,12 +152,12 @@ static void i8xx_fbc_activate(struct drm_i915_private *dev_priv) fbc_ctl |= (cfb_pitch &0xff ) <<FBC_CTL_STRIDE_SHIFT ;if (params->fence_id >=0 ) fbc_ctl |= params->fence_id; -I915_WRITE (FBC_CONTROL , fbc_ctl); +intel_de_write (dev_priv,FBC_CONTROL , fbc_ctl); }static bool i8xx_fbc_is_active (struct drm_i915_private *dev_priv) { -return I915_READ (FBC_CONTROL ) &FBC_CTL_EN ; +return intel_de_read (dev_priv,FBC_CONTROL ) &FBC_CTL_EN ; }static void g4x_fbc_activate (struct drm_i915_private *dev_priv)
@@ -172,13 +173,14 @@ static void g4x_fbc_activate(struct drm_i915_private *dev_priv)if (params->fence_id >=0 ) { dpfc_ctl |=DPFC_CTL_FENCE_EN | params->fence_id; -I915_WRITE (DPFC_FENCE_YOFF , params->crtc.fence_y_offset); +intel_de_write (dev_priv,DPFC_FENCE_YOFF , + params->crtc.fence_y_offset); }else { -I915_WRITE (DPFC_FENCE_YOFF ,0 ); +intel_de_write (dev_priv,DPFC_FENCE_YOFF ,0 ); }/* enable it... */ -I915_WRITE (DPFC_CONTROL , dpfc_ctl |DPFC_CTL_EN ); +intel_de_write (dev_priv,DPFC_CONTROL , dpfc_ctl |DPFC_CTL_EN ); }static void g4x_fbc_deactivate (struct drm_i915_private *dev_priv)
@@ -186,16 +188,16 @@ static void g4x_fbc_deactivate(struct drm_i915_private *dev_priv)u32 dpfc_ctl;/* Disable compression */ - dpfc_ctl =I915_READ (DPFC_CONTROL ); + dpfc_ctl =intel_de_read (dev_priv,DPFC_CONTROL );if (dpfc_ctl &DPFC_CTL_EN ) { dpfc_ctl &= ~DPFC_CTL_EN ; -I915_WRITE (DPFC_CONTROL , dpfc_ctl); +intel_de_write (dev_priv,DPFC_CONTROL , dpfc_ctl); } }static bool g4x_fbc_is_active (struct drm_i915_private *dev_priv) { -return I915_READ (DPFC_CONTROL ) &DPFC_CTL_EN ; +return intel_de_read (dev_priv,DPFC_CONTROL ) &DPFC_CTL_EN ; }/* This function forces a CFB recompression through the nuke operation. */
@@ -205,8 +207,8 @@ static void intel_fbc_recompress(struct drm_i915_private *dev_priv)trace_intel_fbc_nuke (fbc->crtc); -I915_WRITE (MSG_FBC_REND_STATE ,FBC_REND_NUKE ); -POSTING_READ (MSG_FBC_REND_STATE ); +intel_de_write (dev_priv,MSG_FBC_REND_STATE ,FBC_REND_NUKE ); +intel_de_posting_read (dev_priv,MSG_FBC_REND_STATE ); }static void ilk_fbc_activate (struct drm_i915_private *dev_priv)
@@ -237,22 +239,22 @@ static void ilk_fbc_activate(struct drm_i915_private *dev_priv)if (IS_GEN (dev_priv,5 )) dpfc_ctl |= params->fence_id;if (IS_GEN (dev_priv,6 )) { -I915_WRITE (SNB_DPFC_CTL_SA , -SNB_CPU_FENCE_ENABLE | - params->fence_id); -I915_WRITE (DPFC_CPU_FENCE_OFFSET , - params->crtc.fence_y_offset); +intel_de_write (dev_priv,SNB_DPFC_CTL_SA , +SNB_CPU_FENCE_ENABLE | params->fence_id); +intel_de_write (dev_priv,DPFC_CPU_FENCE_OFFSET , + params->crtc.fence_y_offset); } }else {if (IS_GEN (dev_priv,6 )) { -I915_WRITE (SNB_DPFC_CTL_SA ,0 ); -I915_WRITE (DPFC_CPU_FENCE_OFFSET ,0 ); +intel_de_write (dev_priv,SNB_DPFC_CTL_SA ,0 ); +intel_de_write (dev_priv,DPFC_CPU_FENCE_OFFSET ,0 ); } } -I915_WRITE (ILK_DPFC_FENCE_YOFF , params->crtc.fence_y_offset); +intel_de_write (dev_priv,ILK_DPFC_FENCE_YOFF , + params->crtc.fence_y_offset);/* enable it... */ -I915_WRITE (ILK_DPFC_CONTROL , dpfc_ctl |DPFC_CTL_EN ); +intel_de_write (dev_priv,ILK_DPFC_CONTROL , dpfc_ctl |DPFC_CTL_EN );intel_fbc_recompress (dev_priv); }
@@ -262,16 +264,16 @@ static void ilk_fbc_deactivate(struct drm_i915_private *dev_priv)u32 dpfc_ctl;/* Disable compression */ - dpfc_ctl =I915_READ (ILK_DPFC_CONTROL ); + dpfc_ctl =intel_de_read (dev_priv,ILK_DPFC_CONTROL );if (dpfc_ctl &DPFC_CTL_EN ) { dpfc_ctl &= ~DPFC_CTL_EN ; -I915_WRITE (ILK_DPFC_CONTROL , dpfc_ctl); +intel_de_write (dev_priv,ILK_DPFC_CONTROL , dpfc_ctl); } }static bool ilk_fbc_is_active (struct drm_i915_private *dev_priv) { -return I915_READ (ILK_DPFC_CONTROL ) &DPFC_CTL_EN ; +return intel_de_read (dev_priv,ILK_DPFC_CONTROL ) &DPFC_CTL_EN ; }static void gen7_fbc_activate (struct drm_i915_private *dev_priv)
@@ -282,14 +284,14 @@ static void gen7_fbc_activate(struct drm_i915_private *dev_priv)/* Display WA #0529: skl, kbl, bxt. */ if (IS_GEN9_BC (dev_priv) ||IS_BROXTON (dev_priv)) { -u32 val =I915_READ (CHICKEN_MISC_4 ); +u32 val =intel_de_read (dev_priv,CHICKEN_MISC_4 ); val &= ~(FBC_STRIDE_OVERRIDE |FBC_STRIDE_MASK );if (params->gen9_wa_cfb_stride) val |=FBC_STRIDE_OVERRIDE | params->gen9_wa_cfb_stride; -I915_WRITE (CHICKEN_MISC_4 , val); +intel_de_write (dev_priv,CHICKEN_MISC_4 , val); } dpfc_ctl =0 ;
@@ -314,13 +316,13 @@ static void gen7_fbc_activate(struct drm_i915_private *dev_priv)if (params->fence_id >=0 ) { dpfc_ctl |=IVB_DPFC_CTL_FENCE_EN ; -I915_WRITE (SNB_DPFC_CTL_SA , -SNB_CPU_FENCE_ENABLE | - params->fence_id); -I915_WRITE (DPFC_CPU_FENCE_OFFSET , params->crtc.fence_y_offset); +intel_de_write (dev_priv,SNB_DPFC_CTL_SA , +SNB_CPU_FENCE_ENABLE | params->fence_id); +intel_de_write (dev_priv,DPFC_CPU_FENCE_OFFSET , + params->crtc.fence_y_offset); }else { -I915_WRITE (SNB_DPFC_CTL_SA ,0 ); -I915_WRITE (DPFC_CPU_FENCE_OFFSET ,0 ); +intel_de_write (dev_priv,SNB_DPFC_CTL_SA ,0 ); +intel_de_write (dev_priv,DPFC_CPU_FENCE_OFFSET ,0 ); }if (dev_priv->fbc.false_color)
@@ -328,21 +330,20 @@ static void gen7_fbc_activate(struct drm_i915_private *dev_priv)if (IS_IVYBRIDGE (dev_priv)) {/* WaFbcAsynchFlipDisableFbcQueue:ivb */ -I915_WRITE (ILK_DISPLAY_CHICKEN1 , -I915_READ (ILK_DISPLAY_CHICKEN1 ) | -ILK_FBCQ_DIS ); +intel_de_write (dev_priv,ILK_DISPLAY_CHICKEN1 , +intel_de_read (dev_priv,ILK_DISPLAY_CHICKEN1 ) |ILK_FBCQ_DIS ); }else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) {/* WaFbcAsynchFlipDisableFbcQueue:hsw,bdw */ -I915_WRITE (CHICKEN_PIPESL_1 (params->crtc.pipe), -I915_READ (CHICKEN_PIPESL_1 (params->crtc.pipe)) | -HSW_FBCQ_DIS ); +intel_de_write (dev_priv,CHICKEN_PIPESL_1 (params->crtc.pipe), +intel_de_read (dev_priv,CHICKEN_PIPESL_1 (params->crtc.pipe)) |HSW_FBCQ_DIS ); }if (INTEL_GEN (dev_priv) >=11 )/* Wa_1409120013:icl,ehl,tgl */ -I915_WRITE (ILK_DPFC_CHICKEN ,ILK_DPFC_CHICKEN_COMP_DUMMY_PIXEL ); +intel_de_write (dev_priv,ILK_DPFC_CHICKEN , +ILK_DPFC_CHICKEN_COMP_DUMMY_PIXEL ); -I915_WRITE (ILK_DPFC_CONTROL , dpfc_ctl |DPFC_CTL_EN ); +intel_de_write (dev_priv,ILK_DPFC_CONTROL , dpfc_ctl |DPFC_CTL_EN );intel_fbc_recompress (dev_priv); }
@@ -489,9 +490,11 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv, fbc->threshold = ret;if (INTEL_GEN (dev_priv) >=5 ) -I915_WRITE (ILK_DPFC_CB_BASE , fbc->compressed_fb.start); +intel_de_write (dev_priv,ILK_DPFC_CB_BASE , + fbc->compressed_fb.start);else if (IS_GM45 (dev_priv)) { -I915_WRITE (DPFC_CB_BASE , fbc->compressed_fb.start); +intel_de_write (dev_priv,DPFC_CB_BASE , + fbc->compressed_fb.start); }else { compressed_llb =kzalloc (sizeof (*compressed_llb),GFP_KERNEL );if (!compressed_llb)
@@ -510,10 +513,10 @@ static int intel_fbc_alloc_cfb(struct drm_i915_private *dev_priv,GEM_BUG_ON (range_overflows_t (u64, dev_priv->dsm.start, fbc->compressed_llb->start,U32_MAX )); -I915_WRITE (FBC_CFB_BASE , - dev_priv->dsm.start + fbc->compressed_fb.start); -I915_WRITE (FBC_LL_BASE , - dev_priv->dsm.start + compressed_llb->start); +intel_de_write (dev_priv,FBC_CFB_BASE , + dev_priv->dsm.start + fbc->compressed_fb.start); +intel_de_write (dev_priv,FBC_LL_BASE , + dev_priv->dsm.start + compressed_llb->start); } DRM_DEBUG_KMS("reserved %llu bytes of contiguous stolen space for FBC, threshold: %d\n",
@@ -1364,7 +1367,8 @@ void intel_fbc_init(struct drm_i915_private *dev_priv)/* This value was pulled out of someone's hat */ if (INTEL_GEN (dev_priv) <=4 && !IS_GM45 (dev_priv)) -I915_WRITE (FBC_CONTROL ,500 <<FBC_CTL_INTERVAL_SHIFT ); +intel_de_write (dev_priv,FBC_CONTROL , +500 <<FBC_CTL_INTERVAL_SHIFT );/* We still don't have any sort of hardware state readout for FBC, so * deactivate it in case the BIOS activated it to make sure software
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 17/33 drm/i915/fifo_underrun: 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_fifo_underrun.c | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/display/intel_fifo_underrun.c +20 -17
@@ -95,12 +95,12 @@ static void i9xx_check_fifo_underruns(struct intel_crtc *crtc)lockdep_assert_held (&dev_priv->irq_lock); -if ((I915_READ (reg) &PIPE_FIFO_UNDERRUN_STATUS ) ==0 ) +if ((intel_de_read (dev_priv, reg) &PIPE_FIFO_UNDERRUN_STATUS ) ==0 )return ; enable_mask =i915_pipestat_enable_mask (dev_priv, crtc->pipe); -I915_WRITE (reg, enable_mask |PIPE_FIFO_UNDERRUN_STATUS ); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, enable_mask |PIPE_FIFO_UNDERRUN_STATUS ); +intel_de_posting_read (dev_priv, reg);trace_intel_cpu_fifo_underrun (dev_priv, crtc->pipe);DRM_ERROR ("pipe %c underrun\n" ,pipe_name (crtc->pipe));
@@ -118,10 +118,11 @@ static void i9xx_set_fifo_underrun_reporting(struct drm_device *dev,if (enable) {u32 enable_mask =i915_pipestat_enable_mask (dev_priv, pipe); -I915_WRITE (reg, enable_mask |PIPE_FIFO_UNDERRUN_STATUS ); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, + enable_mask |PIPE_FIFO_UNDERRUN_STATUS ); +intel_de_posting_read (dev_priv, reg); }else { -if (old &&I915_READ (reg) &PIPE_FIFO_UNDERRUN_STATUS ) +if (old &&intel_de_read (dev_priv, reg) &PIPE_FIFO_UNDERRUN_STATUS )DRM_ERROR ("pipe %c underrun\n" ,pipe_name (pipe)); } }
@@ -143,15 +144,15 @@ static void ivb_check_fifo_underruns(struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -u32 err_int =I915_READ (GEN7_ERR_INT ); +u32 err_int =intel_de_read (dev_priv,GEN7_ERR_INT );lockdep_assert_held (&dev_priv->irq_lock);if ((err_int &ERR_INT_FIFO_UNDERRUN (pipe)) ==0 )return ; -I915_WRITE (GEN7_ERR_INT ,ERR_INT_FIFO_UNDERRUN (pipe)); -POSTING_READ (GEN7_ERR_INT ); +intel_de_write (dev_priv,GEN7_ERR_INT ,ERR_INT_FIFO_UNDERRUN (pipe)); +intel_de_posting_read (dev_priv,GEN7_ERR_INT );trace_intel_cpu_fifo_underrun (dev_priv, pipe);DRM_ERROR ("fifo underrun on pipe %c\n" ,pipe_name (pipe));
@@ -163,7 +164,8 @@ static void ivb_set_fifo_underrun_reporting(struct drm_device *dev, {struct drm_i915_private *dev_priv =to_i915 (dev);if (enable) { -I915_WRITE (GEN7_ERR_INT ,ERR_INT_FIFO_UNDERRUN (pipe)); +intel_de_write (dev_priv,GEN7_ERR_INT , +ERR_INT_FIFO_UNDERRUN (pipe));if (!ivb_can_enable_err_int (dev))return ;
@@ -173,7 +175,7 @@ static void ivb_set_fifo_underrun_reporting(struct drm_device *dev,ilk_disable_display_irq (dev_priv,DE_ERR_INT_IVB );if (old && -I915_READ (GEN7_ERR_INT ) &ERR_INT_FIFO_UNDERRUN (pipe)) { +intel_de_read (dev_priv,GEN7_ERR_INT ) &ERR_INT_FIFO_UNDERRUN (pipe)) {DRM_ERROR ("uncleared fifo underrun on pipe %c\n" ,pipe_name (pipe)); }
@@ -209,15 +211,16 @@ static void cpt_check_pch_fifo_underruns(struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pch_transcoder = crtc->pipe; -u32 serr_int =I915_READ (SERR_INT ); +u32 serr_int =intel_de_read (dev_priv,SERR_INT );lockdep_assert_held (&dev_priv->irq_lock);if ((serr_int &SERR_INT_TRANS_FIFO_UNDERRUN (pch_transcoder)) ==0 )return ; -I915_WRITE (SERR_INT ,SERR_INT_TRANS_FIFO_UNDERRUN (pch_transcoder)); -POSTING_READ (SERR_INT ); +intel_de_write (dev_priv,SERR_INT , +SERR_INT_TRANS_FIFO_UNDERRUN (pch_transcoder)); +intel_de_posting_read (dev_priv,SERR_INT );trace_intel_pch_fifo_underrun (dev_priv, pch_transcoder); DRM_ERROR("pch fifo underrun on pch transcoder %c\n",
@@ -231,8 +234,8 @@ static void cpt_set_fifo_underrun_reporting(struct drm_device *dev,struct drm_i915_private *dev_priv =to_i915 (dev);if (enable) { -I915_WRITE (SERR_INT , -SERR_INT_TRANS_FIFO_UNDERRUN (pch_transcoder)); +intel_de_write (dev_priv,SERR_INT , +SERR_INT_TRANS_FIFO_UNDERRUN (pch_transcoder));if (!cpt_can_enable_serr_int (dev))return ;
@@ -241,7 +244,7 @@ static void cpt_set_fifo_underrun_reporting(struct drm_device *dev, }else {ibx_disable_display_interrupt (dev_priv,SDE_ERROR_CPT ); -if (old &&I915_READ (SERR_INT ) & +if (old &&intel_de_read (dev_priv,SERR_INT ) &SERR_INT_TRANS_FIFO_UNDERRUN (pch_transcoder)) {DRM_ERROR ("uncleared pch fifo underrun on pch transcoder %c\n" ,pipe_name (pch_transcoder));
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 18/33 drm/i915/gmbus: 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_gmbus.c | 74 ++++++++++------------ 1 file changed, 35 insertions(+), 39 deletions(-)
drivers/gpu/drm/i915/display/intel_gmbus.c +35 -39
@@ -143,8 +143,8 @@ to_intel_gmbus(struct i2c_adapter *i2c)void intel_gmbus_reset (struct drm_i915_private *dev_priv) { -I915_WRITE (GMBUS0 ,0 ); -I915_WRITE (GMBUS4 ,0 ); +intel_de_write (dev_priv,GMBUS0 ,0 ); +intel_de_write (dev_priv,GMBUS4 ,0 ); } static void pnv_gmbus_clock_gating(struct drm_i915_private *dev_priv,
@@ -153,12 +153,12 @@ static void pnv_gmbus_clock_gating(struct drm_i915_private *dev_priv,u32 val;/* When using bit bashing for I2C, this bit needs to be set to 1 */ - val =I915_READ (DSPCLK_GATE_D ); + val =intel_de_read (dev_priv,DSPCLK_GATE_D );if (!enable) val |=PNV_GMBUSUNIT_CLOCK_GATE_DISABLE ;else val &= ~PNV_GMBUSUNIT_CLOCK_GATE_DISABLE ; -I915_WRITE (DSPCLK_GATE_D , val); +intel_de_write (dev_priv,DSPCLK_GATE_D , val); } static void pch_gmbus_clock_gating(struct drm_i915_private *dev_priv,
@@ -166,12 +166,12 @@ static void pch_gmbus_clock_gating(struct drm_i915_private *dev_priv, {u32 val; - val =I915_READ (SOUTH_DSPCLK_GATE_D ); + val =intel_de_read (dev_priv,SOUTH_DSPCLK_GATE_D );if (!enable) val |=PCH_GMBUSUNIT_CLOCK_GATE_DISABLE ;else val &= ~PCH_GMBUSUNIT_CLOCK_GATE_DISABLE ; -I915_WRITE (SOUTH_DSPCLK_GATE_D , val); +intel_de_write (dev_priv,SOUTH_DSPCLK_GATE_D , val); } static void bxt_gmbus_clock_gating(struct drm_i915_private *dev_priv,
@@ -179,12 +179,12 @@ static void bxt_gmbus_clock_gating(struct drm_i915_private *dev_priv, {u32 val; - val =I915_READ (GEN9_CLKGATE_DIS_4 ); + val =intel_de_read (dev_priv,GEN9_CLKGATE_DIS_4 );if (!enable) val |=BXT_GMBUS_GATING_DIS ;else val &= ~BXT_GMBUS_GATING_DIS ; -I915_WRITE (GEN9_CLKGATE_DIS_4 , val); +intel_de_write (dev_priv,GEN9_CLKGATE_DIS_4 , val); }static u32 get_reserved (struct intel_gmbus *bus)
@@ -337,14 +337,16 @@ static int gmbus_wait(struct drm_i915_private *dev_priv, u32 status, u32 irq_en) irq_en =0 ;add_wait_queue (&dev_priv->gmbus_wait_queue, &wait); -I915_WRITE_FW (GMBUS4 , irq_en); +intel_de_write_fw (dev_priv,GMBUS4 , irq_en); status |=GMBUS_SATOER ; - ret =wait_for_us ((gmbus2 =I915_READ_FW (GMBUS2 )) & status,2 ); + ret =wait_for_us ((gmbus2 =intel_de_read_fw (dev_priv,GMBUS2 )) & status, +2 );if (ret) - ret =wait_for ((gmbus2 =I915_READ_FW (GMBUS2 )) & status,50 ); + ret =wait_for ((gmbus2 =intel_de_read_fw (dev_priv,GMBUS2 )) & status, +50 ); -I915_WRITE_FW (GMBUS4 ,0 ); +intel_de_write_fw (dev_priv,GMBUS4 ,0 );remove_wait_queue (&dev_priv->gmbus_wait_queue, &wait);if (gmbus2 &GMBUS_SATOER )
@@ -366,13 +368,13 @@ gmbus_wait_idle(struct drm_i915_private *dev_priv) irq_enable =GMBUS_IDLE_EN ;add_wait_queue (&dev_priv->gmbus_wait_queue, &wait); -I915_WRITE_FW (GMBUS4 , irq_enable); +intel_de_write_fw (dev_priv,GMBUS4 , irq_enable); ret =intel_wait_for_register_fw (&dev_priv->uncore,GMBUS2 ,GMBUS_ACTIVE ,0 ,10 ); -I915_WRITE_FW (GMBUS4 ,0 ); +intel_de_write_fw (dev_priv,GMBUS4 ,0 );remove_wait_queue (&dev_priv->gmbus_wait_queue, &wait);return ret;
@@ -404,15 +406,12 @@ gmbus_xfer_read_chunk(struct drm_i915_private *dev_priv, len++; } size = len %256 +256 ; -I915_WRITE_FW (GMBUS0 , gmbus0_reg |GMBUS_BYTE_CNT_OVERRIDE ); +intel_de_write_fw (dev_priv,GMBUS0 , + gmbus0_reg |GMBUS_BYTE_CNT_OVERRIDE ); } -I915_WRITE_FW (GMBUS1 , - gmbus1_index | -GMBUS_CYCLE_WAIT | - (size <<GMBUS_BYTE_COUNT_SHIFT ) | - (addr <<GMBUS_SLAVE_ADDR_SHIFT ) | -GMBUS_SLAVE_READ |GMBUS_SW_RDY ); +intel_de_write_fw (dev_priv,GMBUS1 , + gmbus1_index |GMBUS_CYCLE_WAIT | (size <<GMBUS_BYTE_COUNT_SHIFT ) | (addr <<GMBUS_SLAVE_ADDR_SHIFT ) |GMBUS_SLAVE_READ |GMBUS_SW_RDY );while (len) {int ret;u32 val, loop =0 ;
@@ -421,7 +420,7 @@ gmbus_xfer_read_chunk(struct drm_i915_private *dev_priv,if (ret)return ret; - val =I915_READ_FW (GMBUS3 ); + val =intel_de_read_fw (dev_priv,GMBUS3 ); do { if (extra_byte_added && len == 1) break;
@@ -432,7 +431,7 @@ gmbus_xfer_read_chunk(struct drm_i915_private *dev_priv,if (burst_read && len == size -4 )/* Reset the override bit */ -I915_WRITE_FW (GMBUS0 , gmbus0_reg); +intel_de_write_fw (dev_priv,GMBUS0 , gmbus0_reg); }return 0 ;
@@ -489,12 +488,9 @@ gmbus_xfer_write_chunk(struct drm_i915_private *dev_priv, len -=1 ; } -I915_WRITE_FW (GMBUS3 , val); -I915_WRITE_FW (GMBUS1 , - gmbus1_index |GMBUS_CYCLE_WAIT | - (chunk_size <<GMBUS_BYTE_COUNT_SHIFT ) | - (addr <<GMBUS_SLAVE_ADDR_SHIFT ) | -GMBUS_SLAVE_WRITE |GMBUS_SW_RDY ); +intel_de_write_fw (dev_priv,GMBUS3 , val); +intel_de_write_fw (dev_priv,GMBUS1 , + gmbus1_index |GMBUS_CYCLE_WAIT | (chunk_size <<GMBUS_BYTE_COUNT_SHIFT ) | (addr <<GMBUS_SLAVE_ADDR_SHIFT ) |GMBUS_SLAVE_WRITE |GMBUS_SW_RDY );while (len) {int ret;
@@ -503,7 +499,7 @@ gmbus_xfer_write_chunk(struct drm_i915_private *dev_priv, val |= *buf++ << (8 * loop); }while (--len && ++loop <4 ); -I915_WRITE_FW (GMBUS3 , val); +intel_de_write_fw (dev_priv,GMBUS3 , val); ret =gmbus_wait (dev_priv,GMBUS_HW_RDY ,GMBUS_HW_RDY_EN );if (ret)
@@ -568,7 +564,7 @@ gmbus_index_xfer(struct drm_i915_private *dev_priv, struct i2c_msg *msgs,/* GMBUS5 holds 16-bit index */ if (gmbus5) -I915_WRITE_FW (GMBUS5 , gmbus5); +intel_de_write_fw (dev_priv,GMBUS5 , gmbus5);if (msgs[1 ].flags &I2C_M_RD ) ret = gmbus_xfer_read(dev_priv, &msgs[1], gmbus0_reg,
@@ -578,7 +574,7 @@ gmbus_index_xfer(struct drm_i915_private *dev_priv, struct i2c_msg *msgs,/* Clear GMBUS5 after each index transfer */ if (gmbus5) -I915_WRITE_FW (GMBUS5 ,0 ); +intel_de_write_fw (dev_priv,GMBUS5 ,0 );return ret; }
@@ -601,7 +597,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,pch_gmbus_clock_gating (dev_priv, false); retry: -I915_WRITE_FW (GMBUS0 , gmbus0_source | bus->reg0); +intel_de_write_fw (dev_priv,GMBUS0 , gmbus0_source | bus->reg0);for (; i < num; i += inc) { inc =1 ;
@@ -629,7 +625,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,* a STOP on the very first cycle. To simplify the code we * unconditionally generate the STOP condition with an additional gmbus * cycle. */ -I915_WRITE_FW (GMBUS1 ,GMBUS_CYCLE_STOP |GMBUS_SW_RDY ); +intel_de_write_fw (dev_priv,GMBUS1 ,GMBUS_CYCLE_STOP |GMBUS_SW_RDY );/* Mark the GMBUS interface as disabled after waiting for idle. * We will re-enable it at the start of the next xfer,
@@ -640,7 +636,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num, adapter->name); ret = -ETIMEDOUT ; } -I915_WRITE_FW (GMBUS0 ,0 ); +intel_de_write_fw (dev_priv,GMBUS0 ,0 ); ret = ret ?: i; goto out;
@@ -669,9 +665,9 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num,* of resetting the GMBUS controller and so clearing the * BUS_ERROR raised by the slave's NAK. */ -I915_WRITE_FW (GMBUS1 ,GMBUS_SW_CLR_INT ); -I915_WRITE_FW (GMBUS1 ,0 ); -I915_WRITE_FW (GMBUS0 ,0 ); +intel_de_write_fw (dev_priv,GMBUS1 ,GMBUS_SW_CLR_INT ); +intel_de_write_fw (dev_priv,GMBUS1 ,0 ); +intel_de_write_fw (dev_priv,GMBUS0 ,0 ); DRM_DEBUG_KMS("GMBUS [%s] NAK for addr: %04x %c(%d)\n", adapter->name, msgs[i].addr,
@@ -694,7 +690,7 @@ do_gmbus_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, int num, timeout:DRM_DEBUG_KMS ("GMBUS [%s] timed out, falling back to bit banging on pin %d\n" , bus->adapter.name, bus->reg0 &0xff ); -I915_WRITE_FW (GMBUS0 ,0 ); +intel_de_write_fw (dev_priv,GMBUS0 ,0 );/* * Hardware may not support GMBUS over these pins? Try GPIO bitbanging
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 19/33 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 ;/*
@@ -222,7 +224,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) */
@@ -235,7 +237,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 ; }
@@ -243,7 +245,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_ERROR ("Timed out waiting for SHA1 ready\n" );return -ETIMEDOUT ;
@@ -309,7 +311,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); }/*
@@ -326,7 +328,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 ];
@@ -343,7 +345,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;
@@ -375,7 +378,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 )
@@ -383,14 +387,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;
@@ -398,7 +404,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 ;
@@ -408,14 +415,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;
@@ -423,7 +432,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 )
@@ -431,7 +441,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 )
@@ -440,7 +451,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 )
@@ -448,21 +460,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;
@@ -473,7 +488,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 );
@@ -493,13 +508,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 ; }
@@ -631,10 +647,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,
@@ -644,8 +661,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;
@@ -663,26 +682,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 ;
@@ -710,19 +730,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 ; }
@@ -760,7 +780,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 )) {
@@ -850,8 +870,7 @@ static int intel_hdcp_check_link(struct intel_connector *connector)if (WARN_ON (!intel_hdcp_in_use (dev_priv, cpu_transcoder, port))) {DRM_ERROR ("%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);
@@ -1527,7 +1546,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);
@@ -1538,13 +1557,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,
@@ -1565,12 +1583,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,
@@ -1688,8 +1705,7 @@ static int intel_hdcp2_check_link(struct intel_connector *connector)if (WARN_ON (!intel_hdcp2_in_use (dev_priv, cpu_transcoder, port))) {DRM_ERROR ("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
RFC 20/33 drm/i915/hdmi: 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_hdmi.c | 258 +++++++++++----------- 1 file changed, 133 insertions(+), 125 deletions(-)
drivers/gpu/drm/i915/display/intel_hdmi.c +133 -125
@@ -72,7 +72,7 @@ assert_hdmi_port_disabled(struct intel_hdmi *intel_hdmi) enabled_bits =HAS_DDI (dev_priv) ?DDI_BUF_CTL_ENABLE :SDVO_ENABLE ; -WARN (I915_READ (intel_hdmi->hdmi_reg) & enabled_bits, +WARN (intel_de_read (dev_priv, intel_hdmi->hdmi_reg) & enabled_bits,"HDMI port enabled, expecting disabled\n" ); }
@@ -80,7 +80,7 @@ static void assert_hdmi_transcoder_func_disabled(struct drm_i915_private *dev_priv, enum transcoder cpu_transcoder) { - WARN(I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder)) & + WARN(intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder)) & TRANS_DDI_FUNC_ENABLE, "HDMI transcoder function enabled, expecting disabled\n"); }
@@ -215,7 +215,7 @@ static void g4x_write_infoframe(struct intel_encoder *encoder, {const u32 *data = frame;struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -u32 val =I915_READ (VIDEO_DIP_CTL ); +u32 val =intel_de_read (dev_priv,VIDEO_DIP_CTL );int i;WARN (!(val &VIDEO_DIP_ENABLE ),"Writing DIP with CTL reg disabled\n" );
@@ -225,22 +225,22 @@ static void g4x_write_infoframe(struct intel_encoder *encoder, val &= ~g4x_infoframe_enable (type); -I915_WRITE (VIDEO_DIP_CTL , val); +intel_de_write (dev_priv,VIDEO_DIP_CTL , val);for (i =0 ; i < len; i +=4 ) { -I915_WRITE (VIDEO_DIP_DATA , *data); +intel_de_write (dev_priv,VIDEO_DIP_DATA , *data); data++; }/* Write every possible data byte to force correct ECC calculation. */ for (; i <VIDEO_DIP_DATA_SIZE ; i +=4 ) -I915_WRITE (VIDEO_DIP_DATA ,0 ); +intel_de_write (dev_priv,VIDEO_DIP_DATA ,0 ); val |=g4x_infoframe_enable (type); val &= ~VIDEO_DIP_FREQ_MASK ; val |=VIDEO_DIP_FREQ_VSYNC ; -I915_WRITE (VIDEO_DIP_CTL , val); -POSTING_READ (VIDEO_DIP_CTL ); +intel_de_write (dev_priv,VIDEO_DIP_CTL , val); +intel_de_posting_read (dev_priv,VIDEO_DIP_CTL ); } static void g4x_read_infoframe(struct intel_encoder *encoder,
@@ -252,22 +252,22 @@ static void g4x_read_infoframe(struct intel_encoder *encoder,u32 val, *data = frame;int i; - val =I915_READ (VIDEO_DIP_CTL ); + val =intel_de_read (dev_priv,VIDEO_DIP_CTL ); val &= ~(VIDEO_DIP_SELECT_MASK |0xf );/* clear DIP data offset */ val |=g4x_infoframe_index (type); -I915_WRITE (VIDEO_DIP_CTL , val); +intel_de_write (dev_priv,VIDEO_DIP_CTL , val);for (i =0 ; i < len; i +=4 ) - *data++ =I915_READ (VIDEO_DIP_DATA ); + *data++ =intel_de_read (dev_priv,VIDEO_DIP_DATA ); }static u32 g4x_infoframes_enabled (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -u32 val =I915_READ (VIDEO_DIP_CTL ); +u32 val =intel_de_read (dev_priv,VIDEO_DIP_CTL );if ((val &VIDEO_DIP_ENABLE ) ==0 )return 0 ;
@@ -288,7 +288,7 @@ static void ibx_write_infoframe(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);i915_reg_t reg =TVIDEO_DIP_CTL (intel_crtc->pipe); -u32 val =I915_READ (reg); +u32 val =intel_de_read (dev_priv, reg);int i;WARN (!(val &VIDEO_DIP_ENABLE ),"Writing DIP with CTL reg disabled\n" );
@@ -298,22 +298,23 @@ static void ibx_write_infoframe(struct intel_encoder *encoder, val &= ~g4x_infoframe_enable (type); -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val);for (i =0 ; i < len; i +=4 ) { -I915_WRITE (TVIDEO_DIP_DATA (intel_crtc->pipe), *data); +intel_de_write (dev_priv,TVIDEO_DIP_DATA (intel_crtc->pipe), + *data); data++; }/* Write every possible data byte to force correct ECC calculation. */ for (; i <VIDEO_DIP_DATA_SIZE ; i +=4 ) -I915_WRITE (TVIDEO_DIP_DATA (intel_crtc->pipe),0 ); +intel_de_write (dev_priv,TVIDEO_DIP_DATA (intel_crtc->pipe),0 ); val |=g4x_infoframe_enable (type); val &= ~VIDEO_DIP_FREQ_MASK ; val |=VIDEO_DIP_FREQ_VSYNC ; -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg); } static void ibx_read_infoframe(struct intel_encoder *encoder,
@@ -326,15 +327,15 @@ static void ibx_read_infoframe(struct intel_encoder *encoder,u32 val, *data = frame;int i; - val =I915_READ (TVIDEO_DIP_CTL (crtc->pipe)); + val =intel_de_read (dev_priv,TVIDEO_DIP_CTL (crtc->pipe)); val &= ~(VIDEO_DIP_SELECT_MASK |0xf );/* clear DIP data offset */ val |=g4x_infoframe_index (type); -I915_WRITE (TVIDEO_DIP_CTL (crtc->pipe), val); +intel_de_write (dev_priv,TVIDEO_DIP_CTL (crtc->pipe), val);for (i =0 ; i < len; i +=4 ) - *data++ =I915_READ (TVIDEO_DIP_DATA (crtc->pipe)); + *data++ =intel_de_read (dev_priv,TVIDEO_DIP_DATA (crtc->pipe)); } static u32 ibx_infoframes_enabled(struct intel_encoder *encoder,
@@ -343,7 +344,7 @@ static u32 ibx_infoframes_enabled(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum pipe pipe =to_intel_crtc (pipe_config->uapi.crtc)->pipe;i915_reg_t reg =TVIDEO_DIP_CTL (pipe); -u32 val =I915_READ (reg); +u32 val =intel_de_read (dev_priv, reg);if ((val &VIDEO_DIP_ENABLE ) ==0 )return 0 ;
@@ -365,7 +366,7 @@ static void cpt_write_infoframe(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);i915_reg_t reg =TVIDEO_DIP_CTL (intel_crtc->pipe); -u32 val =I915_READ (reg); +u32 val =intel_de_read (dev_priv, reg);int i;WARN (!(val &VIDEO_DIP_ENABLE ),"Writing DIP with CTL reg disabled\n" );
@@ -378,22 +379,23 @@ static void cpt_write_infoframe(struct intel_encoder *encoder,if (type !=HDMI_INFOFRAME_TYPE_AVI ) val &= ~g4x_infoframe_enable (type); -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val);for (i =0 ; i < len; i +=4 ) { -I915_WRITE (TVIDEO_DIP_DATA (intel_crtc->pipe), *data); +intel_de_write (dev_priv,TVIDEO_DIP_DATA (intel_crtc->pipe), + *data); data++; }/* Write every possible data byte to force correct ECC calculation. */ for (; i <VIDEO_DIP_DATA_SIZE ; i +=4 ) -I915_WRITE (TVIDEO_DIP_DATA (intel_crtc->pipe),0 ); +intel_de_write (dev_priv,TVIDEO_DIP_DATA (intel_crtc->pipe),0 ); val |=g4x_infoframe_enable (type); val &= ~VIDEO_DIP_FREQ_MASK ; val |=VIDEO_DIP_FREQ_VSYNC ; -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg); } static void cpt_read_infoframe(struct intel_encoder *encoder,
@@ -406,15 +408,15 @@ static void cpt_read_infoframe(struct intel_encoder *encoder,u32 val, *data = frame;int i; - val =I915_READ (TVIDEO_DIP_CTL (crtc->pipe)); + val =intel_de_read (dev_priv,TVIDEO_DIP_CTL (crtc->pipe)); val &= ~(VIDEO_DIP_SELECT_MASK |0xf );/* clear DIP data offset */ val |=g4x_infoframe_index (type); -I915_WRITE (TVIDEO_DIP_CTL (crtc->pipe), val); +intel_de_write (dev_priv,TVIDEO_DIP_CTL (crtc->pipe), val);for (i =0 ; i < len; i +=4 ) - *data++ =I915_READ (TVIDEO_DIP_DATA (crtc->pipe)); + *data++ =intel_de_read (dev_priv,TVIDEO_DIP_DATA (crtc->pipe)); } static u32 cpt_infoframes_enabled(struct intel_encoder *encoder,
@@ -422,7 +424,7 @@ static u32 cpt_infoframes_enabled(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum pipe pipe =to_intel_crtc (pipe_config->uapi.crtc)->pipe; -u32 val =I915_READ (TVIDEO_DIP_CTL (pipe)); +u32 val =intel_de_read (dev_priv,TVIDEO_DIP_CTL (pipe));if ((val &VIDEO_DIP_ENABLE ) ==0 )return 0 ;
@@ -441,7 +443,7 @@ static void vlv_write_infoframe(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);i915_reg_t reg =VLV_TVIDEO_DIP_CTL (intel_crtc->pipe); -u32 val =I915_READ (reg); +u32 val =intel_de_read (dev_priv, reg);int i;WARN (!(val &VIDEO_DIP_ENABLE ),"Writing DIP with CTL reg disabled\n" );
@@ -451,22 +453,24 @@ static void vlv_write_infoframe(struct intel_encoder *encoder, val &= ~g4x_infoframe_enable (type); -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val);for (i =0 ; i < len; i +=4 ) { -I915_WRITE (VLV_TVIDEO_DIP_DATA (intel_crtc->pipe), *data); +intel_de_write (dev_priv, +VLV_TVIDEO_DIP_DATA (intel_crtc->pipe), *data); data++; }/* Write every possible data byte to force correct ECC calculation. */ for (; i <VIDEO_DIP_DATA_SIZE ; i +=4 ) -I915_WRITE (VLV_TVIDEO_DIP_DATA (intel_crtc->pipe),0 ); +intel_de_write (dev_priv, +VLV_TVIDEO_DIP_DATA (intel_crtc->pipe),0 ); val |=g4x_infoframe_enable (type); val &= ~VIDEO_DIP_FREQ_MASK ; val |=VIDEO_DIP_FREQ_VSYNC ; -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg); } static void vlv_read_infoframe(struct intel_encoder *encoder,
@@ -479,15 +483,16 @@ static void vlv_read_infoframe(struct intel_encoder *encoder,u32 val, *data = frame;int i; - val =I915_READ (VLV_TVIDEO_DIP_CTL (crtc->pipe)); + val =intel_de_read (dev_priv,VLV_TVIDEO_DIP_CTL (crtc->pipe)); val &= ~(VIDEO_DIP_SELECT_MASK |0xf );/* clear DIP data offset */ val |=g4x_infoframe_index (type); -I915_WRITE (VLV_TVIDEO_DIP_CTL (crtc->pipe), val); +intel_de_write (dev_priv,VLV_TVIDEO_DIP_CTL (crtc->pipe), val);for (i =0 ; i < len; i +=4 ) - *data++ =I915_READ (VLV_TVIDEO_DIP_DATA (crtc->pipe)); + *data++ =intel_de_read (dev_priv, +VLV_TVIDEO_DIP_DATA (crtc->pipe)); } static u32 vlv_infoframes_enabled(struct intel_encoder *encoder,
@@ -495,7 +500,7 @@ static u32 vlv_infoframes_enabled(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum pipe pipe =to_intel_crtc (pipe_config->uapi.crtc)->pipe; -u32 val =I915_READ (VLV_TVIDEO_DIP_CTL (pipe)); +u32 val =intel_de_read (dev_priv,VLV_TVIDEO_DIP_CTL (pipe));if ((val &VIDEO_DIP_ENABLE ) ==0 )return 0 ;
@@ -519,28 +524,30 @@ static void hsw_write_infoframe(struct intel_encoder *encoder,i915_reg_t ctl_reg =HSW_TVIDEO_DIP_CTL (cpu_transcoder);int data_size;int i; -u32 val =I915_READ (ctl_reg); +u32 val =intel_de_read (dev_priv, ctl_reg); data_size =hsw_dip_data_size (dev_priv, type);WARN_ON (len > data_size); val &= ~hsw_infoframe_enable (type); -I915_WRITE (ctl_reg, val); +intel_de_write (dev_priv, ctl_reg, val);for (i =0 ; i < len; i +=4 ) { -I915_WRITE (hsw_dip_data_reg (dev_priv, cpu_transcoder, - type, i >>2 ), *data); +intel_de_write (dev_priv, +hsw_dip_data_reg (dev_priv, cpu_transcoder, type, i >>2 ), + *data); data++; }/* Write every possible data byte to force correct ECC calculation. */ for (; i < data_size; i +=4 ) -I915_WRITE (hsw_dip_data_reg (dev_priv, cpu_transcoder, - type, i >>2 ),0 ); +intel_de_write (dev_priv, +hsw_dip_data_reg (dev_priv, cpu_transcoder, type, i >>2 ), +0 ); val |=hsw_infoframe_enable (type); -I915_WRITE (ctl_reg, val); -POSTING_READ (ctl_reg); +intel_de_write (dev_priv, ctl_reg, val); +intel_de_posting_read (dev_priv, ctl_reg); } static void hsw_read_infoframe(struct intel_encoder *encoder,
@@ -553,18 +560,19 @@ static void hsw_read_infoframe(struct intel_encoder *encoder,u32 val, *data = frame;int i; - val =I915_READ (HSW_TVIDEO_DIP_CTL (cpu_transcoder)); + val =intel_de_read (dev_priv,HSW_TVIDEO_DIP_CTL (cpu_transcoder));for (i =0 ; i < len; i +=4 ) - *data++ =I915_READ (hsw_dip_data_reg (dev_priv, cpu_transcoder, - type, i >>2 )); + *data++ =intel_de_read (dev_priv, +hsw_dip_data_reg (dev_priv, cpu_transcoder, type, i >>2 )); }static u32 hsw_infoframes_enabled (struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -u32 val =I915_READ (HSW_TVIDEO_DIP_CTL (pipe_config->cpu_transcoder)); +u32 val =intel_de_read (dev_priv, +HSW_TVIDEO_DIP_CTL (pipe_config->cpu_transcoder));u32 mask; mask = (VIDEO_DIP_ENABLE_VSC_HSW | VIDEO_DIP_ENABLE_AVI_HSW |
@@ -859,7 +867,7 @@ static void g4x_set_infoframes(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;i915_reg_t reg =VIDEO_DIP_CTL ; -u32 val =I915_READ (reg); +u32 val =intel_de_read (dev_priv, reg);u32 port =VIDEO_DIP_PORT (encoder->port);assert_hdmi_port_disabled (intel_hdmi);
@@ -885,8 +893,8 @@ static void g4x_set_infoframes(struct intel_encoder *encoder, } val &= ~(VIDEO_DIP_ENABLE |VIDEO_DIP_ENABLE_AVI |VIDEO_DIP_ENABLE_VENDOR |VIDEO_DIP_ENABLE_SPD ); -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg);return ; }
@@ -904,8 +912,8 @@ static void g4x_set_infoframes(struct intel_encoder *encoder, val &= ~(VIDEO_DIP_ENABLE_AVI |VIDEO_DIP_ENABLE_VENDOR |VIDEO_DIP_ENABLE_SPD ); -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg); intel_write_infoframe(encoder, crtc_state, HDMI_INFOFRAME_TYPE_AVI,
@@ -982,7 +990,7 @@ static bool intel_hdmi_set_gcp_infoframe(struct intel_encoder *encoder,else return false; -I915_WRITE (reg, crtc_state->infoframes.gcp); +intel_de_write (dev_priv, reg, crtc_state->infoframes.gcp);return true; }
@@ -1007,7 +1015,7 @@ void intel_hdmi_read_gcp_infoframe(struct intel_encoder *encoder,else return ; - crtc_state->infoframes.gcp =I915_READ (reg); + crtc_state->infoframes.gcp =intel_de_read (dev_priv, reg); } static void intel_hdmi_compute_gcp_infoframe(struct intel_encoder *encoder,
@@ -1042,7 +1050,7 @@ static void ibx_set_infoframes(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder);struct intel_hdmi *intel_hdmi = &intel_dig_port->hdmi;i915_reg_t reg =TVIDEO_DIP_CTL (intel_crtc->pipe); -u32 val =I915_READ (reg); +u32 val =intel_de_read (dev_priv, reg);u32 port =VIDEO_DIP_PORT (encoder->port);assert_hdmi_port_disabled (intel_hdmi);
@@ -1056,8 +1064,8 @@ static void ibx_set_infoframes(struct intel_encoder *encoder, val &= ~(VIDEO_DIP_ENABLE |VIDEO_DIP_ENABLE_AVI |VIDEO_DIP_ENABLE_VENDOR |VIDEO_DIP_ENABLE_GAMUT |VIDEO_DIP_ENABLE_SPD |VIDEO_DIP_ENABLE_GCP ); -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg);return ; }
@@ -1077,8 +1085,8 @@ static void ibx_set_infoframes(struct intel_encoder *encoder,if (intel_hdmi_set_gcp_infoframe (encoder, crtc_state, conn_state)) val |=VIDEO_DIP_ENABLE_GCP ; -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg); intel_write_infoframe(encoder, crtc_state, HDMI_INFOFRAME_TYPE_AVI,
@@ -1100,7 +1108,7 @@ static void cpt_set_infoframes(struct intel_encoder *encoder,struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);i915_reg_t reg =TVIDEO_DIP_CTL (intel_crtc->pipe); -u32 val =I915_READ (reg); +u32 val =intel_de_read (dev_priv, reg);assert_hdmi_port_disabled (intel_hdmi);
@@ -1113,8 +1121,8 @@ static void cpt_set_infoframes(struct intel_encoder *encoder, val &= ~(VIDEO_DIP_ENABLE |VIDEO_DIP_ENABLE_AVI |VIDEO_DIP_ENABLE_VENDOR |VIDEO_DIP_ENABLE_GAMUT |VIDEO_DIP_ENABLE_SPD |VIDEO_DIP_ENABLE_GCP ); -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg);return ; }
@@ -1126,8 +1134,8 @@ static void cpt_set_infoframes(struct intel_encoder *encoder,if (intel_hdmi_set_gcp_infoframe (encoder, crtc_state, conn_state)) val |=VIDEO_DIP_ENABLE_GCP ; -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg); intel_write_infoframe(encoder, crtc_state, HDMI_INFOFRAME_TYPE_AVI,
@@ -1149,7 +1157,7 @@ static void vlv_set_infoframes(struct intel_encoder *encoder,struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->uapi.crtc);struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);i915_reg_t reg =VLV_TVIDEO_DIP_CTL (intel_crtc->pipe); -u32 val =I915_READ (reg); +u32 val =intel_de_read (dev_priv, reg);u32 port =VIDEO_DIP_PORT (encoder->port);assert_hdmi_port_disabled (intel_hdmi);
@@ -1163,8 +1171,8 @@ static void vlv_set_infoframes(struct intel_encoder *encoder, val &= ~(VIDEO_DIP_ENABLE |VIDEO_DIP_ENABLE_AVI |VIDEO_DIP_ENABLE_VENDOR |VIDEO_DIP_ENABLE_GAMUT |VIDEO_DIP_ENABLE_SPD |VIDEO_DIP_ENABLE_GCP ); -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg);return ; }
@@ -1184,8 +1192,8 @@ static void vlv_set_infoframes(struct intel_encoder *encoder,if (intel_hdmi_set_gcp_infoframe (encoder, crtc_state, conn_state)) val |=VIDEO_DIP_ENABLE_GCP ; -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg); intel_write_infoframe(encoder, crtc_state, HDMI_INFOFRAME_TYPE_AVI,
@@ -1205,7 +1213,7 @@ static void hsw_set_infoframes(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);i915_reg_t reg =HSW_TVIDEO_DIP_CTL (crtc_state->cpu_transcoder); -u32 val =I915_READ (reg); +u32 val =intel_de_read (dev_priv, reg);assert_hdmi_transcoder_func_disabled (dev_priv, crtc_state->cpu_transcoder);
@@ -1216,16 +1224,16 @@ static void hsw_set_infoframes(struct intel_encoder *encoder, VIDEO_DIP_ENABLE_DRM_GLK);if (!enable) { -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg);return ; }if (intel_hdmi_set_gcp_infoframe (encoder, crtc_state, conn_state)) val |=VIDEO_DIP_ENABLE_GCP_HSW ; -I915_WRITE (reg, val); -POSTING_READ (reg); +intel_de_write (dev_priv, reg, val); +intel_de_posting_read (dev_priv, reg); intel_write_infoframe(encoder, crtc_state, HDMI_INFOFRAME_TYPE_AVI,
@@ -1455,7 +1463,7 @@ static int kbl_repositioning_enc_en_signal(struct intel_connector *connector)int ret;for (;;) { - scanline =I915_READ (PIPEDSL (intel_crtc->pipe)); + scanline =intel_de_read (dev_priv,PIPEDSL (intel_crtc->pipe));if (scanline >100 && scanline <200 )break ;usleep_range (25 ,50 );
@@ -1523,14 +1531,14 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)if (ret)return false; -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)) & +if (wait_for (intel_de_read (dev_priv,HDCP_STATUS (dev_priv, cpu_transcoder, port)) & (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 )) {DRM_ERROR ("Ri' mismatch detected, link check failed (%x)\n" , -I915_READ (HDCP_STATUS (dev_priv, cpu_transcoder, - port))); +intel_de_read (dev_priv,HDCP_STATUS (dev_priv, cpu_transcoder, port)));return false; }return true;
@@ -1767,8 +1775,8 @@ static void intel_hdmi_prepare(struct intel_encoder *encoder,else hdmi_val |=SDVO_PIPE_SEL (crtc->pipe); -I915_WRITE (intel_hdmi->hdmi_reg, hdmi_val); -POSTING_READ (intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, hdmi_val); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg); } static bool intel_hdmi_get_hw_state(struct intel_encoder *encoder,
@@ -1802,7 +1810,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder, pipe_config->output_types |=BIT (INTEL_OUTPUT_HDMI ); - tmp =I915_READ (intel_hdmi->hdmi_reg); + tmp =intel_de_read (dev_priv, intel_hdmi->hdmi_reg);if (tmp &SDVO_HSYNC_ACTIVE_HIGH ) flags |=DRM_MODE_FLAG_PHSYNC ;
@@ -1878,14 +1886,14 @@ static void g4x_enable_hdmi(struct intel_encoder *encoder,struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);u32 temp; - temp =I915_READ (intel_hdmi->hdmi_reg); + temp =intel_de_read (dev_priv, intel_hdmi->hdmi_reg); temp |=SDVO_ENABLE ;if (pipe_config->has_audio) temp |=HDMI_AUDIO_ENABLE ; -I915_WRITE (intel_hdmi->hdmi_reg, temp); -POSTING_READ (intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, temp); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg);if (pipe_config->has_audio)intel_enable_hdmi_audio (encoder, pipe_config, conn_state);
@@ -1900,7 +1908,7 @@ static void ibx_enable_hdmi(struct intel_encoder *encoder,struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);u32 temp; - temp =I915_READ (intel_hdmi->hdmi_reg); + temp =intel_de_read (dev_priv, intel_hdmi->hdmi_reg); temp |=SDVO_ENABLE ;if (pipe_config->has_audio)
@@ -1910,10 +1918,10 @@ static void ibx_enable_hdmi(struct intel_encoder *encoder,* HW workaround, need to write this twice for issue * that may result in first write getting masked. */ -I915_WRITE (intel_hdmi->hdmi_reg, temp); -POSTING_READ (intel_hdmi->hdmi_reg); -I915_WRITE (intel_hdmi->hdmi_reg, temp); -POSTING_READ (intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, temp); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, temp); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg);/* * HW workaround, need to toggle enable bit off and on
@@ -1924,17 +1932,18 @@ static void ibx_enable_hdmi(struct intel_encoder *encoder,*/ if (pipe_config->pipe_bpp >24 && pipe_config->pixel_multiplier >1 ) { -I915_WRITE (intel_hdmi->hdmi_reg, temp & ~SDVO_ENABLE ); -POSTING_READ (intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, + temp & ~SDVO_ENABLE ); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg);/* * HW workaround, need to write this twice for issue * that may result in first write getting masked. */ -I915_WRITE (intel_hdmi->hdmi_reg, temp); -POSTING_READ (intel_hdmi->hdmi_reg); -I915_WRITE (intel_hdmi->hdmi_reg, temp); -POSTING_READ (intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, temp); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, temp); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg); }if (pipe_config->has_audio)
@@ -1952,7 +1961,7 @@ static void cpt_enable_hdmi(struct intel_encoder *encoder,enum pipe pipe = crtc->pipe;u32 temp; - temp =I915_READ (intel_hdmi->hdmi_reg); + temp =intel_de_read (dev_priv, intel_hdmi->hdmi_reg); temp |=SDVO_ENABLE ;if (pipe_config->has_audio)
@@ -1969,27 +1978,25 @@ static void cpt_enable_hdmi(struct intel_encoder *encoder,*/ if (pipe_config->pipe_bpp >24 ) { -I915_WRITE (TRANS_CHICKEN1 (pipe), -I915_READ (TRANS_CHICKEN1 (pipe)) | -TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE ); +intel_de_write (dev_priv,TRANS_CHICKEN1 (pipe), +intel_de_read (dev_priv,TRANS_CHICKEN1 (pipe)) |TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE ); temp &= ~SDVO_COLOR_FORMAT_MASK ; temp |= SDVO_COLOR_FORMAT_8bpc; } -I915_WRITE (intel_hdmi->hdmi_reg, temp); -POSTING_READ (intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, temp); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg);if (pipe_config->pipe_bpp >24 ) { temp &= ~SDVO_COLOR_FORMAT_MASK ; temp |= HDMI_COLOR_FORMAT_12bpc; -I915_WRITE (intel_hdmi->hdmi_reg, temp); -POSTING_READ (intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, temp); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg); -I915_WRITE (TRANS_CHICKEN1 (pipe), -I915_READ (TRANS_CHICKEN1 (pipe)) & - ~TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE ); +intel_de_write (dev_priv,TRANS_CHICKEN1 (pipe), +intel_de_read (dev_priv,TRANS_CHICKEN1 (pipe)) & ~TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE ); }if (pipe_config->has_audio)
@@ -2014,11 +2021,11 @@ static void intel_disable_hdmi(struct intel_encoder *encoder,struct intel_crtc *crtc =to_intel_crtc (old_crtc_state->uapi.crtc);u32 temp; - temp =I915_READ (intel_hdmi->hdmi_reg); + temp =intel_de_read (dev_priv, intel_hdmi->hdmi_reg); temp &= ~(SDVO_ENABLE |HDMI_AUDIO_ENABLE ); -I915_WRITE (intel_hdmi->hdmi_reg, temp); -POSTING_READ (intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, temp); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg);/* * HW workaround for IBX, we need to move the port
@@ -2039,14 +2046,14 @@ static void intel_disable_hdmi(struct intel_encoder *encoder,* HW workaround, need to write this twice for issue * that may result in first write getting masked. */ -I915_WRITE (intel_hdmi->hdmi_reg, temp); -POSTING_READ (intel_hdmi->hdmi_reg); -I915_WRITE (intel_hdmi->hdmi_reg, temp); -POSTING_READ (intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, temp); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, temp); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg); temp &= ~SDVO_ENABLE ; -I915_WRITE (intel_hdmi->hdmi_reg, temp); -POSTING_READ (intel_hdmi->hdmi_reg); +intel_de_write (dev_priv, intel_hdmi->hdmi_reg, temp); +intel_de_posting_read (dev_priv, intel_hdmi->hdmi_reg);intel_wait_for_vblank_if_active (dev_priv,PIPE_A );intel_set_cpu_fifo_underrun_reporting (dev_priv,PIPE_A , true);
@@ -3190,8 +3197,9 @@ void intel_hdmi_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 ); }cec_fill_conn_info_from_drm (&conn_info, connector);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 21/33 drm/i915/lpe_audio: 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_lpe_audio.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/display/intel_lpe_audio.c +8 -6
@@ -71,6 +71,7 @@#include <drm/intel_lpe_audio.h> #include "i915_drv.h" +#include "intel_de.h" #include "intel_lpe_audio.h" #define HAS_LPE_AUDIO (dev_priv) ((dev_priv)->lpe_audio.platdev != NULL)
@@ -230,7 +231,8 @@ static int lpe_audio_setup(struct drm_i915_private *dev_priv)/* enable chicken bit; at least this is required for Dell Wyse 3040 * with DP outputs (but only sometimes by some reason!) */ -I915_WRITE (VLV_AUD_CHICKEN_BIT_REG ,VLV_CHICKEN_BIT_DBG_ENABLE ); +intel_de_write (dev_priv,VLV_AUD_CHICKEN_BIT_REG , +VLV_CHICKEN_BIT_DBG_ENABLE );return 0 ; err_free_irq:
@@ -334,7 +336,7 @@ void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,spin_lock_irqsave (&pdata->lpe_audio_slock, irqflags); - audio_enable =I915_READ (VLV_AUD_PORT_EN_DBG (port)); + audio_enable =intel_de_read (dev_priv,VLV_AUD_PORT_EN_DBG (port));if (eld !=NULL ) {memcpy (ppdata->eld, eld,HDMI_MAX_ELD_BYTES );
@@ -343,8 +345,8 @@ void intel_lpe_audio_notify(struct drm_i915_private *dev_priv, ppdata->dp_output = dp_output;/* Unmute the amp for both DP and HDMI */ -I915_WRITE (VLV_AUD_PORT_EN_DBG (port), - audio_enable & ~VLV_AMP_MUTE ); +intel_de_write (dev_priv,VLV_AUD_PORT_EN_DBG (port), + audio_enable & ~VLV_AMP_MUTE ); }else {memset (ppdata->eld,0 ,HDMI_MAX_ELD_BYTES ); ppdata->pipe =-1 ;
@@ -352,8 +354,8 @@ void intel_lpe_audio_notify(struct drm_i915_private *dev_priv, ppdata->dp_output = false;/* Mute the amp for both DP and HDMI */ -I915_WRITE (VLV_AUD_PORT_EN_DBG (port), - audio_enable |VLV_AMP_MUTE ); +intel_de_write (dev_priv,VLV_AUD_PORT_EN_DBG (port), + audio_enable |VLV_AMP_MUTE ); }if (pdata->notify_audio_lpe)
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 22/33 drm/i915/lvds: 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_lvds.c | 57 +++++++++++------------ 1 file changed, 28 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/display/intel_lvds.c +28 -29
@@ -85,7 +85,7 @@ bool intel_lvds_port_enabled(struct drm_i915_private *dev_priv, {u32 val; - val =I915_READ (lvds_reg); + val =intel_de_read (dev_priv, lvds_reg);/* asserts want to know the pipe even if the port is disabled */ if (HAS_PCH_CPT (dev_priv))
@@ -125,7 +125,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder, pipe_config->output_types |=BIT (INTEL_OUTPUT_LVDS ); - tmp =I915_READ (lvds_encoder->reg); + tmp =intel_de_read (dev_priv, lvds_encoder->reg);if (tmp &LVDS_HSYNC_POLARITY ) flags |=DRM_MODE_FLAG_NHSYNC ;else
@@ -143,7 +143,7 @@ static void intel_lvds_get_config(struct intel_encoder *encoder,/* gen2/3 store dither state in pfit control, needs to match */ if (INTEL_GEN (dev_priv) <4 ) { - tmp =I915_READ (PFIT_CONTROL ); + tmp =intel_de_read (dev_priv,PFIT_CONTROL ); pipe_config->gmch_pfit.control |= tmp &PANEL_8TO6_DITHER_ENABLE ; }
@@ -156,18 +156,18 @@ static void intel_lvds_pps_get_hw_state(struct drm_i915_private *dev_priv, {u32 val; - pps->powerdown_on_reset =I915_READ (PP_CONTROL (0 )) &PANEL_POWER_RESET ; + pps->powerdown_on_reset =intel_de_read (dev_priv,PP_CONTROL (0 )) &PANEL_POWER_RESET ; - val =I915_READ (PP_ON_DELAYS (0 )); + val =intel_de_read (dev_priv,PP_ON_DELAYS (0 )); pps->port =REG_FIELD_GET (PANEL_PORT_SELECT_MASK , val); pps->t1_t2 =REG_FIELD_GET (PANEL_POWER_UP_DELAY_MASK , val); pps->t5 =REG_FIELD_GET (PANEL_LIGHT_ON_DELAY_MASK , val); - val =I915_READ (PP_OFF_DELAYS (0 )); + val =intel_de_read (dev_priv,PP_OFF_DELAYS (0 )); pps->t3 =REG_FIELD_GET (PANEL_POWER_DOWN_DELAY_MASK , val); pps->tx =REG_FIELD_GET (PANEL_LIGHT_OFF_DELAY_MASK , val); - val =I915_READ (PP_DIVISOR (0 )); + val =intel_de_read (dev_priv,PP_DIVISOR (0 )); pps->divider =REG_FIELD_GET (PP_REFERENCE_DIVIDER_MASK , val); val =REG_FIELD_GET (PANEL_POWER_CYCLE_DELAY_MASK , val);/*
@@ -203,25 +203,20 @@ static void intel_lvds_pps_init_hw(struct drm_i915_private *dev_priv, {u32 val; - val =I915_READ (PP_CONTROL (0 )); + val =intel_de_read (dev_priv,PP_CONTROL (0 ));WARN_ON ((val &PANEL_UNLOCK_MASK ) !=PANEL_UNLOCK_REGS );if (pps->powerdown_on_reset) val |=PANEL_POWER_RESET ; -I915_WRITE (PP_CONTROL (0 ), val); +intel_de_write (dev_priv,PP_CONTROL (0 ), val); -I915_WRITE (PP_ON_DELAYS (0 ), -REG_FIELD_PREP (PANEL_PORT_SELECT_MASK , pps->port) | -REG_FIELD_PREP (PANEL_POWER_UP_DELAY_MASK , pps->t1_t2) | -REG_FIELD_PREP (PANEL_LIGHT_ON_DELAY_MASK , pps->t5)); +intel_de_write (dev_priv,PP_ON_DELAYS (0 ), +REG_FIELD_PREP (PANEL_PORT_SELECT_MASK , pps->port) |REG_FIELD_PREP (PANEL_POWER_UP_DELAY_MASK , pps->t1_t2) |REG_FIELD_PREP (PANEL_LIGHT_ON_DELAY_MASK , pps->t5)); -I915_WRITE (PP_OFF_DELAYS (0 ), -REG_FIELD_PREP (PANEL_POWER_DOWN_DELAY_MASK , pps->t3) | -REG_FIELD_PREP (PANEL_LIGHT_OFF_DELAY_MASK , pps->tx)); +intel_de_write (dev_priv,PP_OFF_DELAYS (0 ), +REG_FIELD_PREP (PANEL_POWER_DOWN_DELAY_MASK , pps->t3) |REG_FIELD_PREP (PANEL_LIGHT_OFF_DELAY_MASK , pps->tx)); -I915_WRITE (PP_DIVISOR (0 ), -REG_FIELD_PREP (PP_REFERENCE_DIVIDER_MASK , pps->divider) | -REG_FIELD_PREP (PANEL_POWER_CYCLE_DELAY_MASK , -DIV_ROUND_UP (pps->t4,1000 ) +1 )); +intel_de_write (dev_priv,PP_DIVISOR (0 ), +REG_FIELD_PREP (PP_REFERENCE_DIVIDER_MASK , pps->divider) |REG_FIELD_PREP (PANEL_POWER_CYCLE_DELAY_MASK ,DIV_ROUND_UP (pps->t4,1000 ) +1 )); } static void intel_pre_enable_lvds(struct intel_encoder *encoder,
@@ -299,7 +294,7 @@ static void intel_pre_enable_lvds(struct intel_encoder *encoder,if (adjusted_mode->flags &DRM_MODE_FLAG_NVSYNC ) temp |=LVDS_VSYNC_POLARITY ; -I915_WRITE (lvds_encoder->reg, temp); +intel_de_write (dev_priv, lvds_encoder->reg, temp); }/*
@@ -313,10 +308,12 @@ static void intel_enable_lvds(struct intel_encoder *encoder,struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (dev); -I915_WRITE (lvds_encoder->reg,I915_READ (lvds_encoder->reg) |LVDS_PORT_EN ); +intel_de_write (dev_priv, lvds_encoder->reg, +intel_de_read (dev_priv, lvds_encoder->reg) |LVDS_PORT_EN ); -I915_WRITE (PP_CONTROL (0 ),I915_READ (PP_CONTROL (0 )) |PANEL_POWER_ON ); -POSTING_READ (lvds_encoder->reg); +intel_de_write (dev_priv,PP_CONTROL (0 ), +intel_de_read (dev_priv,PP_CONTROL (0 )) |PANEL_POWER_ON ); +intel_de_posting_read (dev_priv, lvds_encoder->reg);if (intel_de_wait_for_set (dev_priv,PP_STATUS (0 ),PP_ON ,5000 ))DRM_ERROR ("timed out waiting for panel to power on\n" );
@@ -331,12 +328,14 @@ static void intel_disable_lvds(struct intel_encoder *encoder,struct intel_lvds_encoder *lvds_encoder =to_lvds_encoder (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -I915_WRITE (PP_CONTROL (0 ),I915_READ (PP_CONTROL (0 )) & ~PANEL_POWER_ON ); +intel_de_write (dev_priv,PP_CONTROL (0 ), +intel_de_read (dev_priv,PP_CONTROL (0 )) & ~PANEL_POWER_ON );if (intel_de_wait_for_clear (dev_priv,PP_STATUS (0 ),PP_ON ,1000 ))DRM_ERROR ("timed out waiting for panel to power off\n" ); -I915_WRITE (lvds_encoder->reg,I915_READ (lvds_encoder->reg) & ~LVDS_PORT_EN ); -POSTING_READ (lvds_encoder->reg); +intel_de_write (dev_priv, lvds_encoder->reg, +intel_de_read (dev_priv, lvds_encoder->reg) & ~LVDS_PORT_EN ); +intel_de_posting_read (dev_priv, lvds_encoder->reg); } static void gmch_disable_lvds(struct intel_encoder *encoder,
@@ -791,7 +790,7 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)* we need to check "the value to be set" in VBT when LVDS * register is uninitialized. */ - val =I915_READ (lvds_encoder->reg); + val =intel_de_read (dev_priv, lvds_encoder->reg);if (HAS_PCH_CPT (dev_priv)) val &= ~(LVDS_DETECTED |LVDS_PIPE_SEL_MASK_CPT );else
@@ -842,7 +841,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)else lvds_reg =LVDS ; - lvds =I915_READ (lvds_reg); + lvds =intel_de_read (dev_priv, lvds_reg);if (HAS_PCH_SPLIT (dev_priv)) {if ((lvds &LVDS_DETECTED ) ==0 )
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 23/33 drm/i915/overlay: 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_overlay.c | 45 ++++++++++---------- 1 file changed, 23 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/display/intel_overlay.c +23 -22
@@ -204,9 +204,10 @@ static void i830_overlay_clock_gating(struct drm_i915_private *dev_priv,/* WA_OVERLAY_CLKGATE:alm */ if (enable) -I915_WRITE (DSPCLK_GATE_D ,0 ); +intel_de_write (dev_priv,DSPCLK_GATE_D ,0 );else -I915_WRITE (DSPCLK_GATE_D ,OVRUNIT_CLOCK_GATE_DISABLE ); +intel_de_write (dev_priv,DSPCLK_GATE_D , +OVRUNIT_CLOCK_GATE_DISABLE );/* WA_DISABLE_L2CACHE_CLOCK_GATING:alm */ pci_bus_read_config_byte(pdev->bus,
@@ -321,7 +322,7 @@ static int intel_overlay_continue(struct intel_overlay *overlay, flip_addr |=OFC_UPDATE ;/* check for underruns */ - tmp =I915_READ (DOVSTA ); + tmp =intel_de_read (dev_priv,DOVSTA );if (tmp & (1 <<17 ))DRM_DEBUG ("overlay underrun, DOVSTA: %x\n" , tmp);
@@ -456,7 +457,7 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay)if (!overlay->old_vma)return 0 ; -if (!(I915_READ (GEN2_ISR ) &I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT )) { +if (!(intel_de_read (dev_priv,GEN2_ISR ) &I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT )) {intel_overlay_release_old_vid_tail (overlay);return 0 ; }
@@ -891,7 +892,7 @@ static int check_overlay_possible_on_crtc(struct intel_overlay *overlay,static void update_pfit_vscale_ratio (struct intel_overlay *overlay) {struct drm_i915_private *dev_priv = overlay->i915; -u32 pfit_control =I915_READ (PFIT_CONTROL ); +u32 pfit_control =intel_de_read (dev_priv,PFIT_CONTROL );u32 ratio;/* XXX: This is not the same logic as in the xorg driver, but more in
@@ -899,12 +900,12 @@ static void update_pfit_vscale_ratio(struct intel_overlay *overlay)*/ if (INTEL_GEN (dev_priv) >=4 ) {/* on i965 use the PGM reg to read out the autoscaler values */ - ratio =I915_READ (PFIT_PGM_RATIOS ) >>PFIT_VERT_SCALE_SHIFT_965 ; + ratio =intel_de_read (dev_priv,PFIT_PGM_RATIOS ) >>PFIT_VERT_SCALE_SHIFT_965 ; }else {if (pfit_control &VERT_AUTO_SCALE ) - ratio =I915_READ (PFIT_AUTO_RATIOS ); + ratio =intel_de_read (dev_priv,PFIT_AUTO_RATIOS );else - ratio =I915_READ (PFIT_PGM_RATIOS ); + ratio =intel_de_read (dev_priv,PFIT_PGM_RATIOS ); ratio >>=PFIT_VERT_SCALE_SHIFT ; }
@@ -1239,12 +1240,12 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data, attrs->saturation = overlay->saturation;if (!IS_GEN (dev_priv,2 )) { - attrs->gamma0 =I915_READ (OGAMC0 ); - attrs->gamma1 =I915_READ (OGAMC1 ); - attrs->gamma2 =I915_READ (OGAMC2 ); - attrs->gamma3 =I915_READ (OGAMC3 ); - attrs->gamma4 =I915_READ (OGAMC4 ); - attrs->gamma5 =I915_READ (OGAMC5 ); + attrs->gamma0 =intel_de_read (dev_priv,OGAMC0 ); + attrs->gamma1 =intel_de_read (dev_priv,OGAMC1 ); + attrs->gamma2 =intel_de_read (dev_priv,OGAMC2 ); + attrs->gamma3 =intel_de_read (dev_priv,OGAMC3 ); + attrs->gamma4 =intel_de_read (dev_priv,OGAMC4 ); + attrs->gamma5 =intel_de_read (dev_priv,OGAMC5 ); } }else {if (attrs->brightness <-128 || attrs->brightness >127 )
@@ -1274,12 +1275,12 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, void *data,if (ret) goto out_unlock; -I915_WRITE (OGAMC0 , attrs->gamma0); -I915_WRITE (OGAMC1 , attrs->gamma1); -I915_WRITE (OGAMC2 , attrs->gamma2); -I915_WRITE (OGAMC3 , attrs->gamma3); -I915_WRITE (OGAMC4 , attrs->gamma4); -I915_WRITE (OGAMC5 , attrs->gamma5); +intel_de_write (dev_priv,OGAMC0 , attrs->gamma0); +intel_de_write (dev_priv,OGAMC1 , attrs->gamma1); +intel_de_write (dev_priv,OGAMC2 , attrs->gamma2); +intel_de_write (dev_priv,OGAMC3 , attrs->gamma3); +intel_de_write (dev_priv,OGAMC4 , attrs->gamma4); +intel_de_write (dev_priv,OGAMC5 , attrs->gamma5); } } overlay->color_key_enabled = (attrs->flags &I915_OVERLAY_DISABLE_DEST_COLORKEY ) ==0 ;
@@ -1419,8 +1420,8 @@ intel_overlay_capture_error_state(struct drm_i915_private *dev_priv)if (error ==NULL )return NULL ; - error->dovsta =I915_READ (DOVSTA ); - error->isr =I915_READ (GEN2_ISR ); + error->dovsta =intel_de_read (dev_priv,DOVSTA ); + error->isr =intel_de_read (dev_priv,GEN2_ISR ); error->base = overlay->flip_addr;memcpy_fromio (&error->regs, overlay->regs,sizeof (error->regs));
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 24/33 drm/i915/panel: 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_panel.c | 255 +++++++++++---------- 1 file changed, 140 insertions(+), 115 deletions(-)
drivers/gpu/drm/i915/display/intel_panel.c +140 -115
@@ -537,14 +537,14 @@ static u32 lpt_get_backlight(struct intel_connector *connector) {struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); -return I915_READ (BLC_PWM_PCH_CTL2 ) &BACKLIGHT_DUTY_CYCLE_MASK ; +return intel_de_read (dev_priv,BLC_PWM_PCH_CTL2 ) &BACKLIGHT_DUTY_CYCLE_MASK ; }static u32 pch_get_backlight (struct intel_connector *connector) {struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); -return I915_READ (BLC_PWM_CPU_CTL ) &BACKLIGHT_DUTY_CYCLE_MASK ; +return intel_de_read (dev_priv,BLC_PWM_CPU_CTL ) &BACKLIGHT_DUTY_CYCLE_MASK ; }static u32 i9xx_get_backlight (struct intel_connector *connector)
@@ -553,7 +553,7 @@ static u32 i9xx_get_backlight(struct intel_connector *connector)struct intel_panel *panel = &connector->panel;u32 val; - val =I915_READ (BLC_PWM_CTL ) &BACKLIGHT_DUTY_CYCLE_MASK ; + val =intel_de_read (dev_priv,BLC_PWM_CTL ) &BACKLIGHT_DUTY_CYCLE_MASK ;if (INTEL_GEN (dev_priv) <4 ) val >>=1 ;
@@ -572,7 +572,7 @@ static u32 _vlv_get_backlight(struct drm_i915_private *dev_priv, enum pipe pipe)if (WARN_ON (pipe !=PIPE_A && pipe !=PIPE_B ))return 0 ; -return I915_READ (VLV_BLC_PWM_CTL (pipe)) &BACKLIGHT_DUTY_CYCLE_MASK ; +return intel_de_read (dev_priv,VLV_BLC_PWM_CTL (pipe)) &BACKLIGHT_DUTY_CYCLE_MASK ; }static u32 vlv_get_backlight (struct intel_connector *connector)
@@ -588,7 +588,8 @@ static u32 bxt_get_backlight(struct intel_connector *connector)struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -return I915_READ (BXT_BLC_PWM_DUTY (panel->backlight.controller)); +return intel_de_read (dev_priv, +BXT_BLC_PWM_DUTY (panel->backlight.controller)); }static u32 pwm_get_backlight (struct intel_connector *connector)
@@ -605,8 +606,8 @@ static void lpt_set_backlight(const struct drm_connector_state *conn_state, u32struct intel_connector *connector =to_intel_connector (conn_state->connector);struct drm_i915_private *dev_priv =to_i915 (connector->base.dev); -u32 val =I915_READ (BLC_PWM_PCH_CTL2 ) & ~BACKLIGHT_DUTY_CYCLE_MASK ; -I915_WRITE (BLC_PWM_PCH_CTL2 , val | level); +u32 val =intel_de_read (dev_priv,BLC_PWM_PCH_CTL2 ) & ~BACKLIGHT_DUTY_CYCLE_MASK ; +intel_de_write (dev_priv,BLC_PWM_PCH_CTL2 , val | level); }static void pch_set_backlight (const struct drm_connector_state *conn_state,u32 level)
@@ -615,8 +616,8 @@ static void pch_set_backlight(const struct drm_connector_state *conn_state, u32struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);u32 tmp; - tmp =I915_READ (BLC_PWM_CPU_CTL ) & ~BACKLIGHT_DUTY_CYCLE_MASK ; -I915_WRITE (BLC_PWM_CPU_CTL , tmp | level); + tmp =intel_de_read (dev_priv,BLC_PWM_CPU_CTL ) & ~BACKLIGHT_DUTY_CYCLE_MASK ; +intel_de_write (dev_priv,BLC_PWM_CPU_CTL , tmp | level); }static void i9xx_set_backlight (const struct drm_connector_state *conn_state,u32 level)
@@ -643,8 +644,8 @@ static void i9xx_set_backlight(const struct drm_connector_state *conn_state, u32 mask =BACKLIGHT_DUTY_CYCLE_MASK_PNV ; } - tmp =I915_READ (BLC_PWM_CTL ) & ~mask; -I915_WRITE (BLC_PWM_CTL , tmp | level); + tmp =intel_de_read (dev_priv,BLC_PWM_CTL ) & ~mask; +intel_de_write (dev_priv,BLC_PWM_CTL , tmp | level); }static void vlv_set_backlight (const struct drm_connector_state *conn_state,u32 level)
@@ -654,8 +655,8 @@ static void vlv_set_backlight(const struct drm_connector_state *conn_state, u32enum pipe pipe =to_intel_crtc (conn_state->crtc)->pipe;u32 tmp; - tmp =I915_READ (VLV_BLC_PWM_CTL (pipe)) & ~BACKLIGHT_DUTY_CYCLE_MASK ; -I915_WRITE (VLV_BLC_PWM_CTL (pipe), tmp | level); + tmp =intel_de_read (dev_priv,VLV_BLC_PWM_CTL (pipe)) & ~BACKLIGHT_DUTY_CYCLE_MASK ; +intel_de_write (dev_priv,VLV_BLC_PWM_CTL (pipe), tmp | level); }static void bxt_set_backlight (const struct drm_connector_state *conn_state,u32 level)
@@ -664,7 +665,8 @@ static void bxt_set_backlight(const struct drm_connector_state *conn_state, u32struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);struct intel_panel *panel = &connector->panel; -I915_WRITE (BXT_BLC_PWM_DUTY (panel->backlight.controller), level); +intel_de_write (dev_priv, +BXT_BLC_PWM_DUTY (panel->backlight.controller), level); }static void pwm_set_backlight (const struct drm_connector_state *conn_state,u32 level)
@@ -742,14 +744,15 @@ static void lpt_disable_backlight(const struct drm_connector_state *old_conn_sta* This needs rework if we need to add support for CPU PWM on PCH split * platforms. */ - tmp =I915_READ (BLC_PWM_CPU_CTL2 ); + tmp =intel_de_read (dev_priv,BLC_PWM_CPU_CTL2 );if (tmp &BLM_PWM_ENABLE ) {DRM_DEBUG_KMS ("cpu backlight was enabled, disabling\n" ); -I915_WRITE (BLC_PWM_CPU_CTL2 , tmp & ~BLM_PWM_ENABLE ); +intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , + tmp & ~BLM_PWM_ENABLE ); } - tmp =I915_READ (BLC_PWM_PCH_CTL1 ); -I915_WRITE (BLC_PWM_PCH_CTL1 , tmp & ~BLM_PCH_PWM_ENABLE ); + tmp =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 ); +intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , tmp & ~BLM_PCH_PWM_ENABLE ); }static void pch_disable_backlight (const struct drm_connector_state *old_conn_state)
@@ -760,11 +763,11 @@ static void pch_disable_backlight(const struct drm_connector_state *old_conn_staintel_panel_actually_set_backlight (old_conn_state,0 ); - tmp =I915_READ (BLC_PWM_CPU_CTL2 ); -I915_WRITE (BLC_PWM_CPU_CTL2 , tmp & ~BLM_PWM_ENABLE ); + tmp =intel_de_read (dev_priv,BLC_PWM_CPU_CTL2 ); +intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , tmp & ~BLM_PWM_ENABLE ); - tmp =I915_READ (BLC_PWM_PCH_CTL1 ); -I915_WRITE (BLC_PWM_PCH_CTL1 , tmp & ~BLM_PCH_PWM_ENABLE ); + tmp =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 ); +intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , tmp & ~BLM_PCH_PWM_ENABLE ); }static void i9xx_disable_backlight (const struct drm_connector_state *old_conn_state)
@@ -779,8 +782,8 @@ static void i965_disable_backlight(const struct drm_connector_state *old_conn_stintel_panel_actually_set_backlight (old_conn_state,0 ); - tmp =I915_READ (BLC_PWM_CTL2 ); -I915_WRITE (BLC_PWM_CTL2 , tmp & ~BLM_PWM_ENABLE ); + tmp =intel_de_read (dev_priv,BLC_PWM_CTL2 ); +intel_de_write (dev_priv,BLC_PWM_CTL2 , tmp & ~BLM_PWM_ENABLE ); }static void vlv_disable_backlight (const struct drm_connector_state *old_conn_state)
@@ -792,8 +795,9 @@ static void vlv_disable_backlight(const struct drm_connector_state *old_conn_staintel_panel_actually_set_backlight (old_conn_state,0 ); - tmp =I915_READ (VLV_BLC_PWM_CTL2 (pipe)); -I915_WRITE (VLV_BLC_PWM_CTL2 (pipe), tmp & ~BLM_PWM_ENABLE ); + tmp =intel_de_read (dev_priv,VLV_BLC_PWM_CTL2 (pipe)); +intel_de_write (dev_priv,VLV_BLC_PWM_CTL2 (pipe), + tmp & ~BLM_PWM_ENABLE ); }static void bxt_disable_backlight (const struct drm_connector_state *old_conn_state)
@@ -805,14 +809,15 @@ static void bxt_disable_backlight(const struct drm_connector_state *old_conn_staintel_panel_actually_set_backlight (old_conn_state,0 ); - tmp =I915_READ (BXT_BLC_PWM_CTL (panel->backlight.controller)); -I915_WRITE (BXT_BLC_PWM_CTL (panel->backlight.controller), - tmp & ~BXT_BLC_PWM_ENABLE ); + tmp =intel_de_read (dev_priv, +BXT_BLC_PWM_CTL (panel->backlight.controller)); +intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), + tmp & ~BXT_BLC_PWM_ENABLE );if (panel->backlight.controller ==1 ) { - val =I915_READ (UTIL_PIN_CTL ); + val =intel_de_read (dev_priv,UTIL_PIN_CTL ); val &= ~UTIL_PIN_ENABLE ; -I915_WRITE (UTIL_PIN_CTL , val); +intel_de_write (dev_priv,UTIL_PIN_CTL , val); } }
@@ -825,9 +830,10 @@ static void cnp_disable_backlight(const struct drm_connector_state *old_conn_staintel_panel_actually_set_backlight (old_conn_state,0 ); - tmp =I915_READ (BXT_BLC_PWM_CTL (panel->backlight.controller)); -I915_WRITE (BXT_BLC_PWM_CTL (panel->backlight.controller), - tmp & ~BXT_BLC_PWM_ENABLE ); + tmp =intel_de_read (dev_priv, +BXT_BLC_PWM_CTL (panel->backlight.controller)); +intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), + tmp & ~BXT_BLC_PWM_ENABLE ); }static void pwm_disable_backlight (const struct drm_connector_state *old_conn_state)
@@ -879,31 +885,31 @@ static void lpt_enable_backlight(const struct intel_crtc_state *crtc_state,struct intel_panel *panel = &connector->panel;u32 pch_ctl1, pch_ctl2, schicken; - pch_ctl1 =I915_READ (BLC_PWM_PCH_CTL1 ); + pch_ctl1 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 );if (pch_ctl1 &BLM_PCH_PWM_ENABLE ) {DRM_DEBUG_KMS ("pch backlight already enabled\n" ); pch_ctl1 &= ~BLM_PCH_PWM_ENABLE ; -I915_WRITE (BLC_PWM_PCH_CTL1 , pch_ctl1); +intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , pch_ctl1); }if (HAS_PCH_LPT (dev_priv)) { - schicken =I915_READ (SOUTH_CHICKEN2 ); + schicken =intel_de_read (dev_priv,SOUTH_CHICKEN2 );if (panel->backlight.alternate_pwm_increment) schicken |=LPT_PWM_GRANULARITY ;else schicken &= ~LPT_PWM_GRANULARITY ; -I915_WRITE (SOUTH_CHICKEN2 , schicken); +intel_de_write (dev_priv,SOUTH_CHICKEN2 , schicken); }else { - schicken =I915_READ (SOUTH_CHICKEN1 ); + schicken =intel_de_read (dev_priv,SOUTH_CHICKEN1 );if (panel->backlight.alternate_pwm_increment) schicken |=SPT_PWM_GRANULARITY ;else schicken &= ~SPT_PWM_GRANULARITY ; -I915_WRITE (SOUTH_CHICKEN1 , schicken); +intel_de_write (dev_priv,SOUTH_CHICKEN1 , schicken); } pch_ctl2 = panel->backlight.max <<16 ; -I915_WRITE (BLC_PWM_PCH_CTL2 , pch_ctl2); +intel_de_write (dev_priv,BLC_PWM_PCH_CTL2 , pch_ctl2); pch_ctl1 =0 ;if (panel->backlight.active_low_pwm)
@@ -913,9 +919,10 @@ static void lpt_enable_backlight(const struct intel_crtc_state *crtc_state,if (HAS_PCH_LPT (dev_priv)) pch_ctl1 |=BLM_PCH_OVERRIDE_ENABLE ; -I915_WRITE (BLC_PWM_PCH_CTL1 , pch_ctl1); -POSTING_READ (BLC_PWM_PCH_CTL1 ); -I915_WRITE (BLC_PWM_PCH_CTL1 , pch_ctl1 |BLM_PCH_PWM_ENABLE ); +intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , pch_ctl1); +intel_de_posting_read (dev_priv,BLC_PWM_PCH_CTL1 ); +intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , + pch_ctl1 |BLM_PCH_PWM_ENABLE );/* This won't stick until the above enable. */ intel_panel_actually_set_backlight (conn_state, panel->backlight.level);
@@ -930,41 +937,42 @@ static void pch_enable_backlight(const struct intel_crtc_state *crtc_state,enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;u32 cpu_ctl2, pch_ctl1, pch_ctl2; - cpu_ctl2 =I915_READ (BLC_PWM_CPU_CTL2 ); + cpu_ctl2 =intel_de_read (dev_priv,BLC_PWM_CPU_CTL2 );if (cpu_ctl2 &BLM_PWM_ENABLE ) {DRM_DEBUG_KMS ("cpu backlight already enabled\n" ); cpu_ctl2 &= ~BLM_PWM_ENABLE ; -I915_WRITE (BLC_PWM_CPU_CTL2 , cpu_ctl2); +intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , cpu_ctl2); } - pch_ctl1 =I915_READ (BLC_PWM_PCH_CTL1 ); + pch_ctl1 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 );if (pch_ctl1 &BLM_PCH_PWM_ENABLE ) {DRM_DEBUG_KMS ("pch backlight already enabled\n" ); pch_ctl1 &= ~BLM_PCH_PWM_ENABLE ; -I915_WRITE (BLC_PWM_PCH_CTL1 , pch_ctl1); +intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , pch_ctl1); }if (cpu_transcoder ==TRANSCODER_EDP ) cpu_ctl2 =BLM_TRANSCODER_EDP ;else cpu_ctl2 =BLM_PIPE (cpu_transcoder); -I915_WRITE (BLC_PWM_CPU_CTL2 , cpu_ctl2); -POSTING_READ (BLC_PWM_CPU_CTL2 ); -I915_WRITE (BLC_PWM_CPU_CTL2 , cpu_ctl2 |BLM_PWM_ENABLE ); +intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , cpu_ctl2); +intel_de_posting_read (dev_priv,BLC_PWM_CPU_CTL2 ); +intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , cpu_ctl2 |BLM_PWM_ENABLE );/* This won't stick until the above enable. */ intel_panel_actually_set_backlight (conn_state, panel->backlight.level); pch_ctl2 = panel->backlight.max <<16 ; -I915_WRITE (BLC_PWM_PCH_CTL2 , pch_ctl2); +intel_de_write (dev_priv,BLC_PWM_PCH_CTL2 , pch_ctl2); pch_ctl1 =0 ;if (panel->backlight.active_low_pwm) pch_ctl1 |=BLM_PCH_POLARITY ; -I915_WRITE (BLC_PWM_PCH_CTL1 , pch_ctl1); -POSTING_READ (BLC_PWM_PCH_CTL1 ); -I915_WRITE (BLC_PWM_PCH_CTL1 , pch_ctl1 |BLM_PCH_PWM_ENABLE ); +intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , pch_ctl1); +intel_de_posting_read (dev_priv,BLC_PWM_PCH_CTL1 ); +intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , + pch_ctl1 |BLM_PCH_PWM_ENABLE ); } static void i9xx_enable_backlight(const struct intel_crtc_state *crtc_state,
@@ -975,10 +983,10 @@ static void i9xx_enable_backlight(const struct intel_crtc_state *crtc_state,struct intel_panel *panel = &connector->panel;u32 ctl, freq; - ctl =I915_READ (BLC_PWM_CTL ); + ctl =intel_de_read (dev_priv,BLC_PWM_CTL );if (ctl &BACKLIGHT_DUTY_CYCLE_MASK_PNV ) {DRM_DEBUG_KMS ("backlight already enabled\n" ); -I915_WRITE (BLC_PWM_CTL ,0 ); +intel_de_write (dev_priv,BLC_PWM_CTL ,0 ); } freq = panel->backlight.max;
@@ -991,8 +999,8 @@ static void i9xx_enable_backlight(const struct intel_crtc_state *crtc_state,if (IS_PINEVIEW (dev_priv) && panel->backlight.active_low_pwm) ctl |=BLM_POLARITY_PNV ; -I915_WRITE (BLC_PWM_CTL , ctl); -POSTING_READ (BLC_PWM_CTL ); +intel_de_write (dev_priv,BLC_PWM_CTL , ctl); +intel_de_posting_read (dev_priv,BLC_PWM_CTL );/* XXX: combine this into above write? */ intel_panel_actually_set_backlight (conn_state, panel->backlight.level);
@@ -1003,7 +1011,7 @@ static void i9xx_enable_backlight(const struct intel_crtc_state *crtc_state,* that has backlight. */ if (IS_GEN (dev_priv,2 )) -I915_WRITE (BLC_HIST_CTL ,BLM_HISTOGRAM_ENABLE ); +intel_de_write (dev_priv,BLC_HIST_CTL ,BLM_HISTOGRAM_ENABLE ); } static void i965_enable_backlight(const struct intel_crtc_state *crtc_state,
@@ -1015,11 +1023,11 @@ static void i965_enable_backlight(const struct intel_crtc_state *crtc_state,enum pipe pipe =to_intel_crtc (conn_state->crtc)->pipe;u32 ctl, ctl2, freq; - ctl2 =I915_READ (BLC_PWM_CTL2 ); + ctl2 =intel_de_read (dev_priv,BLC_PWM_CTL2 );if (ctl2 &BLM_PWM_ENABLE ) {DRM_DEBUG_KMS ("backlight already enabled\n" ); ctl2 &= ~BLM_PWM_ENABLE ; -I915_WRITE (BLC_PWM_CTL2 , ctl2); +intel_de_write (dev_priv,BLC_PWM_CTL2 , ctl2); } freq = panel->backlight.max;
@@ -1027,16 +1035,16 @@ static void i965_enable_backlight(const struct intel_crtc_state *crtc_state, freq /=0xff ; ctl = freq <<16 ; -I915_WRITE (BLC_PWM_CTL , ctl); +intel_de_write (dev_priv,BLC_PWM_CTL , ctl); ctl2 =BLM_PIPE (pipe);if (panel->backlight.combination_mode) ctl2 |=BLM_COMBINATION_MODE ;if (panel->backlight.active_low_pwm) ctl2 |=BLM_POLARITY_I965 ; -I915_WRITE (BLC_PWM_CTL2 , ctl2); -POSTING_READ (BLC_PWM_CTL2 ); -I915_WRITE (BLC_PWM_CTL2 , ctl2 |BLM_PWM_ENABLE ); +intel_de_write (dev_priv,BLC_PWM_CTL2 , ctl2); +intel_de_posting_read (dev_priv,BLC_PWM_CTL2 ); +intel_de_write (dev_priv,BLC_PWM_CTL2 , ctl2 |BLM_PWM_ENABLE );intel_panel_actually_set_backlight (conn_state, panel->backlight.level); }
@@ -1050,15 +1058,15 @@ static void vlv_enable_backlight(const struct intel_crtc_state *crtc_state,enum pipe pipe =to_intel_crtc (crtc_state->uapi.crtc)->pipe;u32 ctl, ctl2; - ctl2 =I915_READ (VLV_BLC_PWM_CTL2 (pipe)); + ctl2 =intel_de_read (dev_priv,VLV_BLC_PWM_CTL2 (pipe));if (ctl2 &BLM_PWM_ENABLE ) {DRM_DEBUG_KMS ("backlight already enabled\n" ); ctl2 &= ~BLM_PWM_ENABLE ; -I915_WRITE (VLV_BLC_PWM_CTL2 (pipe), ctl2); +intel_de_write (dev_priv,VLV_BLC_PWM_CTL2 (pipe), ctl2); } ctl = panel->backlight.max <<16 ; -I915_WRITE (VLV_BLC_PWM_CTL (pipe), ctl); +intel_de_write (dev_priv,VLV_BLC_PWM_CTL (pipe), ctl);/* XXX: combine this into above write? */ intel_panel_actually_set_backlight (conn_state, panel->backlight.level);
@@ -1066,9 +1074,10 @@ static void vlv_enable_backlight(const struct intel_crtc_state *crtc_state, ctl2 =0 ;if (panel->backlight.active_low_pwm) ctl2 |=BLM_POLARITY_I965 ; -I915_WRITE (VLV_BLC_PWM_CTL2 (pipe), ctl2); -POSTING_READ (VLV_BLC_PWM_CTL2 (pipe)); -I915_WRITE (VLV_BLC_PWM_CTL2 (pipe), ctl2 |BLM_PWM_ENABLE ); +intel_de_write (dev_priv,VLV_BLC_PWM_CTL2 (pipe), ctl2); +intel_de_posting_read (dev_priv,VLV_BLC_PWM_CTL2 (pipe)); +intel_de_write (dev_priv,VLV_BLC_PWM_CTL2 (pipe), + ctl2 |BLM_PWM_ENABLE ); } static void bxt_enable_backlight(const struct intel_crtc_state *crtc_state,
@@ -1082,30 +1091,33 @@ static void bxt_enable_backlight(const struct intel_crtc_state *crtc_state,/* Controller 1 uses the utility pin. */ if (panel->backlight.controller ==1 ) { - val =I915_READ (UTIL_PIN_CTL ); + val =intel_de_read (dev_priv,UTIL_PIN_CTL );if (val &UTIL_PIN_ENABLE ) {DRM_DEBUG_KMS ("util pin already enabled\n" ); val &= ~UTIL_PIN_ENABLE ; -I915_WRITE (UTIL_PIN_CTL , val); +intel_de_write (dev_priv,UTIL_PIN_CTL , val); } val =0 ;if (panel->backlight.util_pin_active_low) val |=UTIL_PIN_POLARITY ; -I915_WRITE (UTIL_PIN_CTL , val |UTIL_PIN_PIPE (pipe) | -UTIL_PIN_MODE_PWM |UTIL_PIN_ENABLE ); +intel_de_write (dev_priv,UTIL_PIN_CTL , + val |UTIL_PIN_PIPE (pipe) |UTIL_PIN_MODE_PWM |UTIL_PIN_ENABLE ); } - pwm_ctl =I915_READ (BXT_BLC_PWM_CTL (panel->backlight.controller)); + pwm_ctl =intel_de_read (dev_priv, +BXT_BLC_PWM_CTL (panel->backlight.controller));if (pwm_ctl &BXT_BLC_PWM_ENABLE ) {DRM_DEBUG_KMS ("backlight already enabled\n" ); pwm_ctl &= ~BXT_BLC_PWM_ENABLE ; -I915_WRITE (BXT_BLC_PWM_CTL (panel->backlight.controller), - pwm_ctl); +intel_de_write (dev_priv, +BXT_BLC_PWM_CTL (panel->backlight.controller), + pwm_ctl); } -I915_WRITE (BXT_BLC_PWM_FREQ (panel->backlight.controller), - panel->backlight.max); +intel_de_write (dev_priv, +BXT_BLC_PWM_FREQ (panel->backlight.controller), + panel->backlight.max);intel_panel_actually_set_backlight (conn_state, panel->backlight.level);
@@ -1113,10 +1125,12 @@ static void bxt_enable_backlight(const struct intel_crtc_state *crtc_state,if (panel->backlight.active_low_pwm) pwm_ctl |=BXT_BLC_PWM_POLARITY ; -I915_WRITE (BXT_BLC_PWM_CTL (panel->backlight.controller), pwm_ctl); -POSTING_READ (BXT_BLC_PWM_CTL (panel->backlight.controller)); -I915_WRITE (BXT_BLC_PWM_CTL (panel->backlight.controller), - pwm_ctl |BXT_BLC_PWM_ENABLE ); +intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), + pwm_ctl); +intel_de_posting_read (dev_priv, +BXT_BLC_PWM_CTL (panel->backlight.controller)); +intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), + pwm_ctl |BXT_BLC_PWM_ENABLE ); } static void cnp_enable_backlight(const struct intel_crtc_state *crtc_state,
@@ -1127,16 +1141,19 @@ static void cnp_enable_backlight(const struct intel_crtc_state *crtc_state,struct intel_panel *panel = &connector->panel;u32 pwm_ctl; - pwm_ctl =I915_READ (BXT_BLC_PWM_CTL (panel->backlight.controller)); + pwm_ctl =intel_de_read (dev_priv, +BXT_BLC_PWM_CTL (panel->backlight.controller));if (pwm_ctl &BXT_BLC_PWM_ENABLE ) {DRM_DEBUG_KMS ("backlight already enabled\n" ); pwm_ctl &= ~BXT_BLC_PWM_ENABLE ; -I915_WRITE (BXT_BLC_PWM_CTL (panel->backlight.controller), - pwm_ctl); +intel_de_write (dev_priv, +BXT_BLC_PWM_CTL (panel->backlight.controller), + pwm_ctl); } -I915_WRITE (BXT_BLC_PWM_FREQ (panel->backlight.controller), - panel->backlight.max); +intel_de_write (dev_priv, +BXT_BLC_PWM_FREQ (panel->backlight.controller), + panel->backlight.max);intel_panel_actually_set_backlight (conn_state, panel->backlight.level);
@@ -1144,10 +1161,12 @@ static void cnp_enable_backlight(const struct intel_crtc_state *crtc_state,if (panel->backlight.active_low_pwm) pwm_ctl |=BXT_BLC_PWM_POLARITY ; -I915_WRITE (BXT_BLC_PWM_CTL (panel->backlight.controller), pwm_ctl); -POSTING_READ (BXT_BLC_PWM_CTL (panel->backlight.controller)); -I915_WRITE (BXT_BLC_PWM_CTL (panel->backlight.controller), - pwm_ctl |BXT_BLC_PWM_ENABLE ); +intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), + pwm_ctl); +intel_de_posting_read (dev_priv, +BXT_BLC_PWM_CTL (panel->backlight.controller)); +intel_de_write (dev_priv,BXT_BLC_PWM_CTL (panel->backlight.controller), + pwm_ctl |BXT_BLC_PWM_ENABLE ); } static void pwm_enable_backlight(const struct intel_crtc_state *crtc_state,
@@ -1493,7 +1512,7 @@ static u32 vlv_hz_to_pwm(struct intel_connector *connector, u32 pwm_freq_hz)struct drm_i915_private *dev_priv =to_i915 (connector->base.dev);int mul, clock; -if ((I915_READ (CBR1_VLV ) &CBR_PWM_CLOCK_MUX_SELECT ) ==0 ) { +if ((intel_de_read (dev_priv,CBR1_VLV ) &CBR_PWM_CLOCK_MUX_SELECT ) ==0 ) {if (IS_CHERRYVIEW (dev_priv)) clock =KHz (19200 );else
@@ -1573,18 +1592,18 @@ static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unusbool alt, cpu_mode;if (HAS_PCH_LPT (dev_priv)) - alt =I915_READ (SOUTH_CHICKEN2 ) &LPT_PWM_GRANULARITY ; + alt =intel_de_read (dev_priv,SOUTH_CHICKEN2 ) &LPT_PWM_GRANULARITY ;else - alt =I915_READ (SOUTH_CHICKEN1 ) &SPT_PWM_GRANULARITY ; + alt =intel_de_read (dev_priv,SOUTH_CHICKEN1 ) &SPT_PWM_GRANULARITY ; panel->backlight.alternate_pwm_increment = alt; - pch_ctl1 =I915_READ (BLC_PWM_PCH_CTL1 ); + pch_ctl1 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 ); panel->backlight.active_low_pwm = pch_ctl1 &BLM_PCH_POLARITY ; - pch_ctl2 =I915_READ (BLC_PWM_PCH_CTL2 ); + pch_ctl2 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL2 ); panel->backlight.max = pch_ctl2 >>16 ; - cpu_ctl2 =I915_READ (BLC_PWM_CPU_CTL2 ); + cpu_ctl2 =intel_de_read (dev_priv,BLC_PWM_CPU_CTL2 );if (!panel->backlight.max) panel->backlight.max =get_backlight_max_vbt (connector);
@@ -1612,9 +1631,11 @@ static int lpt_setup_backlight(struct intel_connector *connector, enum pipe unus/* Write converted CPU PWM value to PCH override register */ lpt_set_backlight (connector->base.state, panel->backlight.level); -I915_WRITE (BLC_PWM_PCH_CTL1 , pch_ctl1 |BLM_PCH_OVERRIDE_ENABLE ); +intel_de_write (dev_priv,BLC_PWM_PCH_CTL1 , + pch_ctl1 |BLM_PCH_OVERRIDE_ENABLE ); -I915_WRITE (BLC_PWM_CPU_CTL2 , cpu_ctl2 & ~BLM_PWM_ENABLE ); +intel_de_write (dev_priv,BLC_PWM_CPU_CTL2 , + cpu_ctl2 & ~BLM_PWM_ENABLE ); }return 0 ;
@@ -1626,10 +1647,10 @@ static int pch_setup_backlight(struct intel_connector *connector, enum pipe unusstruct intel_panel *panel = &connector->panel;u32 cpu_ctl2, pch_ctl1, pch_ctl2, val; - pch_ctl1 =I915_READ (BLC_PWM_PCH_CTL1 ); + pch_ctl1 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL1 ); panel->backlight.active_low_pwm = pch_ctl1 &BLM_PCH_POLARITY ; - pch_ctl2 =I915_READ (BLC_PWM_PCH_CTL2 ); + pch_ctl2 =intel_de_read (dev_priv,BLC_PWM_PCH_CTL2 ); panel->backlight.max = pch_ctl2 >>16 ;if (!panel->backlight.max)
@@ -1645,7 +1666,7 @@ static int pch_setup_backlight(struct intel_connector *connector, enum pipe unus panel->backlight.level =clamp (val, panel->backlight.min, panel->backlight.max); - cpu_ctl2 =I915_READ (BLC_PWM_CPU_CTL2 ); + cpu_ctl2 =intel_de_read (dev_priv,BLC_PWM_CPU_CTL2 ); panel->backlight.enabled = (cpu_ctl2 &BLM_PWM_ENABLE ) && (pch_ctl1 &BLM_PCH_PWM_ENABLE );
@@ -1658,7 +1679,7 @@ static int i9xx_setup_backlight(struct intel_connector *connector, enum pipe unustruct intel_panel *panel = &connector->panel;u32 ctl, val; - ctl =I915_READ (BLC_PWM_CTL ); + ctl =intel_de_read (dev_priv,BLC_PWM_CTL );if (IS_GEN (dev_priv,2 ) ||IS_I915GM (dev_priv) ||IS_I945GM (dev_priv)) panel->backlight.combination_mode = ctl &BLM_LEGACY_MODE ;
@@ -1697,11 +1718,11 @@ static int i965_setup_backlight(struct intel_connector *connector, enum pipe unustruct intel_panel *panel = &connector->panel;u32 ctl, ctl2, val; - ctl2 =I915_READ (BLC_PWM_CTL2 ); + ctl2 =intel_de_read (dev_priv,BLC_PWM_CTL2 ); panel->backlight.combination_mode = ctl2 &BLM_COMBINATION_MODE ; panel->backlight.active_low_pwm = ctl2 &BLM_POLARITY_I965 ; - ctl =I915_READ (BLC_PWM_CTL ); + ctl =intel_de_read (dev_priv,BLC_PWM_CTL ); panel->backlight.max = ctl >>16 ;if (!panel->backlight.max)
@@ -1734,10 +1755,10 @@ static int vlv_setup_backlight(struct intel_connector *connector, enum pipe pipeif (WARN_ON (pipe !=PIPE_A && pipe !=PIPE_B ))return -ENODEV ; - ctl2 =I915_READ (VLV_BLC_PWM_CTL2 (pipe)); + ctl2 =intel_de_read (dev_priv,VLV_BLC_PWM_CTL2 (pipe)); panel->backlight.active_low_pwm = ctl2 &BLM_POLARITY_I965 ; - ctl =I915_READ (VLV_BLC_PWM_CTL (pipe)); + ctl =intel_de_read (dev_priv,VLV_BLC_PWM_CTL (pipe)); panel->backlight.max = ctl >>16 ;if (!panel->backlight.max)
@@ -1767,18 +1788,20 @@ bxt_setup_backlight(struct intel_connector *connector, enum pipe unused) panel->backlight.controller = dev_priv->vbt.backlight.controller; - pwm_ctl =I915_READ (BXT_BLC_PWM_CTL (panel->backlight.controller)); + pwm_ctl =intel_de_read (dev_priv, +BXT_BLC_PWM_CTL (panel->backlight.controller));/* Controller 1 uses the utility pin. */ if (panel->backlight.controller ==1 ) { - val =I915_READ (UTIL_PIN_CTL ); + val =intel_de_read (dev_priv,UTIL_PIN_CTL ); panel->backlight.util_pin_active_low = val &UTIL_PIN_POLARITY ; } panel->backlight.active_low_pwm = pwm_ctl &BXT_BLC_PWM_POLARITY ; panel->backlight.max = -I915_READ (BXT_BLC_PWM_FREQ (panel->backlight.controller)); +intel_de_read (dev_priv, +BXT_BLC_PWM_FREQ (panel->backlight.controller));if (!panel->backlight.max) panel->backlight.max =get_backlight_max_vbt (connector);
@@ -1812,11 +1835,13 @@ cnp_setup_backlight(struct intel_connector *connector, enum pipe unused)*/ panel->backlight.controller =0 ; - pwm_ctl =I915_READ (BXT_BLC_PWM_CTL (panel->backlight.controller)); + pwm_ctl =intel_de_read (dev_priv, +BXT_BLC_PWM_CTL (panel->backlight.controller)); panel->backlight.active_low_pwm = pwm_ctl &BXT_BLC_PWM_POLARITY ; panel->backlight.max = -I915_READ (BXT_BLC_PWM_FREQ (panel->backlight.controller)); +intel_de_read (dev_priv, +BXT_BLC_PWM_FREQ (panel->backlight.controller));if (!panel->backlight.max) panel->backlight.max =get_backlight_max_vbt (connector);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 25/33 drm/i915/pipe_crc: 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_pipe_crc.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/intel_pipe_crc.c +10 -10
@@ -172,7 +172,7 @@ static int vlv_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv,* - DisplayPort scrambling: used for EMI reduction */ if (need_stable_symbols) { -u32 tmp =I915_READ (PORT_DFT2_G4X ); +u32 tmp =intel_de_read (dev_priv,PORT_DFT2_G4X ); tmp |=DC_BALANCE_RESET_VLV ;switch (pipe) {
@@ -188,7 +188,7 @@ static int vlv_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv,default :return -EINVAL ; } -I915_WRITE (PORT_DFT2_G4X , tmp); +intel_de_write (dev_priv,PORT_DFT2_G4X , tmp); }return 0 ;
@@ -237,7 +237,7 @@ static int i9xx_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv,static void vlv_undo_pipe_scramble_reset (struct drm_i915_private *dev_priv,enum pipe pipe) { -u32 tmp =I915_READ (PORT_DFT2_G4X ); +u32 tmp =intel_de_read (dev_priv,PORT_DFT2_G4X );switch (pipe) {case PIPE_A :
@@ -254,7 +254,7 @@ static void vlv_undo_pipe_scramble_reset(struct drm_i915_private *dev_priv, }if (!(tmp &PIPE_SCRAMBLE_RESET_MASK )) tmp &= ~DC_BALANCE_RESET_VLV ; -I915_WRITE (PORT_DFT2_G4X , tmp); +intel_de_write (dev_priv,PORT_DFT2_G4X , tmp); } static int ilk_pipe_crc_ctl_reg(enum intel_pipe_crc_source *source,
@@ -615,8 +615,8 @@ int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name) goto out; pipe_crc->source = source; -I915_WRITE (PIPE_CRC_CTL (crtc->index), val); -POSTING_READ (PIPE_CRC_CTL (crtc->index)); +intel_de_write (dev_priv,PIPE_CRC_CTL (crtc->index), val); +intel_de_posting_read (dev_priv,PIPE_CRC_CTL (crtc->index));if (!source) {if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv))
@@ -650,8 +650,8 @@ void intel_crtc_enable_pipe_crc(struct intel_crtc *intel_crtc)/* Don't need pipe_crc->lock here, IRQs are not generated. */ pipe_crc->skipped =0 ; -I915_WRITE (PIPE_CRC_CTL (crtc->index), val); -POSTING_READ (PIPE_CRC_CTL (crtc->index)); +intel_de_write (dev_priv,PIPE_CRC_CTL (crtc->index), val); +intel_de_posting_read (dev_priv,PIPE_CRC_CTL (crtc->index)); }void intel_crtc_disable_pipe_crc (struct intel_crtc *intel_crtc)
@@ -665,7 +665,7 @@ void intel_crtc_disable_pipe_crc(struct intel_crtc *intel_crtc) pipe_crc->skipped =INT_MIN ;spin_unlock_irq (&pipe_crc->lock); -I915_WRITE (PIPE_CRC_CTL (crtc->index),0 ); -POSTING_READ (PIPE_CRC_CTL (crtc->index)); +intel_de_write (dev_priv,PIPE_CRC_CTL (crtc->index),0 ); +intel_de_posting_read (dev_priv,PIPE_CRC_CTL (crtc->index));intel_synchronize_irq (dev_priv); }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 26/33 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 | 70 ++++++++++++++---------- 1 file changed, 41 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +41 -29
@@ -114,10 +114,10 @@ static void psr_irq_control(struct drm_i915_private *dev_priv)EDP_PSR_PRE_ENTRY (trans_shift);/* Warning: it is masking/setting reserved bits too */ - val =I915_READ (imr_reg); + val =intel_de_read (dev_priv, imr_reg); val &= ~EDP_PSR_TRANS_MASK (trans_shift); val |= ~mask; -I915_WRITE (imr_reg, val); +intel_de_write (dev_priv, imr_reg, val); }static void psr_event_print (u32 val,bool psr2_enabled)
@@ -184,10 +184,12 @@ void intel_psr_irq_handler(struct drm_i915_private *dev_priv, u32 psr_iir) transcoder_name(cpu_transcoder));if (INTEL_GEN (dev_priv) >=9 ) { -u32 val =I915_READ (PSR_EVENT (cpu_transcoder)); +u32 val =intel_de_read (dev_priv, +PSR_EVENT (cpu_transcoder));bool psr2_enabled = dev_priv->psr.psr2_enabled; -I915_WRITE (PSR_EVENT (cpu_transcoder), val); +intel_de_write (dev_priv,PSR_EVENT (cpu_transcoder), + val);psr_event_print (val, psr2_enabled); } }
@@ -208,9 +210,9 @@ void intel_psr_irq_handler(struct drm_i915_private *dev_priv, u32 psr_iir)* again so we don't care about unmask the interruption * or unset irq_aux_error. */ - val =I915_READ (imr_reg); + val =intel_de_read (dev_priv, imr_reg); val |=EDP_PSR_ERROR (trans_shift); -I915_WRITE (imr_reg, val); +intel_de_write (dev_priv, imr_reg, val);schedule_work (&dev_priv->psr.work); }
@@ -380,8 +382,9 @@ static void hsw_psr_setup_aux(struct intel_dp *intel_dp)BUILD_BUG_ON (sizeof (aux_msg) >20 );for (i =0 ; i <sizeof (aux_msg); i +=4 ) -I915_WRITE (EDP_PSR_AUX_DATA (dev_priv->psr.transcoder, i >>2 ), -intel_dp_pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); +intel_de_write (dev_priv, +EDP_PSR_AUX_DATA (dev_priv->psr.transcoder, i >>2 ), +intel_dp_pack_aux (&aux_msg[i],sizeof (aux_msg) - i)); aux_clock_divider = intel_dp->get_aux_clock_divider (intel_dp,0 );
@@ -391,7 +394,8 @@ static void hsw_psr_setup_aux(struct intel_dp *intel_dp)/* Select only valid bits for SRD_AUX_CTL */ aux_ctl &= psr_aux_mask; -I915_WRITE (EDP_PSR_AUX_CTL (dev_priv->psr.transcoder), aux_ctl); +intel_de_write (dev_priv,EDP_PSR_AUX_CTL (dev_priv->psr.transcoder), + aux_ctl); }static void intel_psr_enable_sink (struct intel_dp *intel_dp)
@@ -491,9 +495,9 @@ static void hsw_activate_psr1(struct intel_dp *intel_dp)if (INTEL_GEN (dev_priv) >=8 ) val |=EDP_PSR_CRC_ENABLE ; - val |= (I915_READ (EDP_PSR_CTL (dev_priv->psr.transcoder)) & + val |= (intel_de_read (dev_priv,EDP_PSR_CTL (dev_priv->psr.transcoder)) &EDP_PSR_RESTORE_PSR_ACTIVE_CTX_MASK ); -I915_WRITE (EDP_PSR_CTL (dev_priv->psr.transcoder), val); +intel_de_write (dev_priv,EDP_PSR_CTL (dev_priv->psr.transcoder), val); }static void hsw_activate_psr2 (struct intel_dp *intel_dp)
@@ -523,9 +527,9 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)* PSR2 HW is incorrectly using EDP_PSR_TP1_TP3_SEL and BSpec is * recommending keep this bit unset while PSR2 is enabled. */ -I915_WRITE (EDP_PSR_CTL (dev_priv->psr.transcoder),0 ); +intel_de_write (dev_priv,EDP_PSR_CTL (dev_priv->psr.transcoder),0 ); -I915_WRITE (EDP_PSR2_CTL (dev_priv->psr.transcoder), val); +intel_de_write (dev_priv,EDP_PSR2_CTL (dev_priv->psr.transcoder), val); } static bool
@@ -554,10 +558,10 @@ static void psr2_program_idle_frames(struct drm_i915_private *dev_priv,u32 val; idle_frames <<=EDP_PSR2_IDLE_FRAME_SHIFT ; - val =I915_READ (EDP_PSR2_CTL (dev_priv->psr.transcoder)); + val =intel_de_read (dev_priv,EDP_PSR2_CTL (dev_priv->psr.transcoder)); val &= ~EDP_PSR2_IDLE_FRAME_MASK ; val |= idle_frames; -I915_WRITE (EDP_PSR2_CTL (dev_priv->psr.transcoder), val); +intel_de_write (dev_priv,EDP_PSR2_CTL (dev_priv->psr.transcoder), val); }static void tgl_psr2_enable_dc3co (struct drm_i915_private *dev_priv)
@@ -733,9 +737,9 @@ static void intel_psr_activate(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv =dp_to_i915 (intel_dp);if (transcoder_has_psr2 (dev_priv, dev_priv->psr.transcoder)) -WARN_ON (I915_READ (EDP_PSR2_CTL (dev_priv->psr.transcoder)) &EDP_PSR2_ENABLE ); +WARN_ON (intel_de_read (dev_priv,EDP_PSR2_CTL (dev_priv->psr.transcoder)) &EDP_PSR2_ENABLE ); -WARN_ON (I915_READ (EDP_PSR_CTL (dev_priv->psr.transcoder)) &EDP_PSR_ENABLE ); +WARN_ON (intel_de_read (dev_priv,EDP_PSR_CTL (dev_priv->psr.transcoder)) &EDP_PSR_ENABLE );WARN_ON (dev_priv->psr.active);lockdep_assert_held (&dev_priv->psr.lock);
@@ -764,11 +768,11 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,if (dev_priv->psr.psr2_enabled && (IS_GEN (dev_priv,9 ) && !IS_GEMINILAKE (dev_priv))) {i915_reg_t reg =CHICKEN_TRANS (cpu_transcoder); -u32 chicken =I915_READ (reg); +u32 chicken =intel_de_read (dev_priv, reg); chicken |=PSR2_VSC_ENABLE_PROG_HEADER |PSR2_ADD_VERTICAL_LINE_COUNT ; -I915_WRITE (reg, chicken); +intel_de_write (dev_priv, reg, chicken); }/*
@@ -785,7 +789,8 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp,if (INTEL_GEN (dev_priv) <11 ) mask |=EDP_PSR_DEBUG_MASK_DISP_REG_WRITE ; -I915_WRITE (EDP_PSR_DEBUG (dev_priv->psr.transcoder), mask); +intel_de_write (dev_priv,EDP_PSR_DEBUG (dev_priv->psr.transcoder), + mask);psr_irq_control (dev_priv); }
@@ -814,10 +819,11 @@ static void intel_psr_enable_locked(struct drm_i915_private *dev_priv,* to avoid any rendering problems. */ if (INTEL_GEN (dev_priv) >=12 ) { - val =I915_READ (TRANS_PSR_IIR (dev_priv->psr.transcoder)); + val =intel_de_read (dev_priv, +TRANS_PSR_IIR (dev_priv->psr.transcoder)); val &=EDP_PSR_ERROR (0 ); }else { - val =I915_READ (EDP_PSR_IIR ); + val =intel_de_read (dev_priv,EDP_PSR_IIR ); val &=EDP_PSR_ERROR (dev_priv->psr.transcoder); }if (val) {
@@ -875,11 +881,13 @@ static void intel_psr_exit(struct drm_i915_private *dev_priv)if (!dev_priv->psr.active) {if (transcoder_has_psr2 (dev_priv, dev_priv->psr.transcoder)) { - val =I915_READ (EDP_PSR2_CTL (dev_priv->psr.transcoder)); + val =intel_de_read (dev_priv, +EDP_PSR2_CTL (dev_priv->psr.transcoder));WARN_ON (val &EDP_PSR2_ENABLE ); } - val =I915_READ (EDP_PSR_CTL (dev_priv->psr.transcoder)); + val =intel_de_read (dev_priv, +EDP_PSR_CTL (dev_priv->psr.transcoder));WARN_ON (val &EDP_PSR_ENABLE );return ;
@@ -887,15 +895,19 @@ static void intel_psr_exit(struct drm_i915_private *dev_priv)if (dev_priv->psr.psr2_enabled) {tgl_disallow_dc3co_on_psr2_exit (dev_priv); - val =I915_READ (EDP_PSR2_CTL (dev_priv->psr.transcoder)); + val =intel_de_read (dev_priv, +EDP_PSR2_CTL (dev_priv->psr.transcoder));WARN_ON (!(val &EDP_PSR2_ENABLE )); val &= ~EDP_PSR2_ENABLE ; -I915_WRITE (EDP_PSR2_CTL (dev_priv->psr.transcoder), val); +intel_de_write (dev_priv, +EDP_PSR2_CTL (dev_priv->psr.transcoder), val); }else { - val =I915_READ (EDP_PSR_CTL (dev_priv->psr.transcoder)); + val =intel_de_read (dev_priv, +EDP_PSR_CTL (dev_priv->psr.transcoder));WARN_ON (!(val &EDP_PSR_ENABLE )); val &= ~EDP_PSR_ENABLE ; -I915_WRITE (EDP_PSR_CTL (dev_priv->psr.transcoder), val); +intel_de_write (dev_priv, +EDP_PSR_CTL (dev_priv->psr.transcoder), val); } dev_priv->psr.active = false; }
@@ -977,7 +989,7 @@ static void psr_force_hw_tracking_exit(struct drm_i915_private *dev_priv)* but it makes more sense write to the current active * pipe. */ -I915_WRITE (CURSURFLIVE (dev_priv->psr.pipe),0 ); +intel_de_write (dev_priv,CURSURFLIVE (dev_priv->psr.pipe),0 ); else/* * A write to CURSURFLIVE do not cause HW tracking to exit PSR
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 27/33 drm/i915/sdvo: 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_sdvo.c | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/display/intel_sdvo.c +15 -15
@@ -217,23 +217,23 @@ static void intel_sdvo_write_sdvox(struct intel_sdvo *intel_sdvo, u32 val)int i;if (HAS_PCH_SPLIT (dev_priv)) { -I915_WRITE (intel_sdvo->sdvo_reg, val); -POSTING_READ (intel_sdvo->sdvo_reg); +intel_de_write (dev_priv, intel_sdvo->sdvo_reg, val); +intel_de_posting_read (dev_priv, intel_sdvo->sdvo_reg);/* * HW workaround, need to write this twice for issue * that may result in first write getting masked. */ if (HAS_PCH_IBX (dev_priv)) { -I915_WRITE (intel_sdvo->sdvo_reg, val); -POSTING_READ (intel_sdvo->sdvo_reg); +intel_de_write (dev_priv, intel_sdvo->sdvo_reg, val); +intel_de_posting_read (dev_priv, intel_sdvo->sdvo_reg); }return ; }if (intel_sdvo->port ==PORT_B ) - cval =I915_READ (GEN3_SDVOC ); + cval =intel_de_read (dev_priv,GEN3_SDVOC );else - bval =I915_READ (GEN3_SDVOB ); + bval =intel_de_read (dev_priv,GEN3_SDVOB );/* * Write the registers twice for luck. Sometimes,
@@ -241,11 +241,11 @@ static void intel_sdvo_write_sdvox(struct intel_sdvo *intel_sdvo, u32 val)* The BIOS does this too. Yay, magic */ for (i =0 ; i <2 ; i++) { -I915_WRITE (GEN3_SDVOB , bval); -POSTING_READ (GEN3_SDVOB ); +intel_de_write (dev_priv,GEN3_SDVOB , bval); +intel_de_posting_read (dev_priv,GEN3_SDVOB ); -I915_WRITE (GEN3_SDVOC , cval); -POSTING_READ (GEN3_SDVOC ); +intel_de_write (dev_priv,GEN3_SDVOC , cval); +intel_de_posting_read (dev_priv,GEN3_SDVOC ); } }
@@ -1525,7 +1525,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,if (INTEL_GEN (dev_priv) <5 ) sdvox |=SDVO_BORDER_ENABLE ; }else { - sdvox =I915_READ (intel_sdvo->sdvo_reg); + sdvox =intel_de_read (dev_priv, intel_sdvo->sdvo_reg);if (intel_sdvo->port ==PORT_B ) sdvox &=SDVOB_PRESERVE_MASK ;else
@@ -1571,7 +1571,7 @@ bool intel_sdvo_port_enabled(struct drm_i915_private *dev_priv, {u32 val; - val =I915_READ (sdvo_reg); + val =intel_de_read (dev_priv, sdvo_reg);/* asserts want to know the pipe even if the port is disabled */ if (HAS_PCH_CPT (dev_priv))
@@ -1614,7 +1614,7 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder, pipe_config->output_types |=BIT (INTEL_OUTPUT_SDVO ); - sdvox =I915_READ (intel_sdvo->sdvo_reg); + sdvox =intel_de_read (dev_priv, intel_sdvo->sdvo_reg); ret =intel_sdvo_get_input_timing (intel_sdvo, &dtd);if (!ret) {
@@ -1741,7 +1741,7 @@ static void intel_disable_sdvo(struct intel_encoder *encoder,intel_sdvo_set_encoder_power_state (intel_sdvo,DRM_MODE_DPMS_OFF ); - temp =I915_READ (intel_sdvo->sdvo_reg); + temp =intel_de_read (dev_priv, intel_sdvo->sdvo_reg); temp &= ~SDVO_ENABLE ;intel_sdvo_write_sdvox (intel_sdvo, temp);
@@ -1798,7 +1798,7 @@ static void intel_enable_sdvo(struct intel_encoder *encoder,int i;bool success; - temp =I915_READ (intel_sdvo->sdvo_reg); + temp =intel_de_read (dev_priv, intel_sdvo->sdvo_reg); temp |=SDVO_ENABLE ;intel_sdvo_write_sdvox (intel_sdvo, temp);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 28/33 drm/i915/sprite: 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_sprite.c | 320 +++++++++++--------- 1 file changed, 175 insertions(+), 145 deletions(-)
drivers/gpu/drm/i915/display/intel_sprite.c +175 -145
@@ -434,14 +434,16 @@ skl_program_scaler(struct intel_plane *plane, uv_rgb_vphase =skl_scaler_calc_phase (1 , vscale, false); } -I915_WRITE_FW (SKL_PS_CTRL (pipe, scaler_id), -PS_SCALER_EN |PS_PLANE_SEL (plane->id) | scaler->mode); -I915_WRITE_FW (SKL_PS_VPHASE (pipe, scaler_id), -PS_Y_PHASE (y_vphase) |PS_UV_RGB_PHASE (uv_rgb_vphase)); -I915_WRITE_FW (SKL_PS_HPHASE (pipe, scaler_id), -PS_Y_PHASE (y_hphase) |PS_UV_RGB_PHASE (uv_rgb_hphase)); -I915_WRITE_FW (SKL_PS_WIN_POS (pipe, scaler_id), (crtc_x <<16 ) | crtc_y); -I915_WRITE_FW (SKL_PS_WIN_SZ (pipe, scaler_id), (crtc_w <<16 ) | crtc_h); +intel_de_write_fw (dev_priv,SKL_PS_CTRL (pipe, scaler_id), +PS_SCALER_EN |PS_PLANE_SEL (plane->id) | scaler->mode); +intel_de_write_fw (dev_priv,SKL_PS_VPHASE (pipe, scaler_id), +PS_Y_PHASE (y_vphase) |PS_UV_RGB_PHASE (uv_rgb_vphase)); +intel_de_write_fw (dev_priv,SKL_PS_HPHASE (pipe, scaler_id), +PS_Y_PHASE (y_hphase) |PS_UV_RGB_PHASE (uv_rgb_hphase)); +intel_de_write_fw (dev_priv,SKL_PS_WIN_POS (pipe, scaler_id), + (crtc_x <<16 ) | crtc_y); +intel_de_write_fw (dev_priv,SKL_PS_WIN_SZ (pipe, scaler_id), + (crtc_w <<16 ) | crtc_h); }/* Preoffset values for YUV to RGB Conversion */
@@ -547,28 +549,37 @@ icl_program_input_csc(struct intel_plane *plane,else csc = input_csc_matrix_lr[plane_state->hw.color_encoding]; -I915_WRITE_FW (PLANE_INPUT_CSC_COEFF (pipe, plane_id,0 ),ROFF (csc[0 ]) | -GOFF (csc[1 ])); -I915_WRITE_FW (PLANE_INPUT_CSC_COEFF (pipe, plane_id,1 ),BOFF (csc[2 ])); -I915_WRITE_FW (PLANE_INPUT_CSC_COEFF (pipe, plane_id,2 ),ROFF (csc[3 ]) | -GOFF (csc[4 ])); -I915_WRITE_FW (PLANE_INPUT_CSC_COEFF (pipe, plane_id,3 ),BOFF (csc[5 ])); -I915_WRITE_FW (PLANE_INPUT_CSC_COEFF (pipe, plane_id,4 ),ROFF (csc[6 ]) | -GOFF (csc[7 ])); -I915_WRITE_FW (PLANE_INPUT_CSC_COEFF (pipe, plane_id,5 ),BOFF (csc[8 ])); - -I915_WRITE_FW (PLANE_INPUT_CSC_PREOFF (pipe, plane_id,0 ), -PREOFF_YUV_TO_RGB_HI ); +intel_de_write_fw (dev_priv,PLANE_INPUT_CSC_COEFF (pipe, plane_id,0 ), +ROFF (csc[0 ]) |GOFF (csc[1 ])); +intel_de_write_fw (dev_priv,PLANE_INPUT_CSC_COEFF (pipe, plane_id,1 ), +BOFF (csc[2 ])); +intel_de_write_fw (dev_priv,PLANE_INPUT_CSC_COEFF (pipe, plane_id,2 ), +ROFF (csc[3 ]) |GOFF (csc[4 ])); +intel_de_write_fw (dev_priv,PLANE_INPUT_CSC_COEFF (pipe, plane_id,3 ), +BOFF (csc[5 ])); +intel_de_write_fw (dev_priv,PLANE_INPUT_CSC_COEFF (pipe, plane_id,4 ), +ROFF (csc[6 ]) |GOFF (csc[7 ])); +intel_de_write_fw (dev_priv,PLANE_INPUT_CSC_COEFF (pipe, plane_id,5 ), +BOFF (csc[8 ])); + +intel_de_write_fw (dev_priv,PLANE_INPUT_CSC_PREOFF (pipe, plane_id,0 ), +PREOFF_YUV_TO_RGB_HI );if (plane_state->hw.color_range ==DRM_COLOR_YCBCR_FULL_RANGE ) -I915_WRITE_FW (PLANE_INPUT_CSC_PREOFF (pipe, plane_id,1 ),0 ); +intel_de_write_fw (dev_priv, +PLANE_INPUT_CSC_PREOFF (pipe, plane_id,1 ), +0 );else -I915_WRITE_FW (PLANE_INPUT_CSC_PREOFF (pipe, plane_id,1 ), -PREOFF_YUV_TO_RGB_ME ); -I915_WRITE_FW (PLANE_INPUT_CSC_PREOFF (pipe, plane_id,2 ), -PREOFF_YUV_TO_RGB_LO ); -I915_WRITE_FW (PLANE_INPUT_CSC_POSTOFF (pipe, plane_id,0 ),0x0 ); -I915_WRITE_FW (PLANE_INPUT_CSC_POSTOFF (pipe, plane_id,1 ),0x0 ); -I915_WRITE_FW (PLANE_INPUT_CSC_POSTOFF (pipe, plane_id,2 ),0x0 ); +intel_de_write_fw (dev_priv, +PLANE_INPUT_CSC_PREOFF (pipe, plane_id,1 ), +PREOFF_YUV_TO_RGB_ME ); +intel_de_write_fw (dev_priv,PLANE_INPUT_CSC_PREOFF (pipe, plane_id,2 ), +PREOFF_YUV_TO_RGB_LO ); +intel_de_write_fw (dev_priv, +PLANE_INPUT_CSC_POSTOFF (pipe, plane_id,0 ),0x0 ); +intel_de_write_fw (dev_priv, +PLANE_INPUT_CSC_POSTOFF (pipe, plane_id,1 ),0x0 ); +intel_de_write_fw (dev_priv, +PLANE_INPUT_CSC_POSTOFF (pipe, plane_id,2 ),0x0 ); } static void
@@ -623,44 +634,49 @@ skl_program_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -I915_WRITE_FW (PLANE_STRIDE (pipe, plane_id), stride); -I915_WRITE_FW (PLANE_POS (pipe, plane_id), (crtc_y <<16 ) | crtc_x); -I915_WRITE_FW (PLANE_SIZE (pipe, plane_id), (src_h <<16 ) | src_w); +intel_de_write_fw (dev_priv,PLANE_STRIDE (pipe, plane_id), stride); +intel_de_write_fw (dev_priv,PLANE_POS (pipe, plane_id), + (crtc_y <<16 ) | crtc_x); +intel_de_write_fw (dev_priv,PLANE_SIZE (pipe, plane_id), + (src_h <<16 ) | src_w);if (INTEL_GEN (dev_priv) <12 ) aux_dist |= aux_stride; -I915_WRITE_FW (PLANE_AUX_DIST (pipe, plane_id), aux_dist); +intel_de_write_fw (dev_priv,PLANE_AUX_DIST (pipe, plane_id), aux_dist);if (icl_is_hdr_plane (dev_priv, plane_id)) -I915_WRITE_FW (PLANE_CUS_CTL (pipe, plane_id), plane_state->cus_ctl); +intel_de_write_fw (dev_priv,PLANE_CUS_CTL (pipe, plane_id), + plane_state->cus_ctl);if (INTEL_GEN (dev_priv) >=10 ||IS_GEMINILAKE (dev_priv)) -I915_WRITE_FW (PLANE_COLOR_CTL (pipe, plane_id), plane_color_ctl); +intel_de_write_fw (dev_priv,PLANE_COLOR_CTL (pipe, plane_id), + plane_color_ctl);if (fb->format->is_yuv &&icl_is_hdr_plane (dev_priv, plane_id))icl_program_input_csc (plane, crtc_state, plane_state);skl_write_plane_wm (plane, crtc_state); -I915_WRITE_FW (PLANE_KEYVAL (pipe, plane_id), key->min_value); -I915_WRITE_FW (PLANE_KEYMSK (pipe, plane_id), keymsk); -I915_WRITE_FW (PLANE_KEYMAX (pipe, plane_id), keymax); +intel_de_write_fw (dev_priv,PLANE_KEYVAL (pipe, plane_id), + key->min_value); +intel_de_write_fw (dev_priv,PLANE_KEYMSK (pipe, plane_id), keymsk); +intel_de_write_fw (dev_priv,PLANE_KEYMAX (pipe, plane_id), keymax); -I915_WRITE_FW (PLANE_OFFSET (pipe, plane_id), (y <<16 ) | x); +intel_de_write_fw (dev_priv,PLANE_OFFSET (pipe, plane_id), + (y <<16 ) | x);if (INTEL_GEN (dev_priv) <11 ) -I915_WRITE_FW (PLANE_AUX_OFFSET (pipe, plane_id), - (plane_state->color_plane[1 ].y <<16 ) | - plane_state->color_plane[1 ].x); +intel_de_write_fw (dev_priv,PLANE_AUX_OFFSET (pipe, plane_id), + (plane_state->color_plane[1 ].y <<16 ) | plane_state->color_plane[1 ].x);/* * The control register self-arms if the plane was previously * disabled. Try to make the plane enable atomic by writing * the control register just before the surface register. */ -I915_WRITE_FW (PLANE_CTL (pipe, plane_id), plane_ctl); -I915_WRITE_FW (PLANE_SURF (pipe, plane_id), -intel_plane_ggtt_offset (plane_state) + surf_addr); +intel_de_write_fw (dev_priv,PLANE_CTL (pipe, plane_id), plane_ctl); +intel_de_write_fw (dev_priv,PLANE_SURF (pipe, plane_id), +intel_plane_ggtt_offset (plane_state) + surf_addr);if (plane_state->scaler_id >=0 )skl_program_scaler (plane, crtc_state, plane_state);
@@ -693,12 +709,12 @@ skl_disable_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags);if (icl_is_hdr_plane (dev_priv, plane_id)) -I915_WRITE_FW (PLANE_CUS_CTL (pipe, plane_id),0 ); +intel_de_write_fw (dev_priv,PLANE_CUS_CTL (pipe, plane_id),0 );skl_write_plane_wm (plane, crtc_state); -I915_WRITE_FW (PLANE_CTL (pipe, plane_id),0 ); -I915_WRITE_FW (PLANE_SURF (pipe, plane_id),0 ); +intel_de_write_fw (dev_priv,PLANE_CTL (pipe, plane_id),0 ); +intel_de_write_fw (dev_priv,PLANE_SURF (pipe, plane_id),0 );spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); }
@@ -718,7 +734,7 @@ skl_plane_get_hw_state(struct intel_plane *plane,if (!wakeref)return false; - ret =I915_READ (PLANE_CTL (plane->pipe, plane_id)) &PLANE_CTL_ENABLE ; + ret =intel_de_read (dev_priv,PLANE_CTL (plane->pipe, plane_id)) &PLANE_CTL_ENABLE ; *pipe = plane->pipe;
@@ -774,23 +790,36 @@ chv_update_csc(const struct intel_plane_state *plane_state)if (!fb->format->is_yuv)return ; -I915_WRITE_FW (SPCSCYGOFF (plane_id),SPCSC_OOFF (0 ) |SPCSC_IOFF (0 )); -I915_WRITE_FW (SPCSCCBOFF (plane_id),SPCSC_OOFF (0 ) |SPCSC_IOFF (0 )); -I915_WRITE_FW (SPCSCCROFF (plane_id),SPCSC_OOFF (0 ) |SPCSC_IOFF (0 )); - -I915_WRITE_FW (SPCSCC01 (plane_id),SPCSC_C1 (csc[1 ]) |SPCSC_C0 (csc[0 ])); -I915_WRITE_FW (SPCSCC23 (plane_id),SPCSC_C1 (csc[3 ]) |SPCSC_C0 (csc[2 ])); -I915_WRITE_FW (SPCSCC45 (plane_id),SPCSC_C1 (csc[5 ]) |SPCSC_C0 (csc[4 ])); -I915_WRITE_FW (SPCSCC67 (plane_id),SPCSC_C1 (csc[7 ]) |SPCSC_C0 (csc[6 ])); -I915_WRITE_FW (SPCSCC8 (plane_id),SPCSC_C0 (csc[8 ])); - -I915_WRITE_FW (SPCSCYGICLAMP (plane_id),SPCSC_IMAX (1023 ) |SPCSC_IMIN (0 )); -I915_WRITE_FW (SPCSCCBICLAMP (plane_id),SPCSC_IMAX (512 ) |SPCSC_IMIN (-512 )); -I915_WRITE_FW (SPCSCCRICLAMP (plane_id),SPCSC_IMAX (512 ) |SPCSC_IMIN (-512 )); - -I915_WRITE_FW (SPCSCYGOCLAMP (plane_id),SPCSC_OMAX (1023 ) |SPCSC_OMIN (0 )); -I915_WRITE_FW (SPCSCCBOCLAMP (plane_id),SPCSC_OMAX (1023 ) |SPCSC_OMIN (0 )); -I915_WRITE_FW (SPCSCCROCLAMP (plane_id),SPCSC_OMAX (1023 ) |SPCSC_OMIN (0 )); +intel_de_write_fw (dev_priv,SPCSCYGOFF (plane_id), +SPCSC_OOFF (0 ) |SPCSC_IOFF (0 )); +intel_de_write_fw (dev_priv,SPCSCCBOFF (plane_id), +SPCSC_OOFF (0 ) |SPCSC_IOFF (0 )); +intel_de_write_fw (dev_priv,SPCSCCROFF (plane_id), +SPCSC_OOFF (0 ) |SPCSC_IOFF (0 )); + +intel_de_write_fw (dev_priv,SPCSCC01 (plane_id), +SPCSC_C1 (csc[1 ]) |SPCSC_C0 (csc[0 ])); +intel_de_write_fw (dev_priv,SPCSCC23 (plane_id), +SPCSC_C1 (csc[3 ]) |SPCSC_C0 (csc[2 ])); +intel_de_write_fw (dev_priv,SPCSCC45 (plane_id), +SPCSC_C1 (csc[5 ]) |SPCSC_C0 (csc[4 ])); +intel_de_write_fw (dev_priv,SPCSCC67 (plane_id), +SPCSC_C1 (csc[7 ]) |SPCSC_C0 (csc[6 ])); +intel_de_write_fw (dev_priv,SPCSCC8 (plane_id),SPCSC_C0 (csc[8 ])); + +intel_de_write_fw (dev_priv,SPCSCYGICLAMP (plane_id), +SPCSC_IMAX (1023 ) |SPCSC_IMIN (0 )); +intel_de_write_fw (dev_priv,SPCSCCBICLAMP (plane_id), +SPCSC_IMAX (512 ) |SPCSC_IMIN (-512 )); +intel_de_write_fw (dev_priv,SPCSCCRICLAMP (plane_id), +SPCSC_IMAX (512 ) |SPCSC_IMIN (-512 )); + +intel_de_write_fw (dev_priv,SPCSCYGOCLAMP (plane_id), +SPCSC_OMAX (1023 ) |SPCSC_OMIN (0 )); +intel_de_write_fw (dev_priv,SPCSCCBOCLAMP (plane_id), +SPCSC_OMAX (1023 ) |SPCSC_OMIN (0 )); +intel_de_write_fw (dev_priv,SPCSCCROCLAMP (plane_id), +SPCSC_OMAX (1023 ) |SPCSC_OMIN (0 )); }#define SIN_0 0
@@ -829,10 +858,10 @@ vlv_update_clrc(const struct intel_plane_state *plane_state) }/* FIXME these register are single buffered :( */ -I915_WRITE_FW (SPCLRC0 (pipe, plane_id), -SP_CONTRAST (contrast) |SP_BRIGHTNESS (brightness)); -I915_WRITE_FW (SPCLRC1 (pipe, plane_id), -SP_SH_SIN (sh_sin) |SP_SH_COS (sh_cos)); +intel_de_write_fw (dev_priv,SPCLRC0 (pipe, plane_id), +SP_CONTRAST (contrast) |SP_BRIGHTNESS (brightness)); +intel_de_write_fw (dev_priv,SPCLRC1 (pipe, plane_id), +SP_SH_SIN (sh_sin) |SP_SH_COS (sh_cos)); } static void
@@ -1019,10 +1048,8 @@ static void vlv_update_gamma(const struct intel_plane_state *plane_state)/* FIXME these register are single buffered :( */ /* The two end points are implicit (0.0 and 1.0) */ for (i =1 ; i <8 -1 ; i++) -I915_WRITE_FW (SPGAMC (pipe, plane_id, i -1 ), - gamma[i] <<16 | - gamma[i] <<8 | - gamma[i]); +intel_de_write_fw (dev_priv,SPGAMC (pipe, plane_id, i -1 ), + gamma[i] <<16 | gamma[i] <<8 | gamma[i]); } static void
@@ -1055,32 +1082,37 @@ vlv_update_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -I915_WRITE_FW (SPSTRIDE (pipe, plane_id), - plane_state->color_plane[0 ].stride); -I915_WRITE_FW (SPPOS (pipe, plane_id), (crtc_y <<16 ) | crtc_x); -I915_WRITE_FW (SPSIZE (pipe, plane_id), (crtc_h <<16 ) | crtc_w); -I915_WRITE_FW (SPCONSTALPHA (pipe, plane_id),0 ); +intel_de_write_fw (dev_priv,SPSTRIDE (pipe, plane_id), + plane_state->color_plane[0 ].stride); +intel_de_write_fw (dev_priv,SPPOS (pipe, plane_id), + (crtc_y <<16 ) | crtc_x); +intel_de_write_fw (dev_priv,SPSIZE (pipe, plane_id), + (crtc_h <<16 ) | crtc_w); +intel_de_write_fw (dev_priv,SPCONSTALPHA (pipe, plane_id),0 );if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_B )chv_update_csc (plane_state);if (key->flags) { -I915_WRITE_FW (SPKEYMINVAL (pipe, plane_id), key->min_value); -I915_WRITE_FW (SPKEYMSK (pipe, plane_id), key->channel_mask); -I915_WRITE_FW (SPKEYMAXVAL (pipe, plane_id), key->max_value); +intel_de_write_fw (dev_priv,SPKEYMINVAL (pipe, plane_id), + key->min_value); +intel_de_write_fw (dev_priv,SPKEYMSK (pipe, plane_id), + key->channel_mask); +intel_de_write_fw (dev_priv,SPKEYMAXVAL (pipe, plane_id), + key->max_value); } -I915_WRITE_FW (SPLINOFF (pipe, plane_id), linear_offset); -I915_WRITE_FW (SPTILEOFF (pipe, plane_id), (y <<16 ) | x); +intel_de_write_fw (dev_priv,SPLINOFF (pipe, plane_id), linear_offset); +intel_de_write_fw (dev_priv,SPTILEOFF (pipe, plane_id), (y <<16 ) | x);/* * The control register self-arms if the plane was previously * disabled. Try to make the plane enable atomic by writing * the control register just before the surface register. */ -I915_WRITE_FW (SPCNTR (pipe, plane_id), sprctl); -I915_WRITE_FW (SPSURF (pipe, plane_id), -intel_plane_ggtt_offset (plane_state) + sprsurf_offset); +intel_de_write_fw (dev_priv,SPCNTR (pipe, plane_id), sprctl); +intel_de_write_fw (dev_priv,SPSURF (pipe, plane_id), +intel_plane_ggtt_offset (plane_state) + sprsurf_offset);vlv_update_clrc (plane_state);vlv_update_gamma (plane_state);
@@ -1099,8 +1131,8 @@ vlv_disable_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -I915_WRITE_FW (SPCNTR (pipe, plane_id),0 ); -I915_WRITE_FW (SPSURF (pipe, plane_id),0 ); +intel_de_write_fw (dev_priv,SPCNTR (pipe, plane_id),0 ); +intel_de_write_fw (dev_priv,SPSURF (pipe, plane_id),0 );spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); }
@@ -1120,7 +1152,7 @@ vlv_plane_get_hw_state(struct intel_plane *plane,if (!wakeref)return false; - ret =I915_READ (SPCNTR (plane->pipe, plane_id)) &SP_ENABLE ; + ret =intel_de_read (dev_priv,SPCNTR (plane->pipe, plane_id)) &SP_ENABLE ; *pipe = plane->pipe;
@@ -1424,19 +1456,17 @@ static void ivb_update_gamma(const struct intel_plane_state *plane_state)/* FIXME these register are single buffered :( */ for (i =0 ; i <16 ; i++) -I915_WRITE_FW (SPRGAMC (pipe, i), - gamma[i] <<20 | - gamma[i] <<10 | - gamma[i]); - -I915_WRITE_FW (SPRGAMC16 (pipe,0 ), gamma[i]); -I915_WRITE_FW (SPRGAMC16 (pipe,1 ), gamma[i]); -I915_WRITE_FW (SPRGAMC16 (pipe,2 ), gamma[i]); +intel_de_write_fw (dev_priv,SPRGAMC (pipe, i), + gamma[i] <<20 | gamma[i] <<10 | gamma[i]); + +intel_de_write_fw (dev_priv,SPRGAMC16 (pipe,0 ), gamma[i]); +intel_de_write_fw (dev_priv,SPRGAMC16 (pipe,1 ), gamma[i]); +intel_de_write_fw (dev_priv,SPRGAMC16 (pipe,2 ), gamma[i]); i++; -I915_WRITE_FW (SPRGAMC17 (pipe,0 ), gamma[i]); -I915_WRITE_FW (SPRGAMC17 (pipe,1 ), gamma[i]); -I915_WRITE_FW (SPRGAMC17 (pipe,2 ), gamma[i]); +intel_de_write_fw (dev_priv,SPRGAMC17 (pipe,0 ), gamma[i]); +intel_de_write_fw (dev_priv,SPRGAMC17 (pipe,1 ), gamma[i]); +intel_de_write_fw (dev_priv,SPRGAMC17 (pipe,2 ), gamma[i]); i++; }
@@ -1476,25 +1506,27 @@ ivb_update_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -I915_WRITE_FW (SPRSTRIDE (pipe), plane_state->color_plane[0 ].stride); -I915_WRITE_FW (SPRPOS (pipe), (crtc_y <<16 ) | crtc_x); -I915_WRITE_FW (SPRSIZE (pipe), (crtc_h <<16 ) | crtc_w); +intel_de_write_fw (dev_priv,SPRSTRIDE (pipe), + plane_state->color_plane[0 ].stride); +intel_de_write_fw (dev_priv,SPRPOS (pipe), (crtc_y <<16 ) | crtc_x); +intel_de_write_fw (dev_priv,SPRSIZE (pipe), (crtc_h <<16 ) | crtc_w);if (IS_IVYBRIDGE (dev_priv)) -I915_WRITE_FW (SPRSCALE (pipe), sprscale); +intel_de_write_fw (dev_priv,SPRSCALE (pipe), sprscale);if (key->flags) { -I915_WRITE_FW (SPRKEYVAL (pipe), key->min_value); -I915_WRITE_FW (SPRKEYMSK (pipe), key->channel_mask); -I915_WRITE_FW (SPRKEYMAX (pipe), key->max_value); +intel_de_write_fw (dev_priv,SPRKEYVAL (pipe), key->min_value); +intel_de_write_fw (dev_priv,SPRKEYMSK (pipe), + key->channel_mask); +intel_de_write_fw (dev_priv,SPRKEYMAX (pipe), key->max_value); }/* HSW consolidates SPRTILEOFF and SPRLINOFF into a single SPROFFSET * register */ if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { -I915_WRITE_FW (SPROFFSET (pipe), (y <<16 ) | x); +intel_de_write_fw (dev_priv,SPROFFSET (pipe), (y <<16 ) | x); }else { -I915_WRITE_FW (SPRLINOFF (pipe), linear_offset); -I915_WRITE_FW (SPRTILEOFF (pipe), (y <<16 ) | x); +intel_de_write_fw (dev_priv,SPRLINOFF (pipe), linear_offset); +intel_de_write_fw (dev_priv,SPRTILEOFF (pipe), (y <<16 ) | x); }/*
@@ -1502,9 +1534,9 @@ ivb_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 (SPRCTL (pipe), sprctl); -I915_WRITE_FW (SPRSURF (pipe), -intel_plane_ggtt_offset (plane_state) + sprsurf_offset); +intel_de_write_fw (dev_priv,SPRCTL (pipe), sprctl); +intel_de_write_fw (dev_priv,SPRSURF (pipe), +intel_plane_ggtt_offset (plane_state) + sprsurf_offset);ivb_update_gamma (plane_state);
@@ -1521,11 +1553,11 @@ ivb_disable_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -I915_WRITE_FW (SPRCTL (pipe),0 ); +intel_de_write_fw (dev_priv,SPRCTL (pipe),0 );/* Disable the scaler */ if (IS_IVYBRIDGE (dev_priv)) -I915_WRITE_FW (SPRSCALE (pipe),0 ); -I915_WRITE_FW (SPRSURF (pipe),0 ); +intel_de_write_fw (dev_priv,SPRSCALE (pipe),0 ); +intel_de_write_fw (dev_priv,SPRSURF (pipe),0 );spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); }
@@ -1544,7 +1576,7 @@ ivb_plane_get_hw_state(struct intel_plane *plane,if (!wakeref)return false; - ret =I915_READ (SPRCTL (plane->pipe)) &SPRITE_ENABLE ; + ret =intel_de_read (dev_priv,SPRCTL (plane->pipe)) &SPRITE_ENABLE ; *pipe = plane->pipe;
@@ -1710,10 +1742,8 @@ static void g4x_update_gamma(const struct intel_plane_state *plane_state)/* FIXME these register are single buffered :( */ /* The two end points are implicit (0.0 and 1.0) */ for (i =1 ; i <8 -1 ; i++) -I915_WRITE_FW (DVSGAMC_G4X (pipe, i -1 ), - gamma[i] <<16 | - gamma[i] <<8 | - gamma[i]); +intel_de_write_fw (dev_priv,DVSGAMC_G4X (pipe, i -1 ), + gamma[i] <<16 | gamma[i] <<8 | gamma[i]); }static void ilk_sprite_linear_gamma (u16 gamma[17 ])
@@ -1741,14 +1771,12 @@ static void ilk_update_gamma(const struct intel_plane_state *plane_state)/* FIXME these register are single buffered :( */ for (i =0 ; i <16 ; i++) -I915_WRITE_FW (DVSGAMC_ILK (pipe, i), - gamma[i] <<20 | - gamma[i] <<10 | - gamma[i]); - -I915_WRITE_FW (DVSGAMCMAX_ILK (pipe,0 ), gamma[i]); -I915_WRITE_FW (DVSGAMCMAX_ILK (pipe,1 ), gamma[i]); -I915_WRITE_FW (DVSGAMCMAX_ILK (pipe,2 ), gamma[i]); +intel_de_write_fw (dev_priv,DVSGAMC_ILK (pipe, i), + gamma[i] <<20 | gamma[i] <<10 | gamma[i]); + +intel_de_write_fw (dev_priv,DVSGAMCMAX_ILK (pipe,0 ), gamma[i]); +intel_de_write_fw (dev_priv,DVSGAMCMAX_ILK (pipe,1 ), gamma[i]); +intel_de_write_fw (dev_priv,DVSGAMCMAX_ILK (pipe,2 ), gamma[i]); i++; }
@@ -1788,28 +1816,30 @@ g4x_update_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -I915_WRITE_FW (DVSSTRIDE (pipe), plane_state->color_plane[0 ].stride); -I915_WRITE_FW (DVSPOS (pipe), (crtc_y <<16 ) | crtc_x); -I915_WRITE_FW (DVSSIZE (pipe), (crtc_h <<16 ) | crtc_w); -I915_WRITE_FW (DVSSCALE (pipe), dvsscale); +intel_de_write_fw (dev_priv,DVSSTRIDE (pipe), + plane_state->color_plane[0 ].stride); +intel_de_write_fw (dev_priv,DVSPOS (pipe), (crtc_y <<16 ) | crtc_x); +intel_de_write_fw (dev_priv,DVSSIZE (pipe), (crtc_h <<16 ) | crtc_w); +intel_de_write_fw (dev_priv,DVSSCALE (pipe), dvsscale);if (key->flags) { -I915_WRITE_FW (DVSKEYVAL (pipe), key->min_value); -I915_WRITE_FW (DVSKEYMSK (pipe), key->channel_mask); -I915_WRITE_FW (DVSKEYMAX (pipe), key->max_value); +intel_de_write_fw (dev_priv,DVSKEYVAL (pipe), key->min_value); +intel_de_write_fw (dev_priv,DVSKEYMSK (pipe), + key->channel_mask); +intel_de_write_fw (dev_priv,DVSKEYMAX (pipe), key->max_value); } -I915_WRITE_FW (DVSLINOFF (pipe), linear_offset); -I915_WRITE_FW (DVSTILEOFF (pipe), (y <<16 ) | x); +intel_de_write_fw (dev_priv,DVSLINOFF (pipe), linear_offset); +intel_de_write_fw (dev_priv,DVSTILEOFF (pipe), (y <<16 ) | x);/* * The control register self-arms if the plane was previously * disabled. Try to make the plane enable atomic by writing * the control register just before the surface register. */ -I915_WRITE_FW (DVSCNTR (pipe), dvscntr); -I915_WRITE_FW (DVSSURF (pipe), -intel_plane_ggtt_offset (plane_state) + dvssurf_offset); +intel_de_write_fw (dev_priv,DVSCNTR (pipe), dvscntr); +intel_de_write_fw (dev_priv,DVSSURF (pipe), +intel_plane_ggtt_offset (plane_state) + dvssurf_offset);if (IS_G4X (dev_priv))g4x_update_gamma (plane_state);
@@ -1829,10 +1859,10 @@ g4x_disable_plane(struct intel_plane *plane,spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); -I915_WRITE_FW (DVSCNTR (pipe),0 ); +intel_de_write_fw (dev_priv,DVSCNTR (pipe),0 );/* Disable the scaler */ -I915_WRITE_FW (DVSSCALE (pipe),0 ); -I915_WRITE_FW (DVSSURF (pipe),0 ); +intel_de_write_fw (dev_priv,DVSSCALE (pipe),0 ); +intel_de_write_fw (dev_priv,DVSSURF (pipe),0 );spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); }
@@ -1851,7 +1881,7 @@ g4x_plane_get_hw_state(struct intel_plane *plane,if (!wakeref)return false; - ret =I915_READ (DVSCNTR (plane->pipe)) &DVS_ENABLE ; + ret =intel_de_read (dev_priv,DVSCNTR (plane->pipe)) &DVS_ENABLE ; *pipe = plane->pipe;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 29/33 drm/i915/tv: 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_tv.c | 138 ++++++++++++------------ 1 file changed, 72 insertions(+), 66 deletions(-)
drivers/gpu/drm/i915/display/intel_tv.c +72 -66
@@ -907,7 +907,7 @@ static bool intel_tv_get_hw_state(struct intel_encoder *encoder, enum pipe *pipe) { struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); -u32 tmp =I915_READ (TV_CTL ); +u32 tmp =intel_de_read (dev_priv,TV_CTL ); *pipe = (tmp &TV_ENC_PIPE_SEL_MASK ) >>TV_ENC_PIPE_SEL_SHIFT ;
@@ -926,7 +926,8 @@ intel_enable_tv(struct intel_encoder *encoder,intel_wait_for_vblank (dev_priv,to_intel_crtc (pipe_config->uapi.crtc)->pipe); -I915_WRITE (TV_CTL ,I915_READ (TV_CTL ) |TV_ENC_ENABLE ); +intel_de_write (dev_priv,TV_CTL , +intel_de_read (dev_priv,TV_CTL ) |TV_ENC_ENABLE ); } static void
@@ -937,7 +938,8 @@ intel_disable_tv(struct intel_encoder *encoder,struct drm_device *dev = encoder->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -I915_WRITE (TV_CTL ,I915_READ (TV_CTL ) & ~TV_ENC_ENABLE ); +intel_de_write (dev_priv,TV_CTL , +intel_de_read (dev_priv,TV_CTL ) & ~TV_ENC_ENABLE ); }static const struct tv_mode *intel_tv_mode_find (const struct drm_connector_state *conn_state)
@@ -1095,11 +1097,11 @@ intel_tv_get_config(struct intel_encoder *encoder, pipe_config->output_types |=BIT (INTEL_OUTPUT_TVOUT ); - tv_ctl =I915_READ (TV_CTL ); - hctl1 =I915_READ (TV_H_CTL_1 ); - hctl3 =I915_READ (TV_H_CTL_3 ); - vctl1 =I915_READ (TV_V_CTL_1 ); - vctl2 =I915_READ (TV_V_CTL_2 ); + tv_ctl =intel_de_read (dev_priv,TV_CTL ); + hctl1 =intel_de_read (dev_priv,TV_H_CTL_1 ); + hctl3 =intel_de_read (dev_priv,TV_H_CTL_3 ); + vctl1 =intel_de_read (dev_priv,TV_V_CTL_1 ); + vctl2 =intel_de_read (dev_priv,TV_V_CTL_2 ); tv_mode.htotal = (hctl1 &TV_HTOTAL_MASK ) >>TV_HTOTAL_SHIFT ; tv_mode.hsync_end = (hctl1 &TV_HSYNC_END_MASK ) >>TV_HSYNC_END_SHIFT ;
@@ -1134,11 +1136,11 @@ intel_tv_get_config(struct intel_encoder *encoder,break ; } - tmp =I915_READ (TV_WIN_POS ); + tmp =intel_de_read (dev_priv,TV_WIN_POS ); xpos = tmp >>16 ; ypos = tmp &0xffff ; - tmp =I915_READ (TV_WIN_SIZE ); + tmp =intel_de_read (dev_priv,TV_WIN_SIZE ); xsize = tmp >>16 ; ysize = tmp &0xffff ;
@@ -1380,16 +1382,16 @@ set_tv_mode_timings(struct drm_i915_private *dev_priv, vctl7 = (tv_mode->vburst_start_f4 <<TV_VBURST_START_F4_SHIFT ) | (tv_mode->vburst_end_f4 <<TV_VBURST_END_F4_SHIFT ); -I915_WRITE (TV_H_CTL_1 , hctl1); -I915_WRITE (TV_H_CTL_2 , hctl2); -I915_WRITE (TV_H_CTL_3 , hctl3); -I915_WRITE (TV_V_CTL_1 , vctl1); -I915_WRITE (TV_V_CTL_2 , vctl2); -I915_WRITE (TV_V_CTL_3 , vctl3); -I915_WRITE (TV_V_CTL_4 , vctl4); -I915_WRITE (TV_V_CTL_5 , vctl5); -I915_WRITE (TV_V_CTL_6 , vctl6); -I915_WRITE (TV_V_CTL_7 , vctl7); +intel_de_write (dev_priv,TV_H_CTL_1 , hctl1); +intel_de_write (dev_priv,TV_H_CTL_2 , hctl2); +intel_de_write (dev_priv,TV_H_CTL_3 , hctl3); +intel_de_write (dev_priv,TV_V_CTL_1 , vctl1); +intel_de_write (dev_priv,TV_V_CTL_2 , vctl2); +intel_de_write (dev_priv,TV_V_CTL_3 , vctl3); +intel_de_write (dev_priv,TV_V_CTL_4 , vctl4); +intel_de_write (dev_priv,TV_V_CTL_5 , vctl5); +intel_de_write (dev_priv,TV_V_CTL_6 , vctl6); +intel_de_write (dev_priv,TV_V_CTL_7 , vctl7); } static void set_color_conversion(struct drm_i915_private *dev_priv,
@@ -1398,18 +1400,18 @@ static void set_color_conversion(struct drm_i915_private *dev_priv,if (!color_conversion)return ; -I915_WRITE (TV_CSC_Y , (color_conversion->ry <<16 ) | - color_conversion->gy); -I915_WRITE (TV_CSC_Y2 , (color_conversion->by <<16 ) | - color_conversion->ay); -I915_WRITE (TV_CSC_U , (color_conversion->ru <<16 ) | - color_conversion->gu); -I915_WRITE (TV_CSC_U2 , (color_conversion->bu <<16 ) | - color_conversion->au); -I915_WRITE (TV_CSC_V , (color_conversion->rv <<16 ) | - color_conversion->gv); -I915_WRITE (TV_CSC_V2 , (color_conversion->bv <<16 ) | - color_conversion->av); +intel_de_write (dev_priv,TV_CSC_Y , + (color_conversion->ry <<16 ) | color_conversion->gy); +intel_de_write (dev_priv,TV_CSC_Y2 , + (color_conversion->by <<16 ) | color_conversion->ay); +intel_de_write (dev_priv,TV_CSC_U , + (color_conversion->ru <<16 ) | color_conversion->gu); +intel_de_write (dev_priv,TV_CSC_U2 , + (color_conversion->bu <<16 ) | color_conversion->au); +intel_de_write (dev_priv,TV_CSC_V , + (color_conversion->rv <<16 ) | color_conversion->gv); +intel_de_write (dev_priv,TV_CSC_V2 , + (color_conversion->bv <<16 ) | color_conversion->av); } static void intel_tv_pre_enable(struct intel_encoder *encoder,
@@ -1434,7 +1436,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder,if (!tv_mode)return ;/* can't happen (mode_prepare prevents this) */ - tv_ctl =I915_READ (TV_CTL ); + tv_ctl =intel_de_read (dev_priv,TV_CTL ); tv_ctl &=TV_CTL_SAVE ;switch (intel_tv->type) {
@@ -1511,21 +1513,20 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder,set_tv_mode_timings (dev_priv, tv_mode, burst_ena); -I915_WRITE (TV_SC_CTL_1 , scctl1); -I915_WRITE (TV_SC_CTL_2 , scctl2); -I915_WRITE (TV_SC_CTL_3 , scctl3); +intel_de_write (dev_priv,TV_SC_CTL_1 , scctl1); +intel_de_write (dev_priv,TV_SC_CTL_2 , scctl2); +intel_de_write (dev_priv,TV_SC_CTL_3 , scctl3);set_color_conversion (dev_priv, color_conversion);if (INTEL_GEN (dev_priv) >=4 ) -I915_WRITE (TV_CLR_KNOBS ,0x00404000 ); +intel_de_write (dev_priv,TV_CLR_KNOBS ,0x00404000 );else -I915_WRITE (TV_CLR_KNOBS ,0x00606000 ); +intel_de_write (dev_priv,TV_CLR_KNOBS ,0x00606000 );if (video_levels) -I915_WRITE (TV_CLR_LEVEL , - ((video_levels->black <<TV_BLACK_LEVEL_SHIFT ) | - (video_levels->blank <<TV_BLANK_LEVEL_SHIFT ))); +intel_de_write (dev_priv,TV_CLR_LEVEL , + ((video_levels->black <<TV_BLACK_LEVEL_SHIFT ) | (video_levels->blank <<TV_BLANK_LEVEL_SHIFT )));assert_pipe_disabled (dev_priv, pipe_config->cpu_transcoder);
@@ -1533,7 +1534,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder, tv_filter_ctl =TV_AUTO_SCALE ;if (tv_conn_state->bypass_vfilter) tv_filter_ctl |=TV_V_FILTER_BYPASS ; -I915_WRITE (TV_FILTER_CTL_1 , tv_filter_ctl); +intel_de_write (dev_priv,TV_FILTER_CTL_1 , tv_filter_ctl); xsize = tv_mode->hblank_start - tv_mode->hblank_end; ysize =intel_tv_mode_vdisplay (tv_mode);
@@ -1544,20 +1545,25 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder, conn_state->tv.margins.right); ysize -= (tv_conn_state->margins.top + tv_conn_state->margins.bottom); -I915_WRITE (TV_WIN_POS , (xpos<<16 )|ypos); -I915_WRITE (TV_WIN_SIZE , (xsize<<16 )|ysize); +intel_de_write (dev_priv,TV_WIN_POS , (xpos <<16 ) | ypos); +intel_de_write (dev_priv,TV_WIN_SIZE , (xsize <<16 ) | ysize); j =0 ;for (i =0 ; i <60 ; i++) -I915_WRITE (TV_H_LUMA (i), tv_mode->filter_table[j++]); +intel_de_write (dev_priv,TV_H_LUMA (i), + tv_mode->filter_table[j++]);for (i =0 ; i <60 ; i++) -I915_WRITE (TV_H_CHROMA (i), tv_mode->filter_table[j++]); +intel_de_write (dev_priv,TV_H_CHROMA (i), + tv_mode->filter_table[j++]);for (i =0 ; i <43 ; i++) -I915_WRITE (TV_V_LUMA (i), tv_mode->filter_table[j++]); +intel_de_write (dev_priv,TV_V_LUMA (i), + tv_mode->filter_table[j++]);for (i =0 ; i <43 ; i++) -I915_WRITE (TV_V_CHROMA (i), tv_mode->filter_table[j++]); -I915_WRITE (TV_DAC ,I915_READ (TV_DAC ) &TV_DAC_SAVE ); -I915_WRITE (TV_CTL , tv_ctl); +intel_de_write (dev_priv,TV_V_CHROMA (i), + tv_mode->filter_table[j++]); +intel_de_write (dev_priv,TV_DAC , +intel_de_read (dev_priv,TV_DAC ) &TV_DAC_SAVE ); +intel_de_write (dev_priv,TV_CTL , tv_ctl); } static int
@@ -1581,8 +1587,8 @@ intel_tv_detect_type(struct intel_tv *intel_tv,spin_unlock_irq (&dev_priv->irq_lock); } - save_tv_dac = tv_dac =I915_READ (TV_DAC ); - save_tv_ctl = tv_ctl =I915_READ (TV_CTL ); + save_tv_dac = tv_dac =intel_de_read (dev_priv,TV_DAC ); + save_tv_ctl = tv_ctl =intel_de_read (dev_priv,TV_CTL );/* Poll for TV detection */ tv_ctl &= ~(TV_ENC_ENABLE |TV_ENC_PIPE_SEL_MASK |TV_TEST_MODE_MASK );
@@ -1608,14 +1614,14 @@ intel_tv_detect_type(struct intel_tv *intel_tv, tv_dac &= ~(TVDAC_STATE_CHG_EN |TVDAC_A_SENSE_CTL |TVDAC_B_SENSE_CTL |TVDAC_C_SENSE_CTL ); -I915_WRITE (TV_CTL , tv_ctl); -I915_WRITE (TV_DAC , tv_dac); -POSTING_READ (TV_DAC ); +intel_de_write (dev_priv,TV_CTL , tv_ctl); +intel_de_write (dev_priv,TV_DAC , tv_dac); +intel_de_posting_read (dev_priv,TV_DAC );intel_wait_for_vblank (dev_priv, intel_crtc->pipe); type =-1 ; - tv_dac =I915_READ (TV_DAC ); + tv_dac =intel_de_read (dev_priv,TV_DAC );DRM_DEBUG_KMS ("TV detected: %x, %x\n" , tv_ctl, tv_dac);/* * A B C
@@ -1637,9 +1643,9 @@ intel_tv_detect_type(struct intel_tv *intel_tv, type =-1 ; } -I915_WRITE (TV_DAC , save_tv_dac & ~TVDAC_STATE_CHG_EN ); -I915_WRITE (TV_CTL , save_tv_ctl); -POSTING_READ (TV_CTL ); +intel_de_write (dev_priv,TV_DAC , save_tv_dac & ~TVDAC_STATE_CHG_EN ); +intel_de_write (dev_priv,TV_CTL , save_tv_ctl); +intel_de_posting_read (dev_priv,TV_CTL );/* For unknown reasons the hw barfs if we don't do this vblank wait. */ intel_wait_for_vblank (dev_priv, intel_crtc->pipe);
@@ -1870,7 +1876,7 @@ intel_tv_init(struct drm_i915_private *dev_priv)int i, initial_mode =0 ;struct drm_connector_state *state; -if ((I915_READ (TV_CTL ) &TV_FUSE_STATE_MASK ) ==TV_FUSE_STATE_DISABLED ) +if ((intel_de_read (dev_priv,TV_CTL ) &TV_FUSE_STATE_MASK ) ==TV_FUSE_STATE_DISABLED )return ;if (!intel_bios_is_tv_present (dev_priv)) {
@@ -1882,15 +1888,15 @@ intel_tv_init(struct drm_i915_private *dev_priv)* Sanity check the TV output by checking to see if the * DAC register holds a value */ - save_tv_dac =I915_READ (TV_DAC ); + save_tv_dac =intel_de_read (dev_priv,TV_DAC ); -I915_WRITE (TV_DAC , save_tv_dac |TVDAC_STATE_CHG_EN ); - tv_dac_on =I915_READ (TV_DAC ); +intel_de_write (dev_priv,TV_DAC , save_tv_dac |TVDAC_STATE_CHG_EN ); + tv_dac_on =intel_de_read (dev_priv,TV_DAC ); -I915_WRITE (TV_DAC , save_tv_dac & ~TVDAC_STATE_CHG_EN ); - tv_dac_off =I915_READ (TV_DAC ); +intel_de_write (dev_priv,TV_DAC , save_tv_dac & ~TVDAC_STATE_CHG_EN ); + tv_dac_off =intel_de_read (dev_priv,TV_DAC ); -I915_WRITE (TV_DAC , save_tv_dac); +intel_de_write (dev_priv,TV_DAC , save_tv_dac);/* * If the register does not hold the state change enable
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx