drm/i915/display: mass conversion to intel_de_*() register accessors
Subsystems (3)
RFC 30/33 drm/i915/vdsc: 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_vdsc.c | 413 +++++++++++++--------- 1 file changed, 249 insertions(+), 164 deletions(-)
drivers/gpu/drm/i915/display/intel_vdsc.c +249 -164
@@ -520,18 +520,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder, pps_val |=DSC_VBR_ENABLE ;DRM_INFO ("PPS0 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_0 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_0 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_0 , pps_val); +intel_de_write (dev_priv,DSCC_PICTURE_PARAMETER_SET_0 , + pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_0 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_0 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_0 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_0 (pipe), + pps_val); }/* Populate PICTURE_PARAMETER_SET_1 registers */
@@ -539,18 +544,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder, pps_val |=DSC_BPP (vdsc_cfg->bits_per_pixel);DRM_INFO ("PPS1 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_1 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_1 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_1 , pps_val); +intel_de_write (dev_priv,DSCC_PICTURE_PARAMETER_SET_1 , + pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_1 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_1 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_1 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_1 (pipe), + pps_val); }/* Populate PICTURE_PARAMETER_SET_2 registers */
@@ -559,18 +569,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder,DSC_PIC_WIDTH (vdsc_cfg->pic_width / num_vdsc_instances);DRM_INFO ("PPS2 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_2 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_2 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_2 , pps_val); +intel_de_write (dev_priv,DSCC_PICTURE_PARAMETER_SET_2 , + pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_2 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_2 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_2 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_2 (pipe), + pps_val); }/* Populate PICTURE_PARAMETER_SET_3 registers */
@@ -579,18 +594,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder,DSC_SLICE_WIDTH (vdsc_cfg->slice_width);DRM_INFO ("PPS3 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_3 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_3 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_3 , pps_val); +intel_de_write (dev_priv,DSCC_PICTURE_PARAMETER_SET_3 , + pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_3 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_3 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_3 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_3 (pipe), + pps_val); }/* Populate PICTURE_PARAMETER_SET_4 registers */
@@ -599,18 +619,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder,DSC_INITIAL_DEC_DELAY (vdsc_cfg->initial_dec_delay);DRM_INFO ("PPS4 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_4 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_4 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_4 , pps_val); +intel_de_write (dev_priv,DSCC_PICTURE_PARAMETER_SET_4 , + pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_4 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_4 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_4 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_4 (pipe), + pps_val); }/* Populate PICTURE_PARAMETER_SET_5 registers */
@@ -619,18 +644,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder,DSC_SCALE_DEC_INT (vdsc_cfg->scale_decrement_interval);DRM_INFO ("PPS5 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_5 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_5 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_5 , pps_val); +intel_de_write (dev_priv,DSCC_PICTURE_PARAMETER_SET_5 , + pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_5 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_5 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_5 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_5 (pipe), + pps_val); }/* Populate PICTURE_PARAMETER_SET_6 registers */
@@ -641,18 +671,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder,DSC_FLATNESS_MAX_QP (vdsc_cfg->flatness_max_qp);DRM_INFO ("PPS6 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_6 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_6 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_6 , pps_val); +intel_de_write (dev_priv,DSCC_PICTURE_PARAMETER_SET_6 , + pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_6 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_6 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_6 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_6 (pipe), + pps_val); }/* Populate PICTURE_PARAMETER_SET_7 registers */
@@ -661,18 +696,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder,DSC_NFL_BPG_OFFSET (vdsc_cfg->nfl_bpg_offset);DRM_INFO ("PPS7 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_7 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_7 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_7 , pps_val); +intel_de_write (dev_priv,DSCC_PICTURE_PARAMETER_SET_7 , + pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_7 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_7 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_7 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_7 (pipe), + pps_val); }/* Populate PICTURE_PARAMETER_SET_8 registers */
@@ -681,18 +721,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder,DSC_INITIAL_OFFSET (vdsc_cfg->initial_offset);DRM_INFO ("PPS8 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_8 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_8 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_8 , pps_val); +intel_de_write (dev_priv,DSCC_PICTURE_PARAMETER_SET_8 , + pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_8 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_8 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_8 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_8 (pipe), + pps_val); }/* Populate PICTURE_PARAMETER_SET_9 registers */
@@ -701,18 +746,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder,DSC_RC_EDGE_FACTOR (DSC_RC_EDGE_FACTOR_CONST );DRM_INFO ("PPS9 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_9 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_9 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_9 , pps_val); +intel_de_write (dev_priv,DSCC_PICTURE_PARAMETER_SET_9 , + pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_9 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_9 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_9 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_9 (pipe), + pps_val); }/* Populate PICTURE_PARAMETER_SET_10 registers */
@@ -723,18 +773,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder,DSC_RC_TARGET_OFF_LOW (DSC_RC_TGT_OFFSET_LO_CONST );DRM_INFO ("PPS10 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_10 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_10 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_10 , pps_val); +intel_de_write (dev_priv, +DSCC_PICTURE_PARAMETER_SET_10 , pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_10 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_10 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_10 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_10 (pipe), + pps_val); }/* Populate Picture parameter set 16 */
@@ -746,18 +801,23 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder, vdsc_cfg->slice_height);DRM_INFO ("PPS16 = 0x%08x\n" , pps_val);if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_PICTURE_PARAMETER_SET_16 , pps_val); +intel_de_write (dev_priv,DSCA_PICTURE_PARAMETER_SET_16 , + pps_val);/* * If 2 VDSC instances are needed, configure PPS for second * VDSC */ if (crtc_state->dsc.dsc_split) -I915_WRITE (DSCC_PICTURE_PARAMETER_SET_16 , pps_val); +intel_de_write (dev_priv, +DSCC_PICTURE_PARAMETER_SET_16 , pps_val); }else { -I915_WRITE (ICL_DSC0_PICTURE_PARAMETER_SET_16 (pipe), pps_val); +intel_de_write (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_16 (pipe), + pps_val);if (crtc_state->dsc.dsc_split) -I915_WRITE (ICL_DSC1_PICTURE_PARAMETER_SET_16 (pipe), - pps_val); +intel_de_write (dev_priv, +ICL_DSC1_PICTURE_PARAMETER_SET_16 (pipe), + pps_val); }/* Populate the RC_BUF_THRESH registers */
@@ -770,38 +830,46 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder, rc_buf_thresh_dword[i / 4]); }if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_RC_BUF_THRESH_0 , rc_buf_thresh_dword[0 ]); -I915_WRITE (DSCA_RC_BUF_THRESH_0_UDW , rc_buf_thresh_dword[1 ]); -I915_WRITE (DSCA_RC_BUF_THRESH_1 , rc_buf_thresh_dword[2 ]); -I915_WRITE (DSCA_RC_BUF_THRESH_1_UDW , rc_buf_thresh_dword[3 ]); +intel_de_write (dev_priv,DSCA_RC_BUF_THRESH_0 , + rc_buf_thresh_dword[0 ]); +intel_de_write (dev_priv,DSCA_RC_BUF_THRESH_0_UDW , + rc_buf_thresh_dword[1 ]); +intel_de_write (dev_priv,DSCA_RC_BUF_THRESH_1 , + rc_buf_thresh_dword[2 ]); +intel_de_write (dev_priv,DSCA_RC_BUF_THRESH_1_UDW , + rc_buf_thresh_dword[3 ]);if (crtc_state->dsc.dsc_split) { -I915_WRITE (DSCC_RC_BUF_THRESH_0 , - rc_buf_thresh_dword[0 ]); -I915_WRITE (DSCC_RC_BUF_THRESH_0_UDW , - rc_buf_thresh_dword[1 ]); -I915_WRITE (DSCC_RC_BUF_THRESH_1 , - rc_buf_thresh_dword[2 ]); -I915_WRITE (DSCC_RC_BUF_THRESH_1_UDW , - rc_buf_thresh_dword[3 ]); +intel_de_write (dev_priv,DSCC_RC_BUF_THRESH_0 , + rc_buf_thresh_dword[0 ]); +intel_de_write (dev_priv,DSCC_RC_BUF_THRESH_0_UDW , + rc_buf_thresh_dword[1 ]); +intel_de_write (dev_priv,DSCC_RC_BUF_THRESH_1 , + rc_buf_thresh_dword[2 ]); +intel_de_write (dev_priv,DSCC_RC_BUF_THRESH_1_UDW , + rc_buf_thresh_dword[3 ]); } }else { -I915_WRITE (ICL_DSC0_RC_BUF_THRESH_0 (pipe), - rc_buf_thresh_dword[0 ]); -I915_WRITE (ICL_DSC0_RC_BUF_THRESH_0_UDW (pipe), - rc_buf_thresh_dword[1 ]); -I915_WRITE (ICL_DSC0_RC_BUF_THRESH_1 (pipe), - rc_buf_thresh_dword[2 ]); -I915_WRITE (ICL_DSC0_RC_BUF_THRESH_1_UDW (pipe), - rc_buf_thresh_dword[3 ]); +intel_de_write (dev_priv,ICL_DSC0_RC_BUF_THRESH_0 (pipe), + rc_buf_thresh_dword[0 ]); +intel_de_write (dev_priv,ICL_DSC0_RC_BUF_THRESH_0_UDW (pipe), + rc_buf_thresh_dword[1 ]); +intel_de_write (dev_priv,ICL_DSC0_RC_BUF_THRESH_1 (pipe), + rc_buf_thresh_dword[2 ]); +intel_de_write (dev_priv,ICL_DSC0_RC_BUF_THRESH_1_UDW (pipe), + rc_buf_thresh_dword[3 ]);if (crtc_state->dsc.dsc_split) { -I915_WRITE (ICL_DSC1_RC_BUF_THRESH_0 (pipe), - rc_buf_thresh_dword[0 ]); -I915_WRITE (ICL_DSC1_RC_BUF_THRESH_0_UDW (pipe), - rc_buf_thresh_dword[1 ]); -I915_WRITE (ICL_DSC1_RC_BUF_THRESH_1 (pipe), - rc_buf_thresh_dword[2 ]); -I915_WRITE (ICL_DSC1_RC_BUF_THRESH_1_UDW (pipe), - rc_buf_thresh_dword[3 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_BUF_THRESH_0 (pipe), + rc_buf_thresh_dword[0 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_BUF_THRESH_0_UDW (pipe), + rc_buf_thresh_dword[1 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_BUF_THRESH_1 (pipe), + rc_buf_thresh_dword[2 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_BUF_THRESH_1_UDW (pipe), + rc_buf_thresh_dword[3 ]); } }
@@ -819,74 +887,90 @@ static void intel_dsc_pps_configure(struct intel_encoder *encoder, rc_range_params_dword[i / 2]); }if (!is_pipe_dsc (crtc_state)) { -I915_WRITE (DSCA_RC_RANGE_PARAMETERS_0 , - rc_range_params_dword[0 ]); -I915_WRITE (DSCA_RC_RANGE_PARAMETERS_0_UDW , - rc_range_params_dword[1 ]); -I915_WRITE (DSCA_RC_RANGE_PARAMETERS_1 , - rc_range_params_dword[2 ]); -I915_WRITE (DSCA_RC_RANGE_PARAMETERS_1_UDW , - rc_range_params_dword[3 ]); -I915_WRITE (DSCA_RC_RANGE_PARAMETERS_2 , - rc_range_params_dword[4 ]); -I915_WRITE (DSCA_RC_RANGE_PARAMETERS_2_UDW , - rc_range_params_dword[5 ]); -I915_WRITE (DSCA_RC_RANGE_PARAMETERS_3 , - rc_range_params_dword[6 ]); -I915_WRITE (DSCA_RC_RANGE_PARAMETERS_3_UDW , - rc_range_params_dword[7 ]); +intel_de_write (dev_priv,DSCA_RC_RANGE_PARAMETERS_0 , + rc_range_params_dword[0 ]); +intel_de_write (dev_priv,DSCA_RC_RANGE_PARAMETERS_0_UDW , + rc_range_params_dword[1 ]); +intel_de_write (dev_priv,DSCA_RC_RANGE_PARAMETERS_1 , + rc_range_params_dword[2 ]); +intel_de_write (dev_priv,DSCA_RC_RANGE_PARAMETERS_1_UDW , + rc_range_params_dword[3 ]); +intel_de_write (dev_priv,DSCA_RC_RANGE_PARAMETERS_2 , + rc_range_params_dword[4 ]); +intel_de_write (dev_priv,DSCA_RC_RANGE_PARAMETERS_2_UDW , + rc_range_params_dword[5 ]); +intel_de_write (dev_priv,DSCA_RC_RANGE_PARAMETERS_3 , + rc_range_params_dword[6 ]); +intel_de_write (dev_priv,DSCA_RC_RANGE_PARAMETERS_3_UDW , + rc_range_params_dword[7 ]);if (crtc_state->dsc.dsc_split) { -I915_WRITE (DSCC_RC_RANGE_PARAMETERS_0 , - rc_range_params_dword[0 ]); -I915_WRITE (DSCC_RC_RANGE_PARAMETERS_0_UDW , - rc_range_params_dword[1 ]); -I915_WRITE (DSCC_RC_RANGE_PARAMETERS_1 , - rc_range_params_dword[2 ]); -I915_WRITE (DSCC_RC_RANGE_PARAMETERS_1_UDW , - rc_range_params_dword[3 ]); -I915_WRITE (DSCC_RC_RANGE_PARAMETERS_2 , - rc_range_params_dword[4 ]); -I915_WRITE (DSCC_RC_RANGE_PARAMETERS_2_UDW , - rc_range_params_dword[5 ]); -I915_WRITE (DSCC_RC_RANGE_PARAMETERS_3 , - rc_range_params_dword[6 ]); -I915_WRITE (DSCC_RC_RANGE_PARAMETERS_3_UDW , - rc_range_params_dword[7 ]); +intel_de_write (dev_priv,DSCC_RC_RANGE_PARAMETERS_0 , + rc_range_params_dword[0 ]); +intel_de_write (dev_priv, +DSCC_RC_RANGE_PARAMETERS_0_UDW , + rc_range_params_dword[1 ]); +intel_de_write (dev_priv,DSCC_RC_RANGE_PARAMETERS_1 , + rc_range_params_dword[2 ]); +intel_de_write (dev_priv, +DSCC_RC_RANGE_PARAMETERS_1_UDW , + rc_range_params_dword[3 ]); +intel_de_write (dev_priv,DSCC_RC_RANGE_PARAMETERS_2 , + rc_range_params_dword[4 ]); +intel_de_write (dev_priv, +DSCC_RC_RANGE_PARAMETERS_2_UDW , + rc_range_params_dword[5 ]); +intel_de_write (dev_priv,DSCC_RC_RANGE_PARAMETERS_3 , + rc_range_params_dword[6 ]); +intel_de_write (dev_priv, +DSCC_RC_RANGE_PARAMETERS_3_UDW , + rc_range_params_dword[7 ]); } }else { -I915_WRITE (ICL_DSC0_RC_RANGE_PARAMETERS_0 (pipe), - rc_range_params_dword[0 ]); -I915_WRITE (ICL_DSC0_RC_RANGE_PARAMETERS_0_UDW (pipe), - rc_range_params_dword[1 ]); -I915_WRITE (ICL_DSC0_RC_RANGE_PARAMETERS_1 (pipe), - rc_range_params_dword[2 ]); -I915_WRITE (ICL_DSC0_RC_RANGE_PARAMETERS_1_UDW (pipe), - rc_range_params_dword[3 ]); -I915_WRITE (ICL_DSC0_RC_RANGE_PARAMETERS_2 (pipe), - rc_range_params_dword[4 ]); -I915_WRITE (ICL_DSC0_RC_RANGE_PARAMETERS_2_UDW (pipe), - rc_range_params_dword[5 ]); -I915_WRITE (ICL_DSC0_RC_RANGE_PARAMETERS_3 (pipe), - rc_range_params_dword[6 ]); -I915_WRITE (ICL_DSC0_RC_RANGE_PARAMETERS_3_UDW (pipe), - rc_range_params_dword[7 ]); +intel_de_write (dev_priv,ICL_DSC0_RC_RANGE_PARAMETERS_0 (pipe), + rc_range_params_dword[0 ]); +intel_de_write (dev_priv, +ICL_DSC0_RC_RANGE_PARAMETERS_0_UDW (pipe), + rc_range_params_dword[1 ]); +intel_de_write (dev_priv,ICL_DSC0_RC_RANGE_PARAMETERS_1 (pipe), + rc_range_params_dword[2 ]); +intel_de_write (dev_priv, +ICL_DSC0_RC_RANGE_PARAMETERS_1_UDW (pipe), + rc_range_params_dword[3 ]); +intel_de_write (dev_priv,ICL_DSC0_RC_RANGE_PARAMETERS_2 (pipe), + rc_range_params_dword[4 ]); +intel_de_write (dev_priv, +ICL_DSC0_RC_RANGE_PARAMETERS_2_UDW (pipe), + rc_range_params_dword[5 ]); +intel_de_write (dev_priv,ICL_DSC0_RC_RANGE_PARAMETERS_3 (pipe), + rc_range_params_dword[6 ]); +intel_de_write (dev_priv, +ICL_DSC0_RC_RANGE_PARAMETERS_3_UDW (pipe), + rc_range_params_dword[7 ]);if (crtc_state->dsc.dsc_split) { -I915_WRITE (ICL_DSC1_RC_RANGE_PARAMETERS_0 (pipe), - rc_range_params_dword[0 ]); -I915_WRITE (ICL_DSC1_RC_RANGE_PARAMETERS_0_UDW (pipe), - rc_range_params_dword[1 ]); -I915_WRITE (ICL_DSC1_RC_RANGE_PARAMETERS_1 (pipe), - rc_range_params_dword[2 ]); -I915_WRITE (ICL_DSC1_RC_RANGE_PARAMETERS_1_UDW (pipe), - rc_range_params_dword[3 ]); -I915_WRITE (ICL_DSC1_RC_RANGE_PARAMETERS_2 (pipe), - rc_range_params_dword[4 ]); -I915_WRITE (ICL_DSC1_RC_RANGE_PARAMETERS_2_UDW (pipe), - rc_range_params_dword[5 ]); -I915_WRITE (ICL_DSC1_RC_RANGE_PARAMETERS_3 (pipe), - rc_range_params_dword[6 ]); -I915_WRITE (ICL_DSC1_RC_RANGE_PARAMETERS_3_UDW (pipe), - rc_range_params_dword[7 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_RANGE_PARAMETERS_0 (pipe), + rc_range_params_dword[0 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_RANGE_PARAMETERS_0_UDW (pipe), + rc_range_params_dword[1 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_RANGE_PARAMETERS_1 (pipe), + rc_range_params_dword[2 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_RANGE_PARAMETERS_1_UDW (pipe), + rc_range_params_dword[3 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_RANGE_PARAMETERS_2 (pipe), + rc_range_params_dword[4 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_RANGE_PARAMETERS_2_UDW (pipe), + rc_range_params_dword[5 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_RANGE_PARAMETERS_3 (pipe), + rc_range_params_dword[6 ]); +intel_de_write (dev_priv, +ICL_DSC1_RC_RANGE_PARAMETERS_3_UDW (pipe), + rc_range_params_dword[7 ]); } } }
@@ -912,11 +996,11 @@ void intel_dsc_get_config(struct intel_encoder *encoder,return ;if (!is_pipe_dsc (crtc_state)) { - dss_ctl1 =I915_READ (DSS_CTL1 ); - dss_ctl2 =I915_READ (DSS_CTL2 ); + dss_ctl1 =intel_de_read (dev_priv,DSS_CTL1 ); + dss_ctl2 =intel_de_read (dev_priv,DSS_CTL2 ); }else { - dss_ctl1 =I915_READ (ICL_PIPE_DSS_CTL1 (pipe)); - dss_ctl2 =I915_READ (ICL_PIPE_DSS_CTL2 (pipe)); + dss_ctl1 =intel_de_read (dev_priv,ICL_PIPE_DSS_CTL1 (pipe)); + dss_ctl2 =intel_de_read (dev_priv,ICL_PIPE_DSS_CTL2 (pipe)); } crtc_state->dsc.compression_enable = dss_ctl2 &LEFT_BRANCH_VDSC_ENABLE ;
@@ -930,9 +1014,10 @@ void intel_dsc_get_config(struct intel_encoder *encoder,/* PPS1 */ if (!is_pipe_dsc (crtc_state)) - val =I915_READ (DSCA_PICTURE_PARAMETER_SET_1 ); + val =intel_de_read (dev_priv,DSCA_PICTURE_PARAMETER_SET_1 );else - val =I915_READ (ICL_DSC0_PICTURE_PARAMETER_SET_1 (pipe)); + val =intel_de_read (dev_priv, +ICL_DSC0_PICTURE_PARAMETER_SET_1 (pipe)); vdsc_cfg->bits_per_pixel = val; crtc_state->dsc.compressed_bpp = vdsc_cfg->bits_per_pixel >>4 ; out:
@@ -1013,8 +1098,8 @@ void intel_dsc_enable(struct intel_encoder *encoder, dss_ctl2_val |=RIGHT_BRANCH_VDSC_ENABLE ; dss_ctl1_val |=JOINER_ENABLE ; } -I915_WRITE (dss_ctl1_reg, dss_ctl1_val); -I915_WRITE (dss_ctl2_reg, dss_ctl2_val); +intel_de_write (dev_priv, dss_ctl1_reg, dss_ctl1_val); +intel_de_write (dev_priv, dss_ctl2_reg, dss_ctl2_val); }void intel_dsc_disable (const struct intel_crtc_state *old_crtc_state)
@@ -1035,17 +1120,17 @@ void intel_dsc_disable(const struct intel_crtc_state *old_crtc_state) dss_ctl1_reg =ICL_PIPE_DSS_CTL1 (pipe); dss_ctl2_reg =ICL_PIPE_DSS_CTL2 (pipe); } - dss_ctl1_val =I915_READ (dss_ctl1_reg); + dss_ctl1_val =intel_de_read (dev_priv, dss_ctl1_reg);if (dss_ctl1_val &JOINER_ENABLE ) dss_ctl1_val &= ~JOINER_ENABLE ; -I915_WRITE (dss_ctl1_reg, dss_ctl1_val); +intel_de_write (dev_priv, dss_ctl1_reg, dss_ctl1_val); - dss_ctl2_val =I915_READ (dss_ctl2_reg); + dss_ctl2_val =intel_de_read (dev_priv, dss_ctl2_reg);if (dss_ctl2_val &LEFT_BRANCH_VDSC_ENABLE || dss_ctl2_val &RIGHT_BRANCH_VDSC_ENABLE ) dss_ctl2_val &= ~(LEFT_BRANCH_VDSC_ENABLE |RIGHT_BRANCH_VDSC_ENABLE ); -I915_WRITE (dss_ctl2_reg, dss_ctl2_val); +intel_de_write (dev_priv, dss_ctl2_reg, dss_ctl2_val);/* Disable Power wells for VDSC/joining */ intel_display_power_put_unchecked(dev_priv,
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 31/33 drm/i915/vga: 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_vga.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_vga.c +4 -3
@@ -9,6 +9,7 @@#include <drm/i915_drm.h> #include "i915_drv.h" +#include "intel_de.h" #include "intel_vga.h" static i915_reg_t intel_vga_cntrl_reg (struct drm_i915_private *i915)
@@ -36,15 +37,15 @@ void intel_vga_disable(struct drm_i915_private *dev_priv)vga_put (pdev,VGA_RSRC_LEGACY_IO );udelay (300 ); -I915_WRITE (vga_reg,VGA_DISP_DISABLE ); -POSTING_READ (vga_reg); +intel_de_write (dev_priv, vga_reg,VGA_DISP_DISABLE ); +intel_de_posting_read (dev_priv, vga_reg); }void intel_vga_redisable_power_on (struct drm_i915_private *dev_priv) {i915_reg_t vga_reg =intel_vga_cntrl_reg (dev_priv); -if (!(I915_READ (vga_reg) &VGA_DISP_DISABLE )) { +if (!(intel_de_read (dev_priv, vga_reg) &VGA_DISP_DISABLE )) {DRM_DEBUG_KMS ("Something enabled VGA plane, disabling it\n" );intel_vga_disable (dev_priv); }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 32/33 drm/i915/vlv_dsi: use intel_de_*() functions for register access
In reply to Jani NikulaThe implicit "dev_priv" local variable use has been a long-standing pain point in the register access macros I915_READ(), I915_WRITE(), POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register accessors intel_de_read(), intel_de_write(), intel_de_posting_read(), intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
--- drivers/gpu/drm/i915/display/vlv_dsi.c | 345 +++++++++++++------------ 1 file changed, 180 insertions(+), 165 deletions(-)
drivers/gpu/drm/i915/display/vlv_dsi.c +180 -165
@@ -100,7 +100,7 @@ static void write_data(struct drm_i915_private *dev_priv,for (j =0 ; j <min_t (u32, len - i,4 ); j++) val |= *data++ <<8 * j; -I915_WRITE (reg, val); +intel_de_write (dev_priv, reg, val); } }
@@ -111,7 +111,7 @@ static void read_data(struct drm_i915_private *dev_priv,u32 i, j;for (i =0 ; i < len; i +=4 ) { -u32 val =I915_READ (reg); +u32 val =intel_de_read (dev_priv, reg);for (j =0 ; j <min_t (u32, len - i,4 ); j++) *data++ = val >>8 * j;
@@ -161,7 +161,8 @@ static ssize_t intel_dsi_host_transfer(struct mipi_dsi_host *host, }if (msg->rx_len) { -I915_WRITE (MIPI_INTR_STAT (port),GEN_READ_DATA_AVAIL ); +intel_de_write (dev_priv,MIPI_INTR_STAT (port), +GEN_READ_DATA_AVAIL ); } if (intel_de_wait_for_clear(dev_priv, MIPI_GEN_FIFO_STAT(port),
@@ -169,7 +170,8 @@ static ssize_t intel_dsi_host_transfer(struct mipi_dsi_host *host,DRM_ERROR ("Timeout waiting for HS/LP CTRL FIFO !full\n" ); } -I915_WRITE (ctrl_reg, header[2 ] <<16 | header[1 ] <<8 | header[0 ]); +intel_de_write (dev_priv, ctrl_reg, + header[2 ] <<16 | header[1 ] <<8 | header[0 ]);/* ->rx_len is set only for reads */ if (msg->rx_len) {
@@ -223,13 +225,13 @@ static int dpi_send_cmd(struct intel_dsi *intel_dsi, u32 cmd, bool hs, cmd |=DPI_LP_MODE ;/* clear bit */ -I915_WRITE (MIPI_INTR_STAT (port),SPL_PKT_SENT_INTERRUPT ); +intel_de_write (dev_priv,MIPI_INTR_STAT (port),SPL_PKT_SENT_INTERRUPT );/* XXX: old code skips write if control unchanged */ -if (cmd ==I915_READ (MIPI_DPI_CONTROL (port))) +if (cmd ==intel_de_read (dev_priv,MIPI_DPI_CONTROL (port)))DRM_DEBUG_KMS ("Same special packet %02x twice in a row.\n" , cmd); -I915_WRITE (MIPI_DPI_CONTROL (port), cmd); +intel_de_write (dev_priv,MIPI_DPI_CONTROL (port), cmd); mask =SPL_PKT_SENT_INTERRUPT ;if (intel_de_wait_for_set (dev_priv,MIPI_INTR_STAT (port), mask,100 ))
@@ -328,23 +330,24 @@ static bool glk_dsi_enable_io(struct intel_encoder *encoder)* Power ON MIPI IO first and then write into IO reset and LP wake bits */ for_each_dsi_port (port, intel_dsi->ports) { - tmp =I915_READ (MIPI_CTRL (port)); -I915_WRITE (MIPI_CTRL (port), tmp |GLK_MIPIIO_ENABLE ); + tmp =intel_de_read (dev_priv,MIPI_CTRL (port)); +intel_de_write (dev_priv,MIPI_CTRL (port), + tmp |GLK_MIPIIO_ENABLE ); }/* Put the IO into reset */ - tmp =I915_READ (MIPI_CTRL (PORT_A )); + tmp =intel_de_read (dev_priv,MIPI_CTRL (PORT_A )); tmp &= ~GLK_MIPIIO_RESET_RELEASED ; -I915_WRITE (MIPI_CTRL (PORT_A ), tmp); +intel_de_write (dev_priv,MIPI_CTRL (PORT_A ), tmp);/* Program LP Wake */ for_each_dsi_port (port, intel_dsi->ports) { - tmp =I915_READ (MIPI_CTRL (port)); -if (!(I915_READ (MIPI_DEVICE_READY (port)) &DEVICE_READY )) + tmp =intel_de_read (dev_priv,MIPI_CTRL (port)); +if (!(intel_de_read (dev_priv,MIPI_DEVICE_READY (port)) &DEVICE_READY )) tmp &= ~GLK_LP_WAKE ;else tmp |=GLK_LP_WAKE ; -I915_WRITE (MIPI_CTRL (port), tmp); +intel_de_write (dev_priv,MIPI_CTRL (port), tmp); }/* Wait for Pwr ACK */
@@ -357,7 +360,7 @@ static bool glk_dsi_enable_io(struct intel_encoder *encoder)/* Check for cold boot scenario */ for_each_dsi_port (port, intel_dsi->ports) { cold_boot |= - !(I915_READ (MIPI_DEVICE_READY (port)) &DEVICE_READY ); + !(intel_de_read (dev_priv,MIPI_DEVICE_READY (port)) &DEVICE_READY ); }return cold_boot;
@@ -378,23 +381,24 @@ static void glk_dsi_device_ready(struct intel_encoder *encoder) }/* Get IO out of reset */ - val =I915_READ (MIPI_CTRL (PORT_A )); -I915_WRITE (MIPI_CTRL (PORT_A ), val |GLK_MIPIIO_RESET_RELEASED ); + val =intel_de_read (dev_priv,MIPI_CTRL (PORT_A )); +intel_de_write (dev_priv,MIPI_CTRL (PORT_A ), + val |GLK_MIPIIO_RESET_RELEASED );/* Get IO out of Low power state*/ for_each_dsi_port (port, intel_dsi->ports) { -if (!(I915_READ (MIPI_DEVICE_READY (port)) &DEVICE_READY )) { - val =I915_READ (MIPI_DEVICE_READY (port)); +if (!(intel_de_read (dev_priv,MIPI_DEVICE_READY (port)) &DEVICE_READY )) { + val =intel_de_read (dev_priv,MIPI_DEVICE_READY (port)); val &= ~ULPS_STATE_MASK ; val |=DEVICE_READY ; -I915_WRITE (MIPI_DEVICE_READY (port), val); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), val);usleep_range (10 ,15 ); }else {/* Enter ULPS */ - val =I915_READ (MIPI_DEVICE_READY (port)); + val =intel_de_read (dev_priv,MIPI_DEVICE_READY (port)); val &= ~ULPS_STATE_MASK ; val |= (ULPS_STATE_ENTER |DEVICE_READY ); -I915_WRITE (MIPI_DEVICE_READY (port), val); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), val);/* Wait for ULPS active */ if (intel_de_wait_for_clear(dev_priv, MIPI_CTRL(port),
@@ -402,20 +406,20 @@ static void glk_dsi_device_ready(struct intel_encoder *encoder)DRM_ERROR ("ULPS not active\n" );/* Exit ULPS */ - val =I915_READ (MIPI_DEVICE_READY (port)); + val =intel_de_read (dev_priv,MIPI_DEVICE_READY (port)); val &= ~ULPS_STATE_MASK ; val |= (ULPS_STATE_EXIT |DEVICE_READY ); -I915_WRITE (MIPI_DEVICE_READY (port), val); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), val);/* Enter Normal Mode */ - val =I915_READ (MIPI_DEVICE_READY (port)); + val =intel_de_read (dev_priv,MIPI_DEVICE_READY (port)); val &= ~ULPS_STATE_MASK ; val |= (ULPS_STATE_NORMAL_OPERATION |DEVICE_READY ); -I915_WRITE (MIPI_DEVICE_READY (port), val); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), val); - val =I915_READ (MIPI_CTRL (port)); + val =intel_de_read (dev_priv,MIPI_CTRL (port)); val &= ~GLK_LP_WAKE ; -I915_WRITE (MIPI_CTRL (port), val); +intel_de_write (dev_priv,MIPI_CTRL (port), val); } }
@@ -445,19 +449,20 @@ static void bxt_dsi_device_ready(struct intel_encoder *encoder)/* Enable MIPI PHY transparent latch */ for_each_dsi_port (port, intel_dsi->ports) { - val =I915_READ (BXT_MIPI_PORT_CTRL (port)); -I915_WRITE (BXT_MIPI_PORT_CTRL (port), val |LP_OUTPUT_HOLD ); + val =intel_de_read (dev_priv,BXT_MIPI_PORT_CTRL (port)); +intel_de_write (dev_priv,BXT_MIPI_PORT_CTRL (port), + val |LP_OUTPUT_HOLD );usleep_range (2000 ,2500 ); }/* Clear ULPS and set device ready */ for_each_dsi_port (port, intel_dsi->ports) { - val =I915_READ (MIPI_DEVICE_READY (port)); + val =intel_de_read (dev_priv,MIPI_DEVICE_READY (port)); val &= ~ULPS_STATE_MASK ; -I915_WRITE (MIPI_DEVICE_READY (port), val); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), val);usleep_range (2000 ,2500 ); val |=DEVICE_READY ; -I915_WRITE (MIPI_DEVICE_READY (port), val); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), val); } }
@@ -481,21 +486,25 @@ static void vlv_dsi_device_ready(struct intel_encoder *encoder)for_each_dsi_port (port, intel_dsi->ports) { -I915_WRITE (MIPI_DEVICE_READY (port),ULPS_STATE_ENTER ); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), +ULPS_STATE_ENTER );usleep_range (2500 ,3000 );/* Enable MIPI PHY transparent latch * Common bit for both MIPI Port A & MIPI Port C * No similar bit in MIPI Port C reg */ - val =I915_READ (MIPI_PORT_CTRL (PORT_A )); -I915_WRITE (MIPI_PORT_CTRL (PORT_A ), val |LP_OUTPUT_HOLD ); + val =intel_de_read (dev_priv,MIPI_PORT_CTRL (PORT_A )); +intel_de_write (dev_priv,MIPI_PORT_CTRL (PORT_A ), + val |LP_OUTPUT_HOLD );usleep_range (1000 ,1500 ); -I915_WRITE (MIPI_DEVICE_READY (port),ULPS_STATE_EXIT ); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), +ULPS_STATE_EXIT );usleep_range (2500 ,3000 ); -I915_WRITE (MIPI_DEVICE_READY (port),DEVICE_READY ); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), +DEVICE_READY );usleep_range (2500 ,3000 ); } }
@@ -521,10 +530,10 @@ static void glk_dsi_enter_low_power_mode(struct intel_encoder *encoder)/* Enter ULPS */ for_each_dsi_port (port, intel_dsi->ports) { - val =I915_READ (MIPI_DEVICE_READY (port)); + val =intel_de_read (dev_priv,MIPI_DEVICE_READY (port)); val &= ~ULPS_STATE_MASK ; val |= (ULPS_STATE_ENTER |DEVICE_READY ); -I915_WRITE (MIPI_DEVICE_READY (port), val); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), val); }/* Wait for MIPI PHY status bit to unset */
@@ -550,9 +559,9 @@ static void glk_dsi_disable_mipi_io(struct intel_encoder *encoder)u32 tmp;/* Put the IO into reset */ - tmp =I915_READ (MIPI_CTRL (PORT_A )); + tmp =intel_de_read (dev_priv,MIPI_CTRL (PORT_A )); tmp &= ~GLK_MIPIIO_RESET_RELEASED ; -I915_WRITE (MIPI_CTRL (PORT_A ), tmp); +intel_de_write (dev_priv,MIPI_CTRL (PORT_A ), tmp);/* Wait for MIPI PHY status bit to unset */ for_each_dsi_port (port, intel_dsi->ports) {
@@ -563,9 +572,9 @@ static void glk_dsi_disable_mipi_io(struct intel_encoder *encoder)/* Clear MIPI mode */ for_each_dsi_port (port, intel_dsi->ports) { - tmp =I915_READ (MIPI_CTRL (port)); + tmp =intel_de_read (dev_priv,MIPI_CTRL (port)); tmp &= ~GLK_MIPIIO_ENABLE ; -I915_WRITE (MIPI_CTRL (port), tmp); +intel_de_write (dev_priv,MIPI_CTRL (port), tmp); } }
@@ -588,16 +597,16 @@ static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder) BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(PORT_A);u32 val; -I915_WRITE (MIPI_DEVICE_READY (port),DEVICE_READY | -ULPS_STATE_ENTER ); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), +DEVICE_READY |ULPS_STATE_ENTER );usleep_range (2000 ,2500 ); -I915_WRITE (MIPI_DEVICE_READY (port),DEVICE_READY | -ULPS_STATE_EXIT ); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), +DEVICE_READY |ULPS_STATE_EXIT );usleep_range (2000 ,2500 ); -I915_WRITE (MIPI_DEVICE_READY (port),DEVICE_READY | -ULPS_STATE_ENTER ); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port), +DEVICE_READY |ULPS_STATE_ENTER );usleep_range (2000 ,2500 );/*
@@ -610,11 +619,11 @@ static void vlv_dsi_clear_device_ready(struct intel_encoder *encoder)DRM_ERROR ("DSI LP not going Low\n" );/* Disable MIPI PHY transparent latch */ - val =I915_READ (port_ctrl); -I915_WRITE (port_ctrl, val & ~LP_OUTPUT_HOLD ); + val =intel_de_read (dev_priv, port_ctrl); +intel_de_write (dev_priv, port_ctrl, val & ~LP_OUTPUT_HOLD );usleep_range (1000 ,1500 ); -I915_WRITE (MIPI_DEVICE_READY (port),0x00 ); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port),0x00 );usleep_range (2000 ,2500 ); } }
@@ -631,18 +640,20 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder,u32 temp;if (IS_GEN9_LP (dev_priv)) {for_each_dsi_port (port, intel_dsi->ports) { - temp =I915_READ (MIPI_CTRL (port)); + temp =intel_de_read (dev_priv, +MIPI_CTRL (port)); temp &= ~BXT_PIXEL_OVERLAP_CNT_MASK | intel_dsi->pixel_overlap <<BXT_PIXEL_OVERLAP_CNT_SHIFT ; -I915_WRITE (MIPI_CTRL (port), temp); +intel_de_write (dev_priv,MIPI_CTRL (port), + temp); } }else { - temp =I915_READ (VLV_CHICKEN_3 ); + temp =intel_de_read (dev_priv,VLV_CHICKEN_3 ); temp &= ~PIXEL_OVERLAP_CNT_MASK | intel_dsi->pixel_overlap <<PIXEL_OVERLAP_CNT_SHIFT ; -I915_WRITE (VLV_CHICKEN_3 , temp); +intel_de_write (dev_priv,VLV_CHICKEN_3 , temp); } }
@@ -651,7 +662,7 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder, BXT_MIPI_PORT_CTRL(port) : MIPI_PORT_CTRL(port);u32 temp; - temp =I915_READ (port_ctrl); + temp =intel_de_read (dev_priv, port_ctrl); temp &= ~LANE_CONFIGURATION_MASK ; temp &= ~DUAL_LINK_MODE_MASK ;
@@ -671,8 +682,8 @@ static void intel_dsi_port_enable(struct intel_encoder *encoder, temp |=DITHERING_ENABLE ;/* assert ip_tg_enable signal */ -I915_WRITE (port_ctrl, temp |DPI_ENABLE ); -POSTING_READ (port_ctrl); +intel_de_write (dev_priv, port_ctrl, temp |DPI_ENABLE ); +intel_de_posting_read (dev_priv, port_ctrl); } }
@@ -689,9 +700,9 @@ static void intel_dsi_port_disable(struct intel_encoder *encoder)u32 temp;/* de-assert ip_tg_enable signal */ - temp =I915_READ (port_ctrl); -I915_WRITE (port_ctrl, temp & ~DPI_ENABLE ); -POSTING_READ (port_ctrl); + temp =intel_de_read (dev_priv, port_ctrl); +intel_de_write (dev_priv, port_ctrl, temp & ~DPI_ENABLE ); +intel_de_posting_read (dev_priv, port_ctrl); } }
@@ -771,22 +782,22 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder,if (IS_BROXTON (dev_priv)) {/* Add MIPI IO reset programming for modeset */ - val =I915_READ (BXT_P_CR_GT_DISP_PWRON ); -I915_WRITE (BXT_P_CR_GT_DISP_PWRON , - val |MIPIO_RST_CTRL ); + val =intel_de_read (dev_priv,BXT_P_CR_GT_DISP_PWRON ); +intel_de_write (dev_priv,BXT_P_CR_GT_DISP_PWRON , + val |MIPIO_RST_CTRL );/* Power up DSI regulator */ -I915_WRITE (BXT_P_DSI_REGULATOR_CFG ,STAP_SELECT ); -I915_WRITE (BXT_P_DSI_REGULATOR_TX_CTRL ,0 ); +intel_de_write (dev_priv,BXT_P_DSI_REGULATOR_CFG ,STAP_SELECT ); +intel_de_write (dev_priv,BXT_P_DSI_REGULATOR_TX_CTRL ,0 ); }if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) {u32 val;/* Disable DPOunit clock gating, can stall pipe */ - val =I915_READ (DSPCLK_GATE_D ); + val =intel_de_read (dev_priv,DSPCLK_GATE_D ); val |=DPOUNIT_CLOCK_GATE_DISABLE ; -I915_WRITE (DSPCLK_GATE_D , val); +intel_de_write (dev_priv,DSPCLK_GATE_D , val); }if (!IS_GEMINILAKE (dev_priv))
@@ -820,7 +831,8 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder,* recommendation, port should be enabled befor plane & pipe */ if (is_cmd_mode (intel_dsi)) {for_each_dsi_port (port, intel_dsi->ports) -I915_WRITE (MIPI_MAX_RETURN_PKT_SIZE (port),8 *4 ); +intel_de_write (dev_priv, +MIPI_MAX_RETURN_PKT_SIZE (port),8 *4 );intel_dsi_vbt_exec_sequence (intel_dsi,MIPI_SEQ_TEAR_ON );intel_dsi_vbt_exec_sequence (intel_dsi,MIPI_SEQ_DISPLAY_ON ); }else {
@@ -917,13 +929,14 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder,if (IS_BROXTON (dev_priv)) {/* Power down DSI regulator to save power */ -I915_WRITE (BXT_P_DSI_REGULATOR_CFG ,STAP_SELECT ); -I915_WRITE (BXT_P_DSI_REGULATOR_TX_CTRL ,HS_IO_CTRL_SELECT ); +intel_de_write (dev_priv,BXT_P_DSI_REGULATOR_CFG ,STAP_SELECT ); +intel_de_write (dev_priv,BXT_P_DSI_REGULATOR_TX_CTRL , +HS_IO_CTRL_SELECT );/* Add MIPI IO reset programming for modeset */ - val =I915_READ (BXT_P_CR_GT_DISP_PWRON ); -I915_WRITE (BXT_P_CR_GT_DISP_PWRON , - val & ~MIPIO_RST_CTRL ); + val =intel_de_read (dev_priv,BXT_P_CR_GT_DISP_PWRON ); +intel_de_write (dev_priv,BXT_P_CR_GT_DISP_PWRON , + val & ~MIPIO_RST_CTRL ); }if (IS_GEN9_LP (dev_priv)) {
@@ -933,9 +946,9 @@ static void intel_dsi_post_disable(struct intel_encoder *encoder,vlv_dsi_pll_disable (encoder); - val =I915_READ (DSPCLK_GATE_D ); + val =intel_de_read (dev_priv,DSPCLK_GATE_D ); val &= ~DPOUNIT_CLOCK_GATE_DISABLE ; -I915_WRITE (DSPCLK_GATE_D , val); +intel_de_write (dev_priv,DSPCLK_GATE_D , val); }/* Assert reset */
@@ -979,7 +992,7 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,for_each_dsi_port (port, intel_dsi->ports) {i915_reg_t ctrl_reg =IS_GEN9_LP (dev_priv) ?BXT_MIPI_PORT_CTRL (port) :MIPI_PORT_CTRL (port); -bool enabled =I915_READ (ctrl_reg) &DPI_ENABLE ; +bool enabled =intel_de_read (dev_priv, ctrl_reg) &DPI_ENABLE ;/* * Due to some hardware limitations on VLV/CHV, the DPI enable
@@ -988,22 +1001,23 @@ static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,*/ if ((IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) && port ==PORT_C ) - enabled =I915_READ (PIPECONF (PIPE_B )) &PIPECONF_ENABLE ; + enabled =intel_de_read (dev_priv,PIPECONF (PIPE_B )) &PIPECONF_ENABLE ;/* Try command mode if video mode not enabled */ if (!enabled) { -u32 tmp =I915_READ (MIPI_DSI_FUNC_PRG (port)); +u32 tmp =intel_de_read (dev_priv, +MIPI_DSI_FUNC_PRG (port)); enabled = tmp &CMD_MODE_DATA_WIDTH_MASK ; }if (!enabled)continue ; -if (!(I915_READ (MIPI_DEVICE_READY (port)) &DEVICE_READY )) +if (!(intel_de_read (dev_priv,MIPI_DEVICE_READY (port)) &DEVICE_READY ))continue ;if (IS_GEN9_LP (dev_priv)) { -u32 tmp =I915_READ (MIPI_CTRL (port)); +u32 tmp =intel_de_read (dev_priv,MIPI_CTRL (port)); tmp &=BXT_PIPE_SELECT_MASK ; tmp >>=BXT_PIPE_SELECT_SHIFT ;
@@ -1051,11 +1065,11 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,* encoder->get_hw_state() returns true. */ for_each_dsi_port (port, intel_dsi->ports) { -if (I915_READ (BXT_MIPI_PORT_CTRL (port)) &DPI_ENABLE ) +if (intel_de_read (dev_priv,BXT_MIPI_PORT_CTRL (port)) &DPI_ENABLE )break ; } - fmt =I915_READ (MIPI_DSI_FUNC_PRG (port)) &VID_MODE_FORMAT_MASK ; + fmt =intel_de_read (dev_priv,MIPI_DSI_FUNC_PRG (port)) &VID_MODE_FORMAT_MASK ; bpp =mipi_dsi_pixel_format_to_bpp (pixel_format_from_register_bits (fmt));
@@ -1067,21 +1081,24 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder,/* In terms of pixels */ adjusted_mode->crtc_hdisplay = -I915_READ (BXT_MIPI_TRANS_HACTIVE (port)); +intel_de_read (dev_priv, +BXT_MIPI_TRANS_HACTIVE (port)); adjusted_mode->crtc_vdisplay = -I915_READ (BXT_MIPI_TRANS_VACTIVE (port)); +intel_de_read (dev_priv, +BXT_MIPI_TRANS_VACTIVE (port)); adjusted_mode->crtc_vtotal = -I915_READ (BXT_MIPI_TRANS_VTOTAL (port)); +intel_de_read (dev_priv, +BXT_MIPI_TRANS_VTOTAL (port)); hactive = adjusted_mode->crtc_hdisplay; - hfp =I915_READ (MIPI_HFP_COUNT (port)); + hfp =intel_de_read (dev_priv,MIPI_HFP_COUNT (port));/* * Meaningful for video mode non-burst sync pulse mode only, * can be zero for non-burst sync events and burst modes */ - hsync =I915_READ (MIPI_HSYNC_PADDING_COUNT (port)); - hbp =I915_READ (MIPI_HBP_COUNT (port)); + hsync =intel_de_read (dev_priv,MIPI_HSYNC_PADDING_COUNT (port)); + hbp =intel_de_read (dev_priv,MIPI_HBP_COUNT (port));/* harizontal values are in terms of high speed byte clock */ hfp = pixels_from_txbyteclkhs(hfp, bpp, lane_count,
@@ -1098,9 +1115,9 @@ static void bxt_dsi_get_pipe_config(struct intel_encoder *encoder, }/* vertical values are in terms of lines */ - vfp =I915_READ (MIPI_VFP_COUNT (port)); - vsync =I915_READ (MIPI_VSYNC_PADDING_COUNT (port)); - vbp =I915_READ (MIPI_VBP_COUNT (port)); + vfp =intel_de_read (dev_priv,MIPI_VFP_COUNT (port)); + vsync =intel_de_read (dev_priv,MIPI_VSYNC_PADDING_COUNT (port)); + vbp =intel_de_read (dev_priv,MIPI_VBP_COUNT (port)); adjusted_mode->crtc_htotal = hactive + hfp + hsync + hbp; adjusted_mode->crtc_hsync_start = hfp + adjusted_mode->crtc_hdisplay;
@@ -1268,26 +1285,29 @@ static void set_dsi_timings(struct drm_encoder *encoder,* vactive, as they are calculated per channel basis, * whereas these values should be based on resolution. */ -I915_WRITE (BXT_MIPI_TRANS_HACTIVE (port), - adjusted_mode->crtc_hdisplay); -I915_WRITE (BXT_MIPI_TRANS_VACTIVE (port), - adjusted_mode->crtc_vdisplay); -I915_WRITE (BXT_MIPI_TRANS_VTOTAL (port), - adjusted_mode->crtc_vtotal); +intel_de_write (dev_priv,BXT_MIPI_TRANS_HACTIVE (port), + adjusted_mode->crtc_hdisplay); +intel_de_write (dev_priv,BXT_MIPI_TRANS_VACTIVE (port), + adjusted_mode->crtc_vdisplay); +intel_de_write (dev_priv,BXT_MIPI_TRANS_VTOTAL (port), + adjusted_mode->crtc_vtotal); } -I915_WRITE (MIPI_HACTIVE_AREA_COUNT (port), hactive); -I915_WRITE (MIPI_HFP_COUNT (port), hfp); +intel_de_write (dev_priv,MIPI_HACTIVE_AREA_COUNT (port), + hactive); +intel_de_write (dev_priv,MIPI_HFP_COUNT (port), hfp);/* meaningful for video mode non-burst sync pulse mode only, * can be zero for non-burst sync events and burst modes */ -I915_WRITE (MIPI_HSYNC_PADDING_COUNT (port), hsync); -I915_WRITE (MIPI_HBP_COUNT (port), hbp); +intel_de_write (dev_priv,MIPI_HSYNC_PADDING_COUNT (port), + hsync); +intel_de_write (dev_priv,MIPI_HBP_COUNT (port), hbp);/* vertical values are in terms of lines */ -I915_WRITE (MIPI_VFP_COUNT (port), vfp); -I915_WRITE (MIPI_VSYNC_PADDING_COUNT (port), vsync); -I915_WRITE (MIPI_VBP_COUNT (port), vbp); +intel_de_write (dev_priv,MIPI_VFP_COUNT (port), vfp); +intel_de_write (dev_priv,MIPI_VSYNC_PADDING_COUNT (port), + vsync); +intel_de_write (dev_priv,MIPI_VBP_COUNT (port), vbp); } }
@@ -1338,35 +1358,35 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder,* escape clock divider, 20MHz, shared for A and C. * device ready must be off when doing this! txclkesc? */ - tmp =I915_READ (MIPI_CTRL (PORT_A )); + tmp =intel_de_read (dev_priv,MIPI_CTRL (PORT_A )); tmp &= ~ESCAPE_CLOCK_DIVIDER_MASK ; -I915_WRITE (MIPI_CTRL (PORT_A ), tmp | -ESCAPE_CLOCK_DIVIDER_1 ); +intel_de_write (dev_priv,MIPI_CTRL (PORT_A ), + tmp |ESCAPE_CLOCK_DIVIDER_1 );/* read request priority is per pipe */ - tmp =I915_READ (MIPI_CTRL (port)); + tmp =intel_de_read (dev_priv,MIPI_CTRL (port)); tmp &= ~READ_REQUEST_PRIORITY_MASK ; -I915_WRITE (MIPI_CTRL (port), tmp | -READ_REQUEST_PRIORITY_HIGH ); +intel_de_write (dev_priv,MIPI_CTRL (port), + tmp |READ_REQUEST_PRIORITY_HIGH ); }else if (IS_GEN9_LP (dev_priv)) {enum pipe pipe = intel_crtc->pipe; - tmp =I915_READ (MIPI_CTRL (port)); + tmp =intel_de_read (dev_priv,MIPI_CTRL (port)); tmp &= ~BXT_PIPE_SELECT_MASK ; tmp |=BXT_PIPE_SELECT (pipe); -I915_WRITE (MIPI_CTRL (port), tmp); +intel_de_write (dev_priv,MIPI_CTRL (port), tmp); }/* XXX: why here, why like this? handling in irq handler?! */ -I915_WRITE (MIPI_INTR_STAT (port),0xffffffff ); -I915_WRITE (MIPI_INTR_EN (port),0xffffffff ); +intel_de_write (dev_priv,MIPI_INTR_STAT (port),0xffffffff ); +intel_de_write (dev_priv,MIPI_INTR_EN (port),0xffffffff ); -I915_WRITE (MIPI_DPHY_PARAM (port), intel_dsi->dphy_reg); +intel_de_write (dev_priv,MIPI_DPHY_PARAM (port), + intel_dsi->dphy_reg); -I915_WRITE (MIPI_DPI_RESOLUTION (port), - adjusted_mode->crtc_vdisplay <<VERTICAL_ADDRESS_SHIFT | - mode_hdisplay <<HORIZONTAL_ADDRESS_SHIFT ); +intel_de_write (dev_priv,MIPI_DPI_RESOLUTION (port), + adjusted_mode->crtc_vdisplay <<VERTICAL_ADDRESS_SHIFT | mode_hdisplay <<HORIZONTAL_ADDRESS_SHIFT ); }set_dsi_timings (encoder, adjusted_mode);
@@ -1393,7 +1413,7 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder, }for_each_dsi_port (port, intel_dsi->ports) { -I915_WRITE (MIPI_DSI_FUNC_PRG (port), val); +intel_de_write (dev_priv,MIPI_DSI_FUNC_PRG (port), val);/* timeouts for recovery. one frame IIUC. if counter expires, * EOT and stop state. */
@@ -1414,28 +1434,24 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder,if (is_vid_mode (intel_dsi) && intel_dsi->video_mode_format ==VIDEO_MODE_BURST ) { -I915_WRITE (MIPI_HS_TX_TIMEOUT (port), -txbyteclkhs (adjusted_mode->crtc_htotal, bpp, - intel_dsi->lane_count, - intel_dsi->burst_mode_ratio) +1 ); +intel_de_write (dev_priv,MIPI_HS_TX_TIMEOUT (port), +txbyteclkhs (adjusted_mode->crtc_htotal, bpp, intel_dsi->lane_count, intel_dsi->burst_mode_ratio) +1 ); }else { -I915_WRITE (MIPI_HS_TX_TIMEOUT (port), -txbyteclkhs (adjusted_mode->crtc_vtotal * - adjusted_mode->crtc_htotal, - bpp, intel_dsi->lane_count, - intel_dsi->burst_mode_ratio) +1 ); +intel_de_write (dev_priv,MIPI_HS_TX_TIMEOUT (port), +txbyteclkhs (adjusted_mode->crtc_vtotal * adjusted_mode->crtc_htotal, bpp, intel_dsi->lane_count, intel_dsi->burst_mode_ratio) +1 ); } -I915_WRITE (MIPI_LP_RX_TIMEOUT (port), intel_dsi->lp_rx_timeout); -I915_WRITE (MIPI_TURN_AROUND_TIMEOUT (port), - intel_dsi->turn_arnd_val); -I915_WRITE (MIPI_DEVICE_RESET_TIMER (port), - intel_dsi->rst_timer_val); +intel_de_write (dev_priv,MIPI_LP_RX_TIMEOUT (port), + intel_dsi->lp_rx_timeout); +intel_de_write (dev_priv,MIPI_TURN_AROUND_TIMEOUT (port), + intel_dsi->turn_arnd_val); +intel_de_write (dev_priv,MIPI_DEVICE_RESET_TIMER (port), + intel_dsi->rst_timer_val);/* dphy stuff */ /* in terms of low power clock */ -I915_WRITE (MIPI_INIT_COUNT (port), -txclkesc (intel_dsi->escape_clk_div,100 )); +intel_de_write (dev_priv,MIPI_INIT_COUNT (port), +txclkesc (intel_dsi->escape_clk_div,100 ));if (IS_GEN9_LP (dev_priv) && (!intel_dsi->dual_link)) {/*
@@ -1444,24 +1460,25 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder,* getting used. So write the other port * if not in dual link mode. */ -I915_WRITE (MIPI_INIT_COUNT (port == -PORT_A ?PORT_C :PORT_A ), - intel_dsi->init_count); +intel_de_write (dev_priv, +MIPI_INIT_COUNT (port ==PORT_A ?PORT_C :PORT_A ), + intel_dsi->init_count); }/* recovery disables */ -I915_WRITE (MIPI_EOT_DISABLE (port), tmp); +intel_de_write (dev_priv,MIPI_EOT_DISABLE (port), tmp);/* in terms of low power clock */ -I915_WRITE (MIPI_INIT_COUNT (port), intel_dsi->init_count); +intel_de_write (dev_priv,MIPI_INIT_COUNT (port), + intel_dsi->init_count);/* in terms of txbyteclkhs. actual high to low switch + * MIPI_STOP_STATE_STALL * MIPI_LP_BYTECLK. * * XXX: write MIPI_STOP_STATE_STALL? */ -I915_WRITE (MIPI_HIGH_LOW_SWITCH_COUNT (port), - intel_dsi->hs_to_lp_count); +intel_de_write (dev_priv,MIPI_HIGH_LOW_SWITCH_COUNT (port), + intel_dsi->hs_to_lp_count);/* XXX: low power clock equivalence in terms of byte clock. * the number of byte clocks occupied in one low power clock.
@@ -1469,14 +1486,15 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder,* txclkesc time / txbyteclk time * (105 + MIPI_STOP_STATE_STALL * ) / 105.??? */ -I915_WRITE (MIPI_LP_BYTECLK (port), intel_dsi->lp_byte_clk); +intel_de_write (dev_priv,MIPI_LP_BYTECLK (port), + intel_dsi->lp_byte_clk);if (IS_GEMINILAKE (dev_priv)) { -I915_WRITE (MIPI_TLPX_TIME_COUNT (port), - intel_dsi->lp_byte_clk); +intel_de_write (dev_priv,MIPI_TLPX_TIME_COUNT (port), + intel_dsi->lp_byte_clk);/* Shadow of DPHY reg */ -I915_WRITE (MIPI_CLK_LANE_TIMING (port), - intel_dsi->dphy_reg); +intel_de_write (dev_priv,MIPI_CLK_LANE_TIMING (port), + intel_dsi->dphy_reg); }/* the bw essential for transmitting 16 long packets containing
@@ -1484,21 +1502,18 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder,* this register in terms of byte clocks. based on dsi transfer * rate and the number of lanes configured the time taken to * transmit 16 long packets in a dsi stream varies. */ -I915_WRITE (MIPI_DBI_BW_CTRL (port), intel_dsi->bw_timer); +intel_de_write (dev_priv,MIPI_DBI_BW_CTRL (port), + intel_dsi->bw_timer); -I915_WRITE (MIPI_CLK_LANE_SWITCH_TIME_CNT (port), - intel_dsi->clk_lp_to_hs_count <<LP_HS_SSW_CNT_SHIFT | - intel_dsi->clk_hs_to_lp_count <<HS_LP_PWR_SW_CNT_SHIFT ); +intel_de_write (dev_priv,MIPI_CLK_LANE_SWITCH_TIME_CNT (port), + intel_dsi->clk_lp_to_hs_count <<LP_HS_SSW_CNT_SHIFT | intel_dsi->clk_hs_to_lp_count <<HS_LP_PWR_SW_CNT_SHIFT );if (is_vid_mode (intel_dsi))/* Some panels might have resolution which is not a * multiple of 64 like 1366 x 768. Enable RANDOM * resolution support for such panels by default */ -I915_WRITE (MIPI_VIDEO_MODE_FORMAT (port), - intel_dsi->video_frmt_cfg_bits | - intel_dsi->video_mode_format | -IP_TG_CONFIG | -RANDOM_DPI_DISPLAY_RESOLUTION ); +intel_de_write (dev_priv,MIPI_VIDEO_MODE_FORMAT (port), + intel_dsi->video_frmt_cfg_bits | intel_dsi->video_mode_format |IP_TG_CONFIG |RANDOM_DPI_DISPLAY_RESOLUTION ); } }
@@ -1514,19 +1529,19 @@ static void intel_dsi_unprepare(struct intel_encoder *encoder)for_each_dsi_port (port, intel_dsi->ports) {/* Panel commands can be sent when clock is in LP11 */ -I915_WRITE (MIPI_DEVICE_READY (port),0x0 ); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port),0x0 );if (IS_GEN9_LP (dev_priv))bxt_dsi_reset_clocks (encoder, port);else vlv_dsi_reset_clocks (encoder, port); -I915_WRITE (MIPI_EOT_DISABLE (port),CLOCKSTOP ); +intel_de_write (dev_priv,MIPI_EOT_DISABLE (port),CLOCKSTOP ); - val =I915_READ (MIPI_DSI_FUNC_PRG (port)); + val =intel_de_read (dev_priv,MIPI_DSI_FUNC_PRG (port)); val &= ~VID_MODE_FORMAT_MASK ; -I915_WRITE (MIPI_DSI_FUNC_PRG (port), val); +intel_de_write (dev_priv,MIPI_DSI_FUNC_PRG (port), val); -I915_WRITE (MIPI_DEVICE_READY (port),0x1 ); +intel_de_write (dev_priv,MIPI_DEVICE_READY (port),0x1 ); } }
@@ -1583,7 +1598,7 @@ vlv_dsi_get_hw_panel_orientation(struct intel_connector *connector)if (!wakeref)return DRM_MODE_PANEL_ORIENTATION_UNKNOWN ; - val =I915_READ (DSPCNTR (plane->i9xx_plane)); + val =intel_de_read (dev_priv,DSPCNTR (plane->i9xx_plane));if (!(val &DISPLAY_PLANE_ENABLE )) orientation =DRM_MODE_PANEL_ORIENTATION_UNKNOWN ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 33/33 drm/i915/vlv_dsi_pll: 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/vlv_dsi_pll.c | 49 +++++++++++----------- 1 file changed, 25 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/display/vlv_dsi_pll.c +25 -24
@@ -201,7 +201,7 @@ bool bxt_dsi_pll_is_enabled(struct drm_i915_private *dev_priv)u32 mask; mask =BXT_DSI_PLL_DO_ENABLE |BXT_DSI_PLL_LOCKED ; - val =I915_READ (BXT_DSI_PLL_ENABLE ); + val =intel_de_read (dev_priv,BXT_DSI_PLL_ENABLE ); enabled = (val & mask) == mask;if (!enabled)
@@ -215,7 +215,7 @@ bool bxt_dsi_pll_is_enabled(struct drm_i915_private *dev_priv)* times, and since accessing DSI registers with invalid dividers * causes a system hang. */ - val =I915_READ (BXT_DSI_PLL_CTL ); + val =intel_de_read (dev_priv,BXT_DSI_PLL_CTL );if (IS_GEMINILAKE (dev_priv)) {if (!(val &BXT_DSIA_16X_MASK )) {DRM_DEBUG_DRIVER ("Invalid PLL divider (%08x)\n" , val);
@@ -238,9 +238,9 @@ void bxt_dsi_pll_disable(struct intel_encoder *encoder)DRM_DEBUG_KMS ("\n" ); - val =I915_READ (BXT_DSI_PLL_ENABLE ); + val =intel_de_read (dev_priv,BXT_DSI_PLL_ENABLE ); val &= ~BXT_DSI_PLL_DO_ENABLE ; -I915_WRITE (BXT_DSI_PLL_ENABLE , val); +intel_de_write (dev_priv,BXT_DSI_PLL_ENABLE , val);/* * PLL lock should deassert within 200us.
@@ -325,7 +325,7 @@ u32 bxt_dsi_get_pclk(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);int bpp =mipi_dsi_pixel_format_to_bpp (intel_dsi->pixel_format); - config->dsi_pll.ctrl =I915_READ (BXT_DSI_PLL_CTL ); + config->dsi_pll.ctrl =intel_de_read (dev_priv,BXT_DSI_PLL_CTL ); dsi_ratio = config->dsi_pll.ctrl &BXT_DSI_PLL_RATIO_MASK ;
@@ -343,11 +343,10 @@ void vlv_dsi_reset_clocks(struct intel_encoder *encoder, enum port port)struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder); - temp =I915_READ (MIPI_CTRL (port)); + temp =intel_de_read (dev_priv,MIPI_CTRL (port)); temp &= ~ESCAPE_CLOCK_DIVIDER_MASK ; -I915_WRITE (MIPI_CTRL (port), temp | - intel_dsi->escape_clk_div << -ESCAPE_CLOCK_DIVIDER_SHIFT ); +intel_de_write (dev_priv,MIPI_CTRL (port), + temp | intel_dsi->escape_clk_div <<ESCAPE_CLOCK_DIVIDER_SHIFT ); } static void glk_dsi_program_esc_clock(struct drm_device *dev,
@@ -393,8 +392,10 @@ static void glk_dsi_program_esc_clock(struct drm_device *dev,else txesc2_div =10 ; -I915_WRITE (MIPIO_TXESC_CLK_DIV1 , (1 << (txesc1_div -1 )) &GLK_TX_ESC_CLK_DIV1_MASK ); -I915_WRITE (MIPIO_TXESC_CLK_DIV2 , (1 << (txesc2_div -1 )) &GLK_TX_ESC_CLK_DIV2_MASK ); +intel_de_write (dev_priv,MIPIO_TXESC_CLK_DIV1 , + (1 << (txesc1_div -1 )) &GLK_TX_ESC_CLK_DIV1_MASK ); +intel_de_write (dev_priv,MIPIO_TXESC_CLK_DIV2 , + (1 << (txesc2_div -1 )) &GLK_TX_ESC_CLK_DIV2_MASK ); }/* Program BXT Mipi clocks and dividers */
@@ -412,7 +413,7 @@ static void bxt_dsi_program_clocks(struct drm_device *dev, enum port port,u32 mipi_8by3_divider;/* Clear old configurations */ - tmp =I915_READ (BXT_MIPI_CLOCK_CTL ); + tmp =intel_de_read (dev_priv,BXT_MIPI_CLOCK_CTL ); tmp &= ~(BXT_MIPI_TX_ESCLK_FIXDIV_MASK (port)); tmp &= ~(BXT_MIPI_RX_ESCLK_UPPER_FIXDIV_MASK (port)); tmp &= ~(BXT_MIPI_8X_BY3_DIVIDER_MASK (port));
@@ -448,7 +449,7 @@ static void bxt_dsi_program_clocks(struct drm_device *dev, enum port port, tmp |=BXT_MIPI_RX_ESCLK_LOWER_DIVIDER (port, rx_div_lower); tmp |=BXT_MIPI_RX_ESCLK_UPPER_DIVIDER (port, rx_div_upper); -I915_WRITE (BXT_MIPI_CLOCK_CTL , tmp); +intel_de_write (dev_priv,BXT_MIPI_CLOCK_CTL , tmp); } int bxt_dsi_pll_compute(struct intel_encoder *encoder,
@@ -510,8 +511,8 @@ void bxt_dsi_pll_enable(struct intel_encoder *encoder,DRM_DEBUG_KMS ("\n" );/* Configure PLL vales */ -I915_WRITE (BXT_DSI_PLL_CTL , config->dsi_pll.ctrl); -POSTING_READ (BXT_DSI_PLL_CTL ); +intel_de_write (dev_priv,BXT_DSI_PLL_CTL , config->dsi_pll.ctrl); +intel_de_posting_read (dev_priv,BXT_DSI_PLL_CTL );/* Program TX, RX, Dphy clocks */ if (IS_BROXTON (dev_priv)) {
@@ -522,9 +523,9 @@ void bxt_dsi_pll_enable(struct intel_encoder *encoder, }/* Enable DSI PLL */ - val =I915_READ (BXT_DSI_PLL_ENABLE ); + val =intel_de_read (dev_priv,BXT_DSI_PLL_ENABLE ); val |=BXT_DSI_PLL_DO_ENABLE ; -I915_WRITE (BXT_DSI_PLL_ENABLE , val); +intel_de_write (dev_priv,BXT_DSI_PLL_ENABLE , val);/* Timeout and fail if PLL not locked */ if (intel_de_wait_for_set(dev_priv, BXT_DSI_PLL_ENABLE,
@@ -544,20 +545,20 @@ void bxt_dsi_reset_clocks(struct intel_encoder *encoder, enum port port)/* Clear old configurations */ if (IS_BROXTON (dev_priv)) { - tmp =I915_READ (BXT_MIPI_CLOCK_CTL ); + tmp =intel_de_read (dev_priv,BXT_MIPI_CLOCK_CTL ); tmp &= ~(BXT_MIPI_TX_ESCLK_FIXDIV_MASK (port)); tmp &= ~(BXT_MIPI_RX_ESCLK_UPPER_FIXDIV_MASK (port)); tmp &= ~(BXT_MIPI_8X_BY3_DIVIDER_MASK (port)); tmp &= ~(BXT_MIPI_RX_ESCLK_LOWER_FIXDIV_MASK (port)); -I915_WRITE (BXT_MIPI_CLOCK_CTL , tmp); +intel_de_write (dev_priv,BXT_MIPI_CLOCK_CTL , tmp); }else { - tmp =I915_READ (MIPIO_TXESC_CLK_DIV1 ); + tmp =intel_de_read (dev_priv,MIPIO_TXESC_CLK_DIV1 ); tmp &= ~GLK_TX_ESC_CLK_DIV1_MASK ; -I915_WRITE (MIPIO_TXESC_CLK_DIV1 , tmp); +intel_de_write (dev_priv,MIPIO_TXESC_CLK_DIV1 , tmp); - tmp =I915_READ (MIPIO_TXESC_CLK_DIV2 ); + tmp =intel_de_read (dev_priv,MIPIO_TXESC_CLK_DIV2 ); tmp &= ~GLK_TX_ESC_CLK_DIV2_MASK ; -I915_WRITE (MIPIO_TXESC_CLK_DIV2 , tmp); +intel_de_write (dev_priv,MIPIO_TXESC_CLK_DIV2 , tmp); } -I915_WRITE (MIPI_EOT_DISABLE (port),CLOCKSTOP ); +intel_de_write (dev_priv,MIPI_EOT_DISABLE (port),CLOCKSTOP ); }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Jani Nikula (2020-01-24 13:25:21)
Quoted 14 lines
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?
Quoted 8 lines
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.
Yup. Suck it all in, clean up with the usual code refreshes.
I've looked at a couple of patches to confirm that it does appear purely mechanical,
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 24 lines · Chris Wilson
Quoting Jani Nikula (2020-01-24 13:25:21)
Quoted 14 lines
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?
Quoted 8 lines
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.
Quoted 6 lines
Yup. Suck it all in, clean up with the usual code refreshes.
Schadenfreude-by Chris Wilson <[email protected]>I've looked at a couple of patches to confirm that it does appear purely mechanical,
Acked-by Chris Wilson <[email protected]>
Since it is purely mechanical with coccinelle, why not to make in only one patch?
Anyway:
Quoted 5 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 25 lines · Rodrigo Vivi
Quoted 24 lines · Chris Wilson
Quoting Jani Nikula (2020-01-24 13:25:21)
Quoted 22 lines
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.
Quoted 8 lines
Quoted 6 lines
Yup. Suck it all in, clean up with the usual code refreshes.
Schadenfreude-by Chris Wilson <[email protected]>I've looked at a couple of patches to confirm that it does appear purely mechanical,
Acked-by Chris Wilson <[email protected]>Since it is purely mechanical with coccinelle, why not to make in only one patch?
Because such a mega patch would conflict before being able to merge. You'd have to block everything else. I don't think I'd be able to merge these in one go either even if we wanted to.
Quoted 2 lines
Anyway:
Acked-by Rodrigo Vivi <[email protected]>
Thanks,
Jani.
Quoted 6 lines
Quoted 6 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 33 lines · Jani Nikula
Quoted 32 lines · Rodrigo Vivi
Quoted 30 lines · Chris Wilson
Quoting Jani Nikula (2020-01-24 13:25:21)
Quoted 14 lines
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?
Quoted 8 lines
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.
Yup. Suck it all in, clean up with the usual code refreshes.
Schadenfreude-by Chris Wilson <[email protected]>I've looked at a couple of patches to confirm that it does appear purely mechanical,
Acked-by Chris Wilson <[email protected]>
Quoted 5 lines
Quoted 1 line
Since it is purely mechanical with coccinelle, why not to make in only one patch?
Because such a mega patch would conflict before being able to merge. You'd have to block everything else. I don't think I'd be able to merge these in one go either even if we wanted to.
Indeed, I started pushing the patches, pushed all that applied, and eight will need a rebase.
Thanks for the acks.
BR,
Jani.
Quoted 13 lines
Quoted 3 lines
Anyway:
Acked-by Rodrigo Vivi <[email protected]>Thanks,
Jani.Quoted 6 lines
Quoted 6 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: mass conversion to intel_de_*() register accessors
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: mass conversion to intel_de_*() register accessors
URL : https://patchwork.freedesktop.org/series/72533/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip c07095a827f3 drm/i915/icl_dsi: use intel_de_*() functions for register access 36f2779671c5 drm/i915/audio: use intel_de_*() functions for register access -:346: WARNING:LONG_LINE: line over 100 characters #346: FILE: drivers/gpu/drm/i915/display/intel_audio.c:875: + (intel_de_read(dev_priv, AUD_PIN_BUF_CTL) | AUD_PIN_BUF_ENABLE));
total: 0 errors, 1 warnings, 0 checks, 306 lines checked 65fb0d418cb5 drm/i915/cdclk: use intel_de_*() functions for register access -:62: WARNING:LONG_LINE: line over 100 characters
#62: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:241:
+ IS_PINEVIEW(dev_priv) || IS_MOBILE(dev_priv) ? HPLLVCO_MOBILE : HPLLVCO);
-:306: CHECK:CAMELCASE: Avoid CamelCase: <CNL_DSSM_CDCLK_PLL_REFCLK_24MHz> #306: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:1301:
+ if (intel_de_read(dev_priv, SKL_DSSM) & CNL_DSSM_CDCLK_PLL_REFCLK_24MHz)
-:447: ERROR:CODE_INDENT: code indent should use tabs where possible #447: FILE: drivers/gpu/drm/i915/display/intel_cdclk.c:2553:
+^I^I DIV_ROUND_UP(dev_priv->cdclk.hw.cdclk, 1000));$
total: 1 errors, 1 warnings, 1 checks, 398 lines checked e3e9bb668fb8 drm/i915/color: use intel_de_*() functions for register access -:279: ERROR:CODE_INDENT: code indent should use tabs where possible #279: FILE: drivers/gpu/drm/i915/display/intel_color.c:564:
+^I^I ilk_lut_10(&lut[i]));$
-:349: ERROR:CODE_INDENT: code indent should use tabs where possible #349: FILE: drivers/gpu/drm/i915/display/intel_color.c:755:
+^I^I lut[i].green);$
total: 2 errors, 0 warnings, 0 checks, 419 lines checked 975fff8f273d drm/i915/combo_phy: use intel_de_*() functions for register access d93abf166aae drm/i915/crt: use intel_de_*() functions for register access -:95: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #95: FILE: drivers/gpu/drm/i915/display/intel_crt.c:445:
+ save_adpa = adpa = intel_de_read(dev_priv, crt->adpa_reg);
-:129: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #129: FILE: drivers/gpu/drm/i915/display/intel_crt.c:501:
+ save_adpa = adpa = intel_de_read(dev_priv, crt->adpa_reg);
-:206: WARNING:LONG_LINE: line over 100 characters #206: FILE: drivers/gpu/drm/i915/display/intel_crt.c:983:
+ adpa | ADPA_DAC_ENABLE | ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE);
total: 0 errors, 1 warnings, 2 checks, 157 lines checked 3626a27aaf8e drm/i915/ddi: use intel_de_*() functions for register access -:128: WARNING:LONG_LINE: line over 100 characters
#128: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:1168:
+ FDI_RX_PWRDN_LANE1_VAL(2) | FDI_RX_PWRDN_LANE0_VAL(2) | FDI_RX_TP1_TO_TP2_48 | FDI_RX_FDI_DELAY_90);
-:161: WARNING:LONG_LINE: line over 100 characters #161: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:1192:
+ DP_TP_CTL_FDI_AUTOTRAIN | DP_TP_CTL_ENHANCED_FRAME_ENABLE | DP_TP_CTL_LINK_TRAIN_PAT1 | DP_TP_CTL_ENABLE);
-:173: WARNING:LONG_LINE: line over 100 characters #173: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:1199:
+ DDI_BUF_CTL_ENABLE | ((crtc_state->fdi_lanes - 1) << 1) | DDI_BUF_TRANS_SELECT(i / 2));
-:256: WARNING:LONG_LINE: line over 100 characters #256: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:1267:
+ DP_TP_CTL_FDI_AUTOTRAIN | DP_TP_CTL_LINK_TRAIN_NORMAL | DP_TP_CTL_ENHANCED_FRAME_ENABLE | DP_TP_CTL_ENABLE);
-:953: WARNING:LONG_LINE: line over 100 characters #953: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:3211:
+ intel_de_read(dev_priv, DPCLKA_CFGCR0) | DPCLKA_CFGCR0_DDI_CLK_OFF(port));
total: 0 errors, 5 warnings, 0 checks, 1169 lines checked dadca7367192 drm/i915/display: use intel_de_*() functions for register access -:63: WARNING:LONG_LINE: line over 100 characters
#63: FILE: drivers/gpu/drm/i915/display/intel_display.c:522:
+ intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) | DUPS1_GATING_DIS | DUPS2_GATING_DIS);
-:63: ERROR:CODE_INDENT: code indent should use tabs where possible #63: FILE: drivers/gpu/drm/i915/display/intel_display.c:522:
+^I^I intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) | DUPS1_GATING_DIS | DUPS2_GATING_DIS);$
-:69: WARNING:LONG_LINE: line over 100 characters #69: FILE: drivers/gpu/drm/i915/display/intel_display.c:525:
+ intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) & ~(DUPS1_GATING_DIS | DUPS2_GATING_DIS));
-:69: ERROR:CODE_INDENT: code indent should use tabs where possible #69: FILE: drivers/gpu/drm/i915/display/intel_display.c:525:
+^I^I intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) & ~(DUPS1_GATING_DIS | DUPS2_GATING_DIS));$
-:80: ERROR:CODE_INDENT: code indent should use tabs where possible #80: FILE: drivers/gpu/drm/i915/display/intel_display.c:535:
+^I^I intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) | DPFR_GATING_DIS);$
-:85: ERROR:CODE_INDENT: code indent should use tabs where possible #85: FILE: drivers/gpu/drm/i915/display/intel_display.c:538:
+^I^I intel_de_read(dev_priv, CLKGATE_DIS_PSL(pipe)) & ~DPFR_GATING_DIS);$
-:656: WARNING:LONG_LINE: line over 100 characters #656: FILE: drivers/gpu/drm/i915/display/intel_display.c:5012:
+ intel_de_read(dev_priv, reg) | FDI_FS_ERRC_ENABLE | FDI_FE_ERRC_ENABLE);
-:656: ERROR:CODE_INDENT: code indent should use tabs where possible #656: FILE: drivers/gpu/drm/i915/display/intel_display.c:5012:
+^I^I intel_de_read(dev_priv, reg) | FDI_FS_ERRC_ENABLE | FDI_FE_ERRC_ENABLE);$
-:1586: WARNING:LONG_LINE: line over 100 characters #1586: FILE: drivers/gpu/drm/i915/display/intel_display.c:8242:
+ pipe_config->dpll_hw_state.dpll & ~(DPLL_VCO_ENABLE | DPLL_EXT_BUFFER_ENABLE_VLV));
-:1627: ERROR:CODE_INDENT: code indent should use tabs where possible #1627: FILE: drivers/gpu/drm/i915/display/intel_display.c:8643:
+^I^I vsyncshift);$
-:1630: WARNING:LONG_LINE: line over 100 characters #1630: FILE: drivers/gpu/drm/i915/display/intel_display.c:8646:
+ (adjusted_mode->crtc_hdisplay - 1) | ((adjusted_mode->crtc_htotal - 1) << 16));
-:1632: WARNING:LONG_LINE: line over 100 characters #1632: FILE: drivers/gpu/drm/i915/display/intel_display.c:8648:
+ (adjusted_mode->crtc_hblank_start - 1) | ((adjusted_mode->crtc_hblank_end - 1) << 16));
-:1634: WARNING:LONG_LINE: line over 100 characters #1634: FILE: drivers/gpu/drm/i915/display/intel_display.c:8650:
+ (adjusted_mode->crtc_hsync_start - 1) | ((adjusted_mode->crtc_hsync_end - 1) << 16));
-:1641: WARNING:LONG_LINE: line over 100 characters #1641: FILE: drivers/gpu/drm/i915/display/intel_display.c:8657:
+ (adjusted_mode->crtc_vsync_start - 1) | ((adjusted_mode->crtc_vsync_end - 1) << 16));
-:1651: ERROR:CODE_INDENT: code indent should use tabs where possible #1651: FILE: drivers/gpu/drm/i915/display/intel_display.c:8666:
+^I^I intel_de_read(dev_priv, VTOTAL(cpu_transcoder)));$
-:1672: WARNING:LONG_LINE: line over 100 characters #1672: FILE: drivers/gpu/drm/i915/display/intel_display.c:8693:
+ return intel_de_read(dev_priv, PIPECONF(cpu_transcoder)) & PIPECONF_INTERLACE_MASK_HSW;
-:2078: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2078: FILE: drivers/gpu/drm/i915/display/intel_display.c:10235:
+ m2_n2->link_n = intel_de_read(dev_priv,
+ PIPE_LINK_N2(transcoder));
-:2080: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2080: FILE: drivers/gpu/drm/i915/display/intel_display.c:10237:
+ m2_n2->gmch_m = intel_de_read(dev_priv,
+ PIPE_DATA_M2(transcoder))
-:2085: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2085: FILE: drivers/gpu/drm/i915/display/intel_display.c:10240:
+ m2_n2->gmch_n = intel_de_read(dev_priv,
+ PIPE_DATA_N2(transcoder));
-:2325: ERROR:CODE_INDENT: code indent should use tabs where possible #2325: FILE: drivers/gpu/drm/i915/display/intel_display.c:10946:
+^I^I^I^I TRANS_DDI_FUNC_CTL2(cpu_transcoder));$
-:2325: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #2325: FILE: drivers/gpu/drm/i915/display/intel_display.c:10946:
+ trans_port_sync = intel_de_read(dev_priv,
+ TRANS_DDI_FUNC_CTL2(cpu_transcoder));
-:2464: CHECK:CAMELCASE: Avoid CamelCase: <ILK_eDP_A_DISABLE> #2464: FILE: drivers/gpu/drm/i915/display/intel_display.c:16612:
+ if (IS_GEN(dev_priv, 5) && (intel_de_read(dev_priv, FUSE_STRAP) & ILK_eDP_A_DISABLE))
total: 8 errors, 9 warnings, 5 checks, 2683 lines checked9129d0adc87c drm/i915/display_power: use intel_de_*() functions for register access -:312: WARNING:LONG_LINE: line over 100 characters
#312: FILE: drivers/gpu/drm/i915/display/intel_display_power.c:944:
+ intel_de_read(dev_priv, GEN8_CHICKEN_DCPR_1) | SKL_SELECT_ALTERNATE_DC_EXIT);
-:334: WARNING:LONG_LINE: line over 100 characters
#334: FILE: drivers/gpu/drm/i915/display/intel_display_power.c:968:
+ intel_de_read(dev_priv, GEN8_CHICKEN_DCPR_1) | SKL_SELECT_ALTERNATE_DC_EXIT);
total: 0 errors, 2 warnings, 0 checks, 734 lines checked f827549283b1 drm/i915/dp: use intel_de_*() functions for register access -:710: WARNING:LONG_LINE: line over 100 characters
#710: FILE: drivers/gpu/drm/i915/display/intel_dp.c:6917:
+ 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)));
-:769: WARNING:LINE_SPACING: Missing a blank line after declarations #769: FILE: drivers/gpu/drm/i915/display/intel_dp.c:7560:
+ u32 temp = intel_de_read(dev_priv, PEG_BAND_GAP_DATA);
+ intel_de_write(dev_priv, PEG_BAND_GAP_DATA,
total: 0 errors, 2 warnings, 0 checks, 660 lines checked 59d4feee81b6 drm/i915/dpio_phy: use intel_de_*() functions for register access dac3c1307ff6 drm/i915/dpll_mgr: use intel_de_*() functions for register access 62cb010d54e3 drm/i915/dp_mst: use intel_de_*() functions for register access 6351092052d2 drm/i915/dsb: use intel_de_*() functions for register access 6b856ed292fb drm/i915/dvo: use intel_de_*() functions for register access -:131: WARNING:LONG_LINE: line over 100 characters
#131: FILE: drivers/gpu/drm/i915/display/intel_dvo.c:305:
+ (adjusted_mode->crtc_hdisplay << DVO_SRCDIM_HORIZONTAL_SHIFT) | (adjusted_mode->crtc_vdisplay << DVO_SRCDIM_VERTICAL_SHIFT));
total: 0 errors, 1 warnings, 0 checks, 96 lines checked 46415f31fdbe drm/i915/fbc: use intel_de_*() functions for register access -:263: WARNING:LONG_LINE: line over 100 characters
#263: FILE: drivers/gpu/drm/i915/display/intel_fbc.c:338:
+ intel_de_read(dev_priv, CHICKEN_PIPESL_1(params->crtc.pipe)) | HSW_FBCQ_DIS);
-:312: ERROR:CODE_INDENT: code indent should use tabs where possible #312: FILE: drivers/gpu/drm/i915/display/intel_fbc.c:1371:
+^I^I 500 << FBC_CTL_INTERVAL_SHIFT);$
total: 1 errors, 1 warnings, 0 checks, 247 lines checkedf6f92e9ec996 drm/i915/fifo_underrun: use intel_de_*() functions for register access fd2ac1b92db5 drm/i915/gmbus: use intel_de_*() functions for register access -:164: WARNING:LONG_LINE: line over 100 characters
#164: FILE: drivers/gpu/drm/i915/display/intel_gmbus.c:414:
+ gmbus1_index | GMBUS_CYCLE_WAIT | (size << GMBUS_BYTE_COUNT_SHIFT) | (addr << GMBUS_SLAVE_ADDR_SHIFT) | GMBUS_SLAVE_READ | GMBUS_SW_RDY);
-:198: WARNING:LONG_LINE: line over 100 characters #198: FILE: drivers/gpu/drm/i915/display/intel_gmbus.c:493:
+ gmbus1_index | GMBUS_CYCLE_WAIT | (chunk_size << GMBUS_BYTE_COUNT_SHIFT) | (addr << GMBUS_SLAVE_ADDR_SHIFT) | GMBUS_SLAVE_WRITE | GMBUS_SW_RDY);
total: 0 errors, 2 warnings, 0 checks, 205 lines checked 3525b2857c38 drm/i915/hdcp: use intel_de_*() functions for register access -:60: ERROR:CODE_INDENT: code indent should use tabs where possible #60: FILE: drivers/gpu/drm/i915/display/intel_hdcp.c:116:
+^I HDCP_STATUS(dev_priv, cpu_transcoder, port)) &$
-:70: ERROR:CODE_INDENT: code indent should use tabs where possible #70: FILE: drivers/gpu/drm/i915/display/intel_hdcp.c:125:
+^I HDCP2_STATUS(dev_priv, cpu_transcoder, port)) &$
-:83: WARNING:LONG_LINE: line over 100 characters #83: FILE: drivers/gpu/drm/i915/display/intel_hdcp.c:191:
+ HDCP_KEY_LOAD_DONE | HDCP_KEY_LOAD_STATUS | HDCP_FUSE_IN_PROGRESS | HDCP_FUSE_ERROR | HDCP_FUSE_DONE);
-:435: WARNING:LONG_LINE: line over 100 characters #435: FILE: drivers/gpu/drm/i915/display/intel_hdcp.c:1565:
+ intel_de_read(dev_priv, HDCP2_CTL(dev_priv, cpu_transcoder, port)) | CTL_LINK_ENCRYPTION_REQ);
-:451: WARNING:LONG_LINE: line over 100 characters #451: FILE: drivers/gpu/drm/i915/display/intel_hdcp.c:1590:
+ intel_de_read(dev_priv, HDCP2_CTL(dev_priv, cpu_transcoder, port)) & ~CTL_LINK_ENCRYPTION_REQ);
total: 2 errors, 3 warnings, 0 checks, 380 lines checked 3841cf8aa830 drm/i915/hdmi: use intel_de_*() functions for register access -:323: ERROR:CODE_INDENT: code indent should use tabs where possible #323: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:495:
+^I^I^I^I VLV_TVIDEO_DIP_DATA(crtc->pipe));$
-:386: ERROR:CODE_INDENT: code indent should use tabs where possible #386: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:567:
+^I^I^I^I hsw_dip_data_reg(dev_priv, cpu_transcoder, type, i >> 2));$
-:668: ERROR:CODE_INDENT: code indent should use tabs where possible #668: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:1936:
+^I^I temp & ~SDVO_ENABLE);$
-:703: WARNING:LONG_LINE: line over 100 characters #703: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:1982:
+ intel_de_read(dev_priv, TRANS_CHICKEN1(pipe)) | TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE);
-:703: ERROR:CODE_INDENT: code indent should use tabs where possible #703: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:1982:
+^I^I intel_de_read(dev_priv, TRANS_CHICKEN1(pipe)) | TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE);$
-:727: WARNING:LONG_LINE: line over 100 characters #727: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:1999:
+ intel_de_read(dev_priv, TRANS_CHICKEN1(pipe)) & ~TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE);
-:727: ERROR:CODE_INDENT: code indent should use tabs where possible #727: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:1999:
+^I^I intel_de_read(dev_priv, TRANS_CHICKEN1(pipe)) & ~TRANS_CHICKEN1_HDMIUNIT_GC_DISABLE);$
-:774: WARNING:LINE_SPACING: Missing a blank line after declarations #774: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:3201:
+ u32 temp = intel_de_read(dev_priv, PEG_BAND_GAP_DATA);
+ intel_de_write(dev_priv, PEG_BAND_GAP_DATA,
-:775: ERROR:CODE_INDENT: code indent should use tabs where possible #775: FILE: drivers/gpu/drm/i915/display/intel_hdmi.c:3202:
+^I^I (temp & ~0xf) | 0xd);$
total: 6 errors, 3 warnings, 0 checks, 677 lines checked 38949463942f drm/i915/lpe_audio: use intel_de_*() functions for register access fa2af54524c8 drm/i915/lvds: use intel_de_*() functions for register access -:121: WARNING:LONG_LINE: line over 100 characters
#121: FILE: drivers/gpu/drm/i915/display/intel_lvds.c:213:
+ 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));
-:127: WARNING:LONG_LINE: line over 100 characters #127: FILE: drivers/gpu/drm/i915/display/intel_lvds.c:216:
+ REG_FIELD_PREP(PANEL_POWER_DOWN_DELAY_MASK, pps->t3) | REG_FIELD_PREP(PANEL_LIGHT_OFF_DELAY_MASK, pps->tx));
-:134: WARNING:LONG_LINE: line over 100 characters #134: FILE: drivers/gpu/drm/i915/display/intel_lvds.c:219:
+ REG_FIELD_PREP(PP_REFERENCE_DIVIDER_MASK, pps->divider) | REG_FIELD_PREP(PANEL_POWER_CYCLE_DELAY_MASK, DIV_ROUND_UP(pps->t4, 1000) + 1));
total: 0 errors, 3 warnings, 0 checks, 135 lines checked 33568867e120 drm/i915/overlay: use intel_de_*() functions for register access 70abf854e570 drm/i915/panel: use intel_de_*() functions for register access -:107: WARNING:LINE_SPACING: Missing a blank line after declarations #107: FILE: drivers/gpu/drm/i915/display/intel_panel.c:610:
+ 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);
total: 0 errors, 1 warnings, 0 checks, 609 lines checked 5a5f3f5ef651 drm/i915/pipe_crc: use intel_de_*() functions for register access 406166f74cf9 drm/i915/psr: use intel_de_*() functions for register access -:158: WARNING:LONG_LINE: line over 100 characters
#158: FILE: drivers/gpu/drm/i915/display/intel_psr.c:740:
+ WARN_ON(intel_de_read(dev_priv, EDP_PSR2_CTL(dev_priv->psr.transcoder)) & EDP_PSR2_ENABLE);
total: 0 errors, 1 warnings, 0 checks, 183 lines checked e4aa567631f4 drm/i915/sdvo: use intel_de_*() functions for register access c3ae7ea81350 drm/i915/sprite: use intel_de_*() functions for register access -:188: WARNING:LONG_LINE: line over 100 characters
#188: FILE: drivers/gpu/drm/i915/display/intel_sprite.c:670:
+ (plane_state->color_plane[1].y << 16) | plane_state->color_plane[1].x);
total: 0 errors, 1 warnings, 0 checks, 510 lines checked afa64a3c6bbd drm/i915/tv: use intel_de_*() functions for register access -:206: WARNING:LONG_LINE: line over 100 characters
#206: FILE: drivers/gpu/drm/i915/display/intel_tv.c:1529:
+ ((video_levels->black << TV_BLACK_LEVEL_SHIFT) | (video_levels->blank << TV_BLANK_LEVEL_SHIFT)));
-:259: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #259: FILE: drivers/gpu/drm/i915/display/intel_tv.c:1590:
+ save_tv_dac = tv_dac = intel_de_read(dev_priv, TV_DAC);
-:260: CHECK:MULTIPLE_ASSIGNMENTS: multiple assignments should be avoided #260: FILE: drivers/gpu/drm/i915/display/intel_tv.c:1591:
+ save_tv_ctl = tv_ctl = intel_de_read(dev_priv, TV_CTL);
total: 0 errors, 1 warnings, 2 checks, 257 lines checked 12c70fe8b613 drm/i915/vdsc: use intel_de_*() functions for register access f3b543cd4384 drm/i915/vga: use intel_de_*() functions for register access cdbe7f57017f drm/i915/vlv_dsi: use intel_de_*() functions for register access -:529: ERROR:CODE_INDENT: code indent should use tabs where possible #529: FILE: drivers/gpu/drm/i915/display/vlv_dsi.c:1085:
+^I^I^I^I BXT_MIPI_TRANS_HACTIVE(port));$
-:533: ERROR:CODE_INDENT: code indent should use tabs where possible #533: FILE: drivers/gpu/drm/i915/display/vlv_dsi.c:1088:
+^I^I^I^I BXT_MIPI_TRANS_VACTIVE(port));$
-:537: ERROR:CODE_INDENT: code indent should use tabs where possible #537: FILE: drivers/gpu/drm/i915/display/vlv_dsi.c:1091:
+^I^I^I^I BXT_MIPI_TRANS_VTOTAL(port));$
-:656: WARNING:LONG_LINE: line over 100 characters #656: FILE: drivers/gpu/drm/i915/display/vlv_dsi.c:1389:
+ adjusted_mode->crtc_vdisplay << VERTICAL_ADDRESS_SHIFT | mode_hdisplay << HORIZONTAL_ADDRESS_SHIFT);
-:678: WARNING:LONG_LINE: line over 100 characters #678: FILE: drivers/gpu/drm/i915/display/vlv_dsi.c:1438:
+ txbyteclkhs(adjusted_mode->crtc_htotal, bpp, intel_dsi->lane_count, intel_dsi->burst_mode_ratio) + 1);
-:686: WARNING:LONG_LINE: line over 100 characters #686: FILE: drivers/gpu/drm/i915/display/vlv_dsi.c:1441:
+ txbyteclkhs(adjusted_mode->crtc_vtotal * adjusted_mode->crtc_htotal, bpp, intel_dsi->lane_count, intel_dsi->burst_mode_ratio) + 1);
-:776: WARNING:LONG_LINE: line over 100 characters #776: FILE: drivers/gpu/drm/i915/display/vlv_dsi.c:1509:
+ intel_dsi->clk_lp_to_hs_count << LP_HS_SSW_CNT_SHIFT | intel_dsi->clk_hs_to_lp_count << HS_LP_PWR_SW_CNT_SHIFT);
-:788: WARNING:LONG_LINE: line over 100 characters #788: FILE: drivers/gpu/drm/i915/display/vlv_dsi.c:1516:
+ intel_dsi->video_frmt_cfg_bits | intel_dsi->video_mode_format | IP_TG_CONFIG | RANDOM_DPI_DISPLAY_RESOLUTION);
total: 3 errors, 5 warnings, 0 checks, 733 lines checked 913f16a2e7ae drm/i915/vlv_dsi_pll: use intel_de_*() functions for register access
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/display: mass conversion to intel_de_*() register accessors
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: mass conversion to intel_de_*() register accessors
URL : https://patchwork.freedesktop.org/series/72533/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.6.0 Commit: drm/i915/icl_dsi: use intel_de_*() functions for register access Okay!
Commit: drm/i915/audio: use intel_de_*() functions for register access Okay!
Commit: drm/i915/cdclk: use intel_de_*() functions for register access Okay!
Commit: drm/i915/color: use intel_de_*() functions for register access Okay!
Commit: drm/i915/combo_phy: use intel_de_*() functions for register access Okay!
Commit: drm/i915/crt: use intel_de_*() functions for register access Okay!
Commit: drm/i915/ddi: use intel_de_*() functions for register access Okay!
Commit: drm/i915/display: use intel_de_*() functions for register access +drivers/gpu/drm/i915/display/intel_display.c:1216:22: error: Expected constant expression in case statement -O:drivers/gpu/drm/i915/display/intel_display.c:1217:22: error: Expected constant expression in case statement
Commit: drm/i915/display_power: use intel_de_*() functions for register access Okay!
Commit: drm/i915/dp: use intel_de_*() functions for register access Okay!
Commit: drm/i915/dpio_phy: use intel_de_*() functions for register access Okay!
Commit: drm/i915/dpll_mgr: use intel_de_*() functions for register access Okay!
Commit: drm/i915/dp_mst: use intel_de_*() functions for register access Okay!
Commit: drm/i915/dsb: use intel_de_*() functions for register access Okay!
Commit: drm/i915/dvo: use intel_de_*() functions for register access Okay!
Commit: drm/i915/fbc: use intel_de_*() functions for register access Okay!
Commit: drm/i915/fifo_underrun: use intel_de_*() functions for register access Okay!
Commit: drm/i915/gmbus: use intel_de_*() functions for register access Okay!
Commit: drm/i915/hdcp: use intel_de_*() functions for register access Okay!
Commit: drm/i915/hdmi: use intel_de_*() functions for register access Okay!
Commit: drm/i915/lpe_audio: use intel_de_*() functions for register access Okay!
Commit: drm/i915/lvds: use intel_de_*() functions for register access Okay!
Commit: drm/i915/overlay: use intel_de_*() functions for register access Okay!
Commit: drm/i915/panel: use intel_de_*() functions for register access Okay!
Commit: drm/i915/pipe_crc: use intel_de_*() functions for register access Okay!
Commit: drm/i915/psr: use intel_de_*() functions for register access Okay!
Commit: drm/i915/sdvo: use intel_de_*() functions for register access Okay!
Commit: drm/i915/sprite: use intel_de_*() functions for register access Okay!
Commit: drm/i915/tv: use intel_de_*() functions for register access Okay!
Commit: drm/i915/vdsc: use intel_de_*() functions for register access Okay!
Commit: drm/i915/vga: use intel_de_*() functions for register access Okay!
Commit: drm/i915/vlv_dsi: use intel_de_*() functions for register access Okay!
Commit: drm/i915/vlv_dsi_pll: use intel_de_*() functions for register access Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: mass conversion to intel_de_*() register accessors
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: mass conversion to intel_de_*() register accessors
URL : https://patchwork.freedesktop.org/series/72533/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7809 -> Patchwork_16255
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/index.html
Known issues
------------
Here are the changes found in Patchwork_16255 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_parallel@fds:
- fi-byt-n2820: [PASS][1] -> [TIMEOUT][2] ([fdo#112271])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-byt-n2820/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-byt-n2820/igt@[email protected]
* igt@i915_module_load@reload-with-fault-injection:
- fi-cfl-8700k: [PASS][3] -> [DMESG-WARN][4] ([i915#889])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-cfl-8700k/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-cfl-8700k/igt@[email protected]
* igt@i915_selftest@live_gem_contexts:
- fi-cfl-8700k: [PASS][5] -> [INCOMPLETE][6] ([i915#424])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-cfl-8700k/igt@i915_selftest@live_gem_contexts.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-cfl-8700k/igt@i915_selftest@live_gem_contexts.html
* igt@i915_selftest@live_gtt:
- fi-icl-dsi: [PASS][7] -> [TIMEOUT][8] ([fdo#112271])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-icl-dsi/igt@i915_selftest@live_gtt.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-icl-dsi/igt@i915_selftest@live_gtt.html
* igt@kms_addfb_basic@basic:
- fi-tgl-y: [PASS][9] -> [DMESG-WARN][10] ([CI#94] / [i915#402]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-tgl-y/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-tgl-y/igt@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- fi-cml-u2: [PASS][11] -> [FAIL][12] ([i915#262])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-cml-u2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-cml-u2/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_parallel@fds:
- fi-byt-j1900: [INCOMPLETE][13] ([i915#45]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-byt-j1900/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-byt-j1900/igt@[email protected]
* igt@i915_getparams_basic@basic-eu-total:
- fi-tgl-y: [DMESG-WARN][15] ([CI#94] / [i915#402]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-tgl-y/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-tgl-y/igt@[email protected]
* igt@i915_module_load@reload-with-fault-injection:
- fi-kbl-7500u: [INCOMPLETE][17] ([i915#879]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-kbl-7500u/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-kbl-7500u/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [DMESG-WARN][19] ([i915#889]) -> [PASS][20] +1 similar issue
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-kbl-x1275/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-kbl-x1275/igt@[email protected]
* igt@i915_selftest@live_gem_contexts:
- fi-skl-lmem: [INCOMPLETE][21] ([i915#424]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-skl-lmem/igt@i915_selftest@live_gem_contexts.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-skl-lmem/igt@i915_selftest@live_gem_contexts.html
* igt@i915_selftest@live_sanitycheck:
- fi-kbl-x1275: [INCOMPLETE][23] -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-kbl-x1275/igt@i915_selftest@live_sanitycheck.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-kbl-x1275/igt@i915_selftest@live_sanitycheck.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-skl-6700k2: [FAIL][25] ([i915#410]) -> [PASS][26] +3 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-skl-6700k2/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-skl-6700k2/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][27] ([fdo#111096] / [i915#323]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-kbl-7500u/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-kbl-7500u/igt@[email protected]
#### Warnings ####
* igt@gem_exec_parallel@contexts:
- fi-byt-j1900: [TIMEOUT][29] ([fdo#112271]) -> [FAIL][30] ([i915#694])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-byt-j1900/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-byt-j1900/igt@[email protected]
* igt@i915_selftest@live_blt:
- fi-hsw-4770r: [DMESG-FAIL][31] ([i915#725]) -> [DMESG-FAIL][32] ([i915#553] / [i915#725])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-hsw-4770r/igt@i915_selftest@live_blt.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-hsw-4770r/igt@i915_selftest@live_blt.html
- fi-hsw-4770: [DMESG-FAIL][33] ([i915#553] / [i915#725]) -> [DMESG-FAIL][34] ([i915#725])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-hsw-4770/igt@i915_selftest@live_blt.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-hsw-4770/igt@i915_selftest@live_blt.html
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-icl-u2: [DMESG-WARN][35] ([IGT#4] / [i915#263]) -> [FAIL][36] ([i915#217])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-icl-u2/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-icl-u2/igt@[email protected]
* igt@kms_chamelium@dp-hpd-fast:
- fi-skl-6700k2: [FAIL][37] ([i915#410]) -> [SKIP][38] ([fdo#109271]) +4 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-skl-6700k2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-skl-6700k2/igt@[email protected]
* igt@kms_chamelium@vga-edid-read:
- fi-tgl-y: [SKIP][39] ([CI#94] / [fdo#111827] / [i915#1017]) -> [SKIP][40] ([CI#94] / [fdo#111827]) +8 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-tgl-y/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-tgl-y/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-tgl-y: [SKIP][41] ([CI#94] / [fdo#109285] / [i915#1017]) -> [SKIP][42] ([CI#94] / [fdo#109285])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/fi-tgl-y/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/fi-tgl-y/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
[IGT#4]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/4
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112271]: https://bugs.freedesktop.org/show_bug.cgi?id=112271
[i915#1017]: https://gitlab.freedesktop.org/drm/intel/issues/1017
[i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
[i915#262]: https://gitlab.freedesktop.org/drm/intel/issues/262
[i915#263]: https://gitlab.freedesktop.org/drm/intel/issues/263
[i915#323]: https://gitlab.freedesktop.org/drm/intel/issues/323
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#410]: https://gitlab.freedesktop.org/drm/intel/issues/410
[i915#424]: https://gitlab.freedesktop.org/drm/intel/issues/424
[i915#45]: https://gitlab.freedesktop.org/drm/intel/issues/45
[i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
[i915#668]: https://gitlab.freedesktop.org/drm/intel/issues/668
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
[i915#879]: https://gitlab.freedesktop.org/drm/intel/issues/879
[i915#889]: https://gitlab.freedesktop.org/drm/intel/issues/889
Participating hosts (51 -> 45)
------------------------------
Missing (6): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7809 -> Patchwork_16255
CI-20190529: 20190529
CI_DRM_7809: 861f608ce6e3c1a1ad320a5d18055601cff36e45 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5382: 8dbe5ce61baa2d563d4dd7c56a018bb1e1077467 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16255: 913f16a2e7ae351c8ff99c4d782a9bfa4847b862 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
913f16a2e7ae drm/i915/vlv_dsi_pll: use intel_de_*() functions for register access cdbe7f57017f drm/i915/vlv_dsi: use intel_de_*() functions for register access f3b543cd4384 drm/i915/vga: use intel_de_*() functions for register access 12c70fe8b613 drm/i915/vdsc: use intel_de_*() functions for register access afa64a3c6bbd drm/i915/tv: use intel_de_*() functions for register access c3ae7ea81350 drm/i915/sprite: use intel_de_*() functions for register access e4aa567631f4 drm/i915/sdvo: use intel_de_*() functions for register access 406166f74cf9 drm/i915/psr: use intel_de_*() functions for register access 5a5f3f5ef651 drm/i915/pipe_crc: use intel_de_*() functions for register access 70abf854e570 drm/i915/panel: use intel_de_*() functions for register access 33568867e120 drm/i915/overlay: use intel_de_*() functions for register access fa2af54524c8 drm/i915/lvds: use intel_de_*() functions for register access 38949463942f drm/i915/lpe_audio: use intel_de_*() functions for register access 3841cf8aa830 drm/i915/hdmi: use intel_de_*() functions for register access 3525b2857c38 drm/i915/hdcp: use intel_de_*() functions for register access fd2ac1b92db5 drm/i915/gmbus: use intel_de_*() functions for register access f6f92e9ec996 drm/i915/fifo_underrun: use intel_de_*() functions for register access 46415f31fdbe drm/i915/fbc: use intel_de_*() functions for register access 6b856ed292fb drm/i915/dvo: use intel_de_*() functions for register access 6351092052d2 drm/i915/dsb: use intel_de_*() functions for register access 62cb010d54e3 drm/i915/dp_mst: use intel_de_*() functions for register access dac3c1307ff6 drm/i915/dpll_mgr: use intel_de_*() functions for register access 59d4feee81b6 drm/i915/dpio_phy: use intel_de_*() functions for register access f827549283b1 drm/i915/dp: use intel_de_*() functions for register access 9129d0adc87c drm/i915/display_power: use intel_de_*() functions for register access dadca7367192 drm/i915/display: use intel_de_*() functions for register access 3626a27aaf8e drm/i915/ddi: use intel_de_*() functions for register access d93abf166aae drm/i915/crt: use intel_de_*() functions for register access 975fff8f273d drm/i915/combo_phy: use intel_de_*() functions for register access e3e9bb668fb8 drm/i915/color: use intel_de_*() functions for register access 65fb0d418cb5 drm/i915/cdclk: use intel_de_*() functions for register access 36f2779671c5 drm/i915/audio: use intel_de_*() functions for register access c07095a827f3 drm/i915/icl_dsi: use intel_de_*() functions for register access
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 94 lines · Jani Nikula
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.
Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Lucas De Marchi <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Ville Syrjälä <[email protected]>[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 accessdrivers/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 +-
Quoted 8 lines
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(-)
There's a lot of display (watermark) code in intel_pm.c as well, even though it doesn't live in the display/ directory. We should probably pull the watermark stuff out into a separate display/intel_wm.c or something soon, but in the meantime we'll probably want to switch a bunch of that code over to using these new functions. But I guess you can't do that with coccinelle though since there are parts of the file that aren't display-related and shouldn't use the same display helpers.
Matt
Quoted 8 lines
Signature · 7 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
Quoted 7 lines · Matt Roper
There's a lot of display (watermark) code in
intel_pm.cas well, even though it doesn't live in the display/ directory. We should probably pull the watermark stuff out into a separatedisplay/intel_wm.cor something soon, but in the meantime we'll probably want to switch a bunch of that code over to using these new functions. But I guess you can't do that with coccinelle though since there are parts of the file that aren't display-related and shouldn't use the same display helpers.
Yeah, display/ was a clear-cut line. I may have already pushed some patches using intel_de_*_fw from the top level code, but I think it would be better to move all large chunks of code that do display uncore stuff under display/.
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
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/display: mass conversion to intel_de_*() register accessors
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915/display: mass conversion to intel_de_*() register accessors
URL : https://patchwork.freedesktop.org/series/72533/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7809_full -> Patchwork_16255_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_16255_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-kbl: [PASS][1] -> [DMESG-WARN][2] ([i915#180]) +4 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-kbl2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-kbl7/igt@[email protected]
* igt@gem_ctx_persistence@vcs0-mixed-process:
- shard-apl: [PASS][3] -> [FAIL][4] ([i915#679])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-apl8/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-apl1/igt@[email protected]
* igt@gem_ctx_persistence@vcs1-mixed-process:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276] / [fdo#112080]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb8/igt@[email protected]
* igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#112080]) +8 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb7/igt@[email protected]
* igt@gem_exec_schedule@in-order-bsd2:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#109276]) +22 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb8/igt@[email protected]
* igt@gem_exec_schedule@pi-distinct-iova-bsd:
- shard-iclb: [PASS][11] -> [SKIP][12] ([i915#677]) +2 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb7/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb1/igt@[email protected]
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#112146]) +5 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb5/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb4/igt@[email protected]
* igt@i915_selftest@mock_requests:
- shard-hsw: [PASS][15] -> [INCOMPLETE][16] ([i915#61])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-hsw2/igt@i915_selftest@mock_requests.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-hsw1/igt@i915_selftest@mock_requests.html
* igt@kms_color@pipe-a-ctm-negative:
- shard-skl: [PASS][17] -> [DMESG-WARN][18] ([i915#109])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-skl10/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-skl3/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-move:
- shard-tglb: [PASS][19] -> [FAIL][20] ([i915#49]) +6 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-tglb7/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-tglb1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#108145]) +1 similar issue
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-skl6/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-skl8/igt@[email protected]
* igt@kms_psr@psr2_cursor_blt:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109441]) +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb8/igt@kms_psr@psr2_cursor_blt.html
#### Possible fixes ####
* igt@gem_ctx_isolation@bcs0-s3:
- shard-skl: [INCOMPLETE][25] ([i915#69]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-skl6/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-skl9/igt@[email protected]
* igt@gem_ctx_isolation@vcs1-clean:
- shard-iclb: [SKIP][27] ([fdo#109276] / [fdo#112080]) -> [PASS][28] +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb5/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb4/igt@[email protected]
* igt@gem_ctx_persistence@vecs0-mixed-process:
- shard-glk: [FAIL][29] ([i915#679]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-glk4/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-glk3/igt@[email protected]
- shard-skl: [FAIL][31] ([i915#679]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-skl10/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-skl5/igt@[email protected]
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [SKIP][33] ([fdo#110841]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb4/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb6/igt@[email protected]
* igt@gem_exec_flush@basic-batch-kernel-default-cmd:
- shard-glk: [INCOMPLETE][35] ([i915#58] / [k.org#198133]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-glk9/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-glk3/igt@[email protected]
* igt@gem_exec_schedule@promotion-bsd:
- shard-iclb: [SKIP][37] ([fdo#112146]) -> [PASS][38] +2 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb8/igt@[email protected]
* igt@gem_exec_schedule@promotion-bsd1:
- shard-iclb: [SKIP][39] ([fdo#109276]) -> [PASS][40] +10 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb5/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb4/igt@[email protected]
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [FAIL][41] ([i915#644]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-glk5/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-glk2/igt@[email protected]
* igt@gen7_exec_parse@basic-offset:
- shard-hsw: [FAIL][43] ([i915#694]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-hsw1/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-hsw7/igt@[email protected]
* igt@i915_pm_rps@waitboost:
- shard-iclb: [FAIL][45] ([i915#413]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb3/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb5/igt@[email protected]
* igt@i915_selftest@mock_requests:
- shard-skl: [INCOMPLETE][47] ([i915#198]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-skl9/igt@i915_selftest@mock_requests.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-skl2/igt@i915_selftest@mock_requests.html
* igt@kms_color@pipe-b-ctm-0-5:
- shard-skl: [DMESG-WARN][49] ([i915#109]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-skl8/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-skl1/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [DMESG-WARN][51] ([i915#180]) -> [PASS][52] +6 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-kbl2/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-kbl4/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb8888-render-ytiled:
- shard-skl: [FAIL][53] ([i915#52] / [i915#54]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-skl10/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-skl3/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-glk: [FAIL][55] ([i915#79]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-glk2/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-glk6/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-apl: [DMESG-WARN][57] ([i915#180]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-apl8/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-apl4/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-render:
- shard-tglb: [FAIL][59] ([i915#49]) -> [PASS][60] +5 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-render.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-render.html
* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [SKIP][61] ([fdo#109642] / [fdo#111068]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb3/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb2/igt@[email protected]
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][63] ([fdo#109441]) -> [PASS][64] +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb3/igt@kms_psr@psr2_primary_page_flip.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
* igt@perf@oa-exponents:
- shard-glk: [FAIL][65] ([i915#84]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-glk8/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-glk3/igt@[email protected]
* igt@perf_pmu@init-busy-vcs1:
- shard-iclb: [SKIP][67] ([fdo#112080]) -> [PASS][68] +8 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb5/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb4/igt@[email protected]
#### Warnings ####
* igt@gem_ctx_isolation@vcs1-nonpriv:
- shard-iclb: [FAIL][69] ([IGT#28]) -> [SKIP][70] ([fdo#109276] / [fdo#112080]) +1 similar issue
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb1/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb7/igt@[email protected]
* igt@gem_eio@kms:
- shard-snb: [INCOMPLETE][71] ([i915#82]) -> [DMESG-FAIL][72] ([i915#436])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-snb2/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-snb2/igt@[email protected]
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [DMESG-WARN][73] ([fdo#107724]) -> [SKIP][74] ([fdo#109349])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7809/shard-iclb2/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/shard-iclb8/igt@[email protected]
[IGT#28]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/28
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#109]: https://gitlab.freedesktop.org/drm/intel/issues/109
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#413]: https://gitlab.freedesktop.org/drm/intel/issues/413
[i915#436]: https://gitlab.freedesktop.org/drm/intel/issues/436
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#58]: https://gitlab.freedesktop.org/drm/intel/issues/58
[i915#61]: https://gitlab.freedesktop.org/drm/intel/issues/61
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#679]: https://gitlab.freedesktop.org/drm/intel/issues/679
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#84]: https://gitlab.freedesktop.org/drm/intel/issues/84
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7809 -> Patchwork_16255
CI-20190529: 20190529
CI_DRM_7809: 861f608ce6e3c1a1ad320a5d18055601cff36e45 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5382: 8dbe5ce61baa2d563d4dd7c56a018bb1e1077467 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16255: 913f16a2e7ae351c8ff99c4d782a9bfa4847b862 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16255/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Jani Nikula (2020-01-24 15:25:21)
Quoted 6 lines
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.
Quoted 6 lines
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?
Regards, Joonas
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx