drm/i915/sdvo: switch to kernel types
Subsystems (2)
PATCH v2 1/8 drm/i915/sdvo: switch to kernel types
Mixed C99 and kernel types use is getting ugly. Prefer kernel types.
sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'
v2: rebase
--- drivers/gpu/drm/i915/intel_sdvo.c | 78 +++++++++++++++---------------- 1 file changed, 39 insertions(+), 39 deletions(-)
drivers/gpu/drm/i915/intel_sdvo.c +39 -39
@@ -76,7 +76,7 @@ struct intel_sdvo {i915_reg_t sdvo_reg;/* Active outputs controlled by this SDVO output */ -uint16_t controlled_output; +u16 controlled_output;/* * Capabilities of the SDVO device returned by
@@ -91,12 +91,12 @@ struct intel_sdvo {* For multiple function SDVO device, * this is for current attached outputs. */ -uint16_t attached_output; +u16 attached_output;/* * Hotplug activation bits for this device */ -uint16_t hotplug_active; +u16 hotplug_active;enum port port;
@@ -104,19 +104,19 @@ struct intel_sdvo {bool has_hdmi_audio;/* DDC bus used by this SDVO encoder */ -uint8_t ddc_bus; +u8 ddc_bus;/* * the sdvo flag gets lost in round trip: dtd->adjusted_mode->dtd */ -uint8_t dtd_sdvo_flags; +u8 dtd_sdvo_flags; };struct intel_sdvo_connector {struct intel_connector base;/* Mark the type of connector */ -uint16_t output_flag; +u16 output_flag;/* This contains all current supported TV format */ u8 tv_format_supported[TV_FORMAT_NUM ];
@@ -184,7 +184,7 @@ to_intel_sdvo_connector(struct drm_connector *connector) container_of((conn_state), struct intel_sdvo_connector_state, base.base)static bool -intel_sdvo_output_setup (struct intel_sdvo *intel_sdvo,uint16_t flags); +intel_sdvo_output_setup (struct intel_sdvo *intel_sdvo,u16 flags); static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo, struct intel_sdvo_connector *intel_sdvo_connector,
@@ -746,9 +746,9 @@ static bool intel_sdvo_get_input_timing(struct intel_sdvo *intel_sdvo,static bool intel_sdvo_create_preferred_input_timing (struct intel_sdvo *intel_sdvo,struct intel_sdvo_connector *intel_sdvo_connector, -uint16_t clock, -uint16_t width, -uint16_t height) +u16 clock, +u16 width, +u16 height) {struct intel_sdvo_preferred_input_timing_args args;
@@ -791,9 +791,9 @@ static bool intel_sdvo_set_clock_rate_mult(struct intel_sdvo *intel_sdvo, u8 valstatic void intel_sdvo_get_dtd_from_mode (struct intel_sdvo_dtd *dtd,const struct drm_display_mode *mode) { -uint16_t width, height; -uint16_t h_blank_len, h_sync_len, v_blank_len, v_sync_len; -uint16_t h_sync_offset, v_sync_offset; +u16 width, height; +u16 h_blank_len, h_sync_len, v_blank_len, v_sync_len; +u16 h_sync_offset, v_sync_offset;int mode_clock;memset (dtd,0 ,sizeof (*dtd));
@@ -898,13 +898,13 @@ static bool intel_sdvo_check_supp_encode(struct intel_sdvo *intel_sdvo) }static bool intel_sdvo_set_encode (struct intel_sdvo *intel_sdvo, -uint8_t mode) +u8 mode) {return intel_sdvo_set_value (intel_sdvo,SDVO_CMD_SET_ENCODE , &mode,1 ); }static bool intel_sdvo_set_colorimetry (struct intel_sdvo *intel_sdvo, -uint8_t mode) +u8 mode) {return intel_sdvo_set_value (intel_sdvo,SDVO_CMD_SET_COLORIMETRY , &mode,1 ); }
@@ -913,11 +913,11 @@ static bool intel_sdvo_set_colorimetry(struct intel_sdvo *intel_sdvo,static void intel_sdvo_dump_hdmi_buf (struct intel_sdvo *intel_sdvo) {int i, j; -uint8_t set_buf_index[2 ]; -uint8_t av_split; -uint8_t buf_size; -uint8_t buf[48 ]; -uint8_t *pos; +u8 set_buf_index[2 ]; +u8 av_split; +u8 buf_size; +u8 buf[48 ]; +u8 *pos;intel_sdvo_get_value (encoder,SDVO_CMD_GET_HBUF_AV_SPLIT , &av_split,1 );
@@ -940,11 +940,11 @@ static void intel_sdvo_dump_hdmi_buf(struct intel_sdvo *intel_sdvo)#endif static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo, - unsigned if_index, uint8_t tx_rate, - const uint8_t *data, unsigned length) + unsigned int if_index, u8 tx_rate, + const u8 *data, unsigned int length) { - uint8_t set_buf_index[2] = { if_index, 0 }; - uint8_t hbuf_size, tmp[8]; + u8 set_buf_index[2] = { if_index, 0 }; + u8 hbuf_size, tmp[8]; int i; if (!intel_sdvo_set_value(intel_sdvo,
@@ -984,7 +984,7 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo, {const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; -uint8_t sdvo_data[HDMI_INFOFRAME_SIZE (AVI )]; +u8 sdvo_data[HDMI_INFOFRAME_SIZE (AVI )];union hdmi_infoframe frame;int ret;ssize_t len;
@@ -1017,7 +1017,7 @@ static bool intel_sdvo_set_tv_format(struct intel_sdvo *intel_sdvo, const struct drm_connector_state *conn_state) {struct intel_sdvo_tv_format format; -uint32_t format_map; +u32 format_map; format_map =1 << conn_state->tv.mode;memset (&format,0 ,sizeof (format));
@@ -1208,7 +1208,7 @@ static void intel_sdvo_update_props(struct intel_sdvo *intel_sdvo,const struct drm_connector_state *conn_state = &sdvo_state->base.base;struct intel_sdvo_connector *intel_sdvo_conn =to_intel_sdvo_connector (conn_state->connector); -uint16_t val; +u16 val;if (intel_sdvo_conn->left)UPDATE_PROPERTY (sdvo_state->tv.overscan_h,OVERSCAN_H );
@@ -1692,10 +1692,10 @@ static bool intel_sdvo_get_capabilities(struct intel_sdvo *intel_sdvo, struct inreturn true; } -static uint16_t intel_sdvo_get_hotplug_support (struct intel_sdvo *intel_sdvo) +static u16 intel_sdvo_get_hotplug_support (struct intel_sdvo *intel_sdvo) {struct drm_i915_private *dev_priv =to_i915 (intel_sdvo->base.base.dev); -uint16_t hotplug; +u16 hotplug;if (!I915_HAS_HOTPLUG (dev_priv))return 0 ;
@@ -1826,7 +1826,7 @@ intel_sdvo_connector_matches_edid(struct intel_sdvo_connector *sdvo,static enum drm_connector_status intel_sdvo_detect (struct drm_connector *connector,bool force) { -uint16_t response; +u16 response;struct intel_sdvo *intel_sdvo =intel_attached_sdvo (connector);struct intel_sdvo_connector *intel_sdvo_connector =to_intel_sdvo_connector (connector);enum drm_connector_status ret;
@@ -1977,7 +1977,7 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)struct intel_sdvo *intel_sdvo =intel_attached_sdvo (connector);const struct drm_connector_state *conn_state = connector->state;struct intel_sdvo_sdtv_resolution_request tv_res; -uint32_t reply =0 , format_map =0 ; +u32 reply =0 , format_map =0 ;int i; DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -2062,7 +2062,7 @@ static int intel_sdvo_connector_atomic_get_property(struct drm_connector *connector, const struct drm_connector_state *state, struct drm_property *property, - uint64_t *val) + u64 *val) { struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);const struct intel_sdvo_connector_state *sdvo_state =to_intel_sdvo_connector_state ((void *)state);
@@ -2121,7 +2121,7 @@ static int intel_sdvo_connector_atomic_set_property(struct drm_connector *connector, struct drm_connector_state *state, struct drm_property *property, - uint64_t val) + u64 val) { struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);struct intel_sdvo_connector_state *sdvo_state =to_intel_sdvo_connector_state (state);
@@ -2270,7 +2270,7 @@ static const struct drm_encoder_funcs intel_sdvo_enc_funcs = {static void intel_sdvo_guess_ddc_bus (struct intel_sdvo *sdvo) { -uint16_t mask =0 ; +u16 mask =0 ;unsigned int num_bits;/*
@@ -2671,7 +2671,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) }static bool -intel_sdvo_output_setup (struct intel_sdvo *intel_sdvo,uint16_t flags) +intel_sdvo_output_setup (struct intel_sdvo *intel_sdvo,u16 flags) {/* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/
@@ -2747,7 +2747,7 @@ static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo, {struct drm_device *dev = intel_sdvo->base.base.dev;struct intel_sdvo_tv_format format; -uint32_t format_map, i; +u32 format_map, i;if (!intel_sdvo_set_target_output (intel_sdvo, type))return false;
@@ -2814,7 +2814,7 @@ intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,struct drm_connector_state *conn_state = connector->state;struct intel_sdvo_connector_state *sdvo_state =to_intel_sdvo_connector_state (conn_state); -uint16_t response, data_value[2 ]; +u16 response, data_value[2 ];/* when horizontal overscan is supported, Add the left/right property */ if (enhancements.overscan_h) {
@@ -2925,7 +2925,7 @@ intel_sdvo_create_enhance_property_lvds(struct intel_sdvo *intel_sdvo, {struct drm_device *dev = intel_sdvo->base.base.dev;struct drm_connector *connector = &intel_sdvo_connector->base.base; -uint16_t response, data_value[2 ]; +u16 response, data_value[2 ];ENHANCEMENT (&connector->state->tv, brightness,BRIGHTNESS );
@@ -2939,7 +2939,7 @@ static bool intel_sdvo_create_enhance_property(struct intel_sdvo *intel_sdvo, {union {struct intel_sdvo_enhancements_reply reply; -uint16_t response; +u16 response; } enhancements;BUILD_BUG_ON (sizeof (enhancements) !=2 );
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/8 drm/i915/color: switch to kernel types
Mixed C99 and kernel types use is getting ugly. Prefer kernel types.
sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'
--- drivers/gpu/drm/i915/intel_color.c | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/intel_color.c +20 -20
@@ -142,7 +142,7 @@ static void ilk_load_csc_matrix(struct intel_crtc_state *crtc_state)struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);int i, pipe = crtc->pipe; -uint16_t coeffs[9 ] = {0 , }; +u16 coeffs[9 ] = {0 , };bool limited_color_range = false;/*
@@ -171,7 +171,7 @@ static void ilk_load_csc_matrix(struct intel_crtc_state *crtc_state)* hardware. */ for (i =0 ; i <ARRAY_SIZE (coeffs); i++) { -uint64_t abs_coeff = ((1ULL <<63 ) -1 ) & input[i]; +u64 abs_coeff = ((1ULL <<63 ) -1 ) & input[i];/* * Clamp input value to min/max supported by
@@ -233,7 +233,7 @@ static void ilk_load_csc_matrix(struct intel_crtc_state *crtc_state)I915_WRITE (PIPE_CSC_PREOFF_LO (pipe),0 );if (INTEL_GEN (dev_priv) >6 ) { -uint16_t postoff =0 ; +u16 postoff =0 ;if (limited_color_range) postoff = (16 * (1 <<12 ) /255 ) &0x1fff ;
@@ -244,7 +244,7 @@ static void ilk_load_csc_matrix(struct intel_crtc_state *crtc_state)I915_WRITE (PIPE_CSC_MODE (pipe),0 ); }else { -uint32_t mode =CSC_MODE_YUV_TO_RGB ; +u32 mode =CSC_MODE_YUV_TO_RGB ;if (limited_color_range) mode |=CSC_BLACK_SCREEN_OFFSET ;
@@ -261,15 +261,15 @@ static void cherryview_load_csc_matrix(struct intel_crtc_state *crtc_state)struct drm_device *dev = crtc_state->base.crtc->dev;struct drm_i915_private *dev_priv =to_i915 (dev);int pipe =to_intel_crtc (crtc_state->base.crtc)->pipe; -uint32_t mode; +u32 mode;if (crtc_state->base.ctm) {struct drm_color_ctm *ctm = crtc_state->base.ctm->data; -uint16_t coeffs[9 ] = {0 , }; +u16 coeffs[9 ] = {0 , };int i;for (i =0 ; i <ARRAY_SIZE (coeffs); i++) { -uint64_t abs_coeff = +u64 abs_coeff = ((1ULL <<63 ) -1 ) & ctm->matrix[i];/* Round coefficient. */
@@ -331,7 +331,7 @@ static void i9xx_load_luts_internal(struct intel_crtc_state *crtc_state,if (blob) {struct drm_color_lut *lut = blob->data;for (i =0 ; i <256 ; i++) { -uint32_t word = +u32 word = (drm_color_lut_extract (lut[i].red,8 ) <<16 ) | (drm_color_lut_extract (lut[i].green,8 ) <<8 ) |drm_color_lut_extract (lut[i].blue,8 );
@@ -343,7 +343,7 @@ static void i9xx_load_luts_internal(struct intel_crtc_state *crtc_state, } }else {for (i =0 ; i <256 ; i++) { -uint32_t word = (i <<16 ) | (i <<8 ) | i; +u32 word = (i <<16 ) | (i <<8 ) | i;if (HAS_GMCH_DISPLAY (dev_priv))I915_WRITE (PALETTE (pipe, i), word);
@@ -388,7 +388,7 @@ static void bdw_load_degamma_lut(struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev);enum pipe pipe =to_intel_crtc (crtc_state->base.crtc)->pipe; -uint32_t i, lut_size =INTEL_INFO (dev_priv)->color.degamma_lut_size; +u32 i, lut_size =INTEL_INFO (dev_priv)->color.degamma_lut_size;I915_WRITE (PREC_PAL_INDEX (pipe),PAL_PREC_SPLIT_MODE |PAL_PREC_AUTO_INCREMENT );
@@ -397,7 +397,7 @@ static void bdw_load_degamma_lut(struct intel_crtc_state *crtc_state)struct drm_color_lut *lut = crtc_state->base.degamma_lut->data;for (i =0 ; i < lut_size; i++) { -uint32_t word = +u32 word =drm_color_lut_extract (lut[i].red,10 ) <<20 |drm_color_lut_extract (lut[i].green,10 ) <<10 |drm_color_lut_extract (lut[i].blue,10 );
@@ -406,7 +406,7 @@ static void bdw_load_degamma_lut(struct intel_crtc_state *crtc_state) } }else {for (i =0 ; i < lut_size; i++) { -uint32_t v = (i * ((1 <<10 ) -1 )) / (lut_size -1 ); +u32 v = (i * ((1 <<10 ) -1 )) / (lut_size -1 );I915_WRITE (PREC_PAL_DATA (pipe), (v <<20 ) | (v <<10 ) | v);
@@ -418,7 +418,7 @@ static void bdw_load_gamma_lut(struct intel_crtc_state *crtc_state, u32 offset) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev);enum pipe pipe =to_intel_crtc (crtc_state->base.crtc)->pipe; -uint32_t i, lut_size =INTEL_INFO (dev_priv)->color.gamma_lut_size; +u32 i, lut_size =INTEL_INFO (dev_priv)->color.gamma_lut_size;WARN_ON (offset & ~PAL_PREC_INDEX_VALUE_MASK );
@@ -431,7 +431,7 @@ static void bdw_load_gamma_lut(struct intel_crtc_state *crtc_state, u32 offset)struct drm_color_lut *lut = crtc_state->base.gamma_lut->data;for (i =0 ; i < lut_size; i++) { -uint32_t word = +u32 word = (drm_color_lut_extract (lut[i].red,10 ) <<20 ) | (drm_color_lut_extract (lut[i].green,10 ) <<10 ) |drm_color_lut_extract (lut[i].blue,10 );
@@ -449,7 +449,7 @@ static void bdw_load_gamma_lut(struct intel_crtc_state *crtc_state, u32 offset) drm_color_lut_extract(lut[i].blue, 16)); }else {for (i =0 ; i < lut_size; i++) { -uint32_t v = (i * ((1 <<10 ) -1 )) / (lut_size -1 ); +u32 v = (i * ((1 <<10 ) -1 )) / (lut_size -1 );I915_WRITE (PREC_PAL_DATA (pipe), (v <<20 ) | (v <<10 ) | v);
@@ -491,8 +491,8 @@ static void glk_load_degamma_lut(struct intel_crtc_state *crtc_state) {struct drm_i915_private *dev_priv =to_i915 (crtc_state->base.crtc->dev);enum pipe pipe =to_intel_crtc (crtc_state->base.crtc)->pipe; -const uint32_t lut_size =33 ; -uint32_t i; +const u32 lut_size =33 ; +u32 i;/* * When setting the auto-increment bit, the hardware seems to
@@ -507,7 +507,7 @@ static void glk_load_degamma_lut(struct intel_crtc_state *crtc_state)* different values per channel, so this just loads a linear table. */ for (i =0 ; i < lut_size; i++) { -uint32_t v = (i * (1 <<16 )) / (lut_size -1 ); +u32 v = (i * (1 <<16 )) / (lut_size -1 );I915_WRITE (PRE_CSC_GAMC_DATA (pipe), v); }
@@ -544,8 +544,8 @@ static void cherryview_load_luts(struct intel_crtc_state *crtc_state)struct drm_i915_private *dev_priv =to_i915 (crtc->dev);enum pipe pipe =to_intel_crtc (crtc)->pipe;struct drm_color_lut *lut; -uint32_t i, lut_size; -uint32_t word0, word1; +u32 i, lut_size; +u32 word0, word1;if (crtc_state_is_legacy_gamma (crtc_state)) {/* Turn off degamma/gamma on CGM block. */
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/8 drm/i915/pm: switch to kernel types
In reply to Jani NikulaMixed C99 and kernel types use is getting ugly. Prefer kernel types.
sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'
Minor checkpatch fixes sprinkled on top of the changed lines.
--- drivers/gpu/drm/i915/intel_pm.c | 213 ++++++++++++++++---------------- 1 file changed, 105 insertions(+), 108 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +105 -108
@@ -480,7 +480,7 @@ static void vlv_get_fifo_size(struct intel_crtc_state *crtc_state)int sprite0_start, sprite1_start;switch (pipe) { -uint32_t dsparb, dsparb2, dsparb3; +u32 dsparb, dsparb2, dsparb3;case PIPE_A : dsparb =I915_READ (DSPARB ); dsparb2 =I915_READ (DSPARB2 );
@@ -513,7 +513,7 @@ static void vlv_get_fifo_size(struct intel_crtc_state *crtc_state)static int i9xx_get_fifo_size (struct drm_i915_private *dev_priv,enum i9xx_plane_id i9xx_plane) { -uint32_t dsparb =I915_READ (DSPARB ); +u32 dsparb =I915_READ (DSPARB );int size; size = dsparb &0x7f ;
@@ -529,7 +529,7 @@ static int i9xx_get_fifo_size(struct drm_i915_private *dev_priv,static int i830_get_fifo_size (struct drm_i915_private *dev_priv,enum i9xx_plane_id i9xx_plane) { -uint32_t dsparb =I915_READ (DSPARB ); +u32 dsparb =I915_READ (DSPARB );int size; size = dsparb &0x1ff ;
@@ -546,7 +546,7 @@ static int i830_get_fifo_size(struct drm_i915_private *dev_priv,static int i845_get_fifo_size (struct drm_i915_private *dev_priv,enum i9xx_plane_id i9xx_plane) { -uint32_t dsparb =I915_READ (DSPARB ); +u32 dsparb =I915_READ (DSPARB );int size; size = dsparb &0x7f ;
@@ -667,9 +667,9 @@ static unsigned int intel_wm_method1(unsigned int pixel_rate, unsigned int cpp, unsigned int latency) { - uint64_t ret; +u64 ret; - ret = (uint64_t ) pixel_rate * cpp * latency; + ret = (u64 )pixel_rate * cpp * latency; ret =DIV_ROUND_UP_ULL (ret,10000 );return ret;
@@ -1089,9 +1089,9 @@ static int g4x_fbc_fifo_size(int level) } } -static uint16_t g4x_compute_wm (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state, -int level) +static u16 g4x_compute_wm (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state, +int level) {struct intel_plane *plane =to_intel_plane (plane_state->base.plane);struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);
@@ -1188,9 +1188,9 @@ static bool g4x_raw_fbc_wm_set(struct intel_crtc_state *crtc_state,return dirty; } -static uint32_t ilk_compute_fbc_wm (const struct intel_crtc_state *cstate, -const struct intel_plane_state *pstate, -uint32_t pri_val); +static u32 ilk_compute_fbc_wm (const struct intel_crtc_state *cstate, +const struct intel_plane_state *pstate, +u32 pri_val);static bool g4x_raw_plane_wm_compute (struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state)
@@ -1598,9 +1598,9 @@ static void vlv_setup_wm_latency(struct drm_i915_private *dev_priv) } } -static uint16_t vlv_compute_wm_level (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state, -int level) +static u16 vlv_compute_wm_level (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state, +int level) {struct intel_plane *plane =to_intel_plane (plane_state->base.plane);struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);
@@ -1968,7 +1968,7 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,spin_lock (&dev_priv->uncore.lock);switch (crtc->pipe) { -uint32_t dsparb, dsparb2, dsparb3; +u32 dsparb, dsparb2, dsparb3;case PIPE_A : dsparb =I915_READ_FW (DSPARB ); dsparb2 =I915_READ_FW (DSPARB2 );
@@ -2262,8 +2262,8 @@ static void i9xx_update_wm(struct intel_crtc *unused_crtc) {struct drm_i915_private *dev_priv =to_i915 (unused_crtc->base.dev);const struct intel_watermark_params *wm_info; -uint32_t fwater_lo; -uint32_t fwater_hi; +u32 fwater_lo; +u32 fwater_hi;int cwm, srwm =1 ;int fifo_size;int planea_wm, planeb_wm;
@@ -2406,7 +2406,7 @@ static void i845_update_wm(struct intel_crtc *unused_crtc)struct drm_i915_private *dev_priv =to_i915 (unused_crtc->base.dev);struct intel_crtc *crtc;const struct drm_display_mode *adjusted_mode; -uint32_t fwater_lo; +u32 fwater_lo;int planea_wm; crtc =single_enabled_crtc (dev_priv);
@@ -2455,8 +2455,7 @@ static unsigned int ilk_wm_method2(unsigned int pixel_rate,return ret; } -static uint32_t ilk_wm_fbc (uint32_t pri_val,uint32_t horiz_pixels, -uint8_t cpp) +static u32 ilk_wm_fbc (u32 pri_val,u32 horiz_pixels,u8 cpp) {/* * Neither of these should be possible since this function shouldn't be
@@ -2473,22 +2472,21 @@ static uint32_t ilk_wm_fbc(uint32_t pri_val, uint32_t horiz_pixels, }struct ilk_wm_maximums { -uint16_t pri; -uint16_t spr; -uint16_t cur; -uint16_t fbc; +u16 pri; +u16 spr; +u16 cur; +u16 fbc; };/* * For both WM_PIPE and WM_LP. * mem_value must be in 0.1us units. */ -static uint32_t ilk_compute_pri_wm (const struct intel_crtc_state *cstate, -const struct intel_plane_state *pstate, -uint32_t mem_value, -bool is_lp) +static u32 ilk_compute_pri_wm (const struct intel_crtc_state *cstate, +const struct intel_plane_state *pstate, +u32 mem_value,bool is_lp) { -uint32_t method1, method2; +u32 method1, method2;int cpp;if (mem_value ==0 )
@@ -2516,11 +2514,11 @@ static uint32_t ilk_compute_pri_wm(const struct intel_crtc_state *cstate,* For both WM_PIPE and WM_LP. * mem_value must be in 0.1us units. */ -static uint32_t ilk_compute_spr_wm (const struct intel_crtc_state *cstate, -const struct intel_plane_state *pstate, -uint32_t mem_value) +static u32 ilk_compute_spr_wm (const struct intel_crtc_state *cstate, +const struct intel_plane_state *pstate, +u32 mem_value) { -uint32_t method1, method2; +u32 method1, method2;int cpp;if (mem_value ==0 )
@@ -2543,9 +2541,9 @@ static uint32_t ilk_compute_spr_wm(const struct intel_crtc_state *cstate,* For both WM_PIPE and WM_LP. * mem_value must be in 0.1us units. */ -static uint32_t ilk_compute_cur_wm (const struct intel_crtc_state *cstate, -const struct intel_plane_state *pstate, -uint32_t mem_value) +static u32 ilk_compute_cur_wm (const struct intel_crtc_state *cstate, +const struct intel_plane_state *pstate, +u32 mem_value) {int cpp;
@@ -2563,9 +2561,9 @@ static uint32_t ilk_compute_cur_wm(const struct intel_crtc_state *cstate, }/* Only for WM_LP. */ -static uint32_t ilk_compute_fbc_wm (const struct intel_crtc_state *cstate, -const struct intel_plane_state *pstate, -uint32_t pri_val) +static u32 ilk_compute_fbc_wm (const struct intel_crtc_state *cstate, +const struct intel_plane_state *pstate, +u32 pri_val) {int cpp;
@@ -2731,9 +2729,9 @@ static bool ilk_validate_wm_level(int level,DRM_DEBUG_KMS ("Cursor WM%d too large %u (max %u)\n" , level, result->cur_val, max->cur); - result->pri_val =min_t (uint32_t, result->pri_val, max->pri); - result->spr_val =min_t (uint32_t, result->spr_val, max->spr); - result->cur_val =min_t (uint32_t, result->cur_val, max->cur); + result->pri_val =min_t (u32, result->pri_val, max->pri); + result->spr_val =min_t (u32, result->spr_val, max->spr); + result->cur_val =min_t (u32, result->cur_val, max->cur); result->enable = true; }
@@ -2749,9 +2747,9 @@ static void ilk_compute_wm_level(const struct drm_i915_private *dev_priv,const struct intel_plane_state *curstate, struct intel_wm_level *result) { - uint16_t pri_latency = dev_priv->wm.pri_latency[level]; -uint16_t spr_latency = dev_priv->wm.spr_latency[level]; -uint16_t cur_latency = dev_priv->wm.cur_latency[level]; + u16 pri_latency = dev_priv->wm.pri_latency[level]; +u16 spr_latency = dev_priv->wm.spr_latency[level]; +u16 cur_latency = dev_priv->wm.cur_latency[level];/* WM1+ latency values stored in 0.5us units */ if (level >0 ) {
@@ -2775,7 +2773,7 @@ static void ilk_compute_wm_level(const struct drm_i915_private *dev_priv, result->enable = true; } -static uint32_t +static u32 hsw_compute_linetime_wm (const struct intel_crtc_state *cstate) { const struct intel_atomic_state *intel_state =
@@ -2804,10 +2802,10 @@ hsw_compute_linetime_wm(const struct intel_crtc_state *cstate) }static void intel_read_wm_latency (struct drm_i915_private *dev_priv, -uint16_t wm[8 ]) +u16 wm[8 ]) {if (INTEL_GEN (dev_priv) >=9 ) { -uint32_t val; +u32 val;int ret, i;int level, max_level =ilk_wm_max_level (dev_priv);
@@ -2891,7 +2889,7 @@ static void intel_read_wm_latency(struct drm_i915_private *dev_priv, wm[0 ] +=1 ; }else if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { -uint64_t sskpd =I915_READ64 (MCH_SSKPD ); +u64 sskpd =I915_READ64 (MCH_SSKPD ); wm[0 ] = (sskpd >>56 ) &0xFF ;if (wm[0 ] ==0 )
@@ -2901,14 +2899,14 @@ static void intel_read_wm_latency(struct drm_i915_private *dev_priv, wm[3 ] = (sskpd >>20 ) &0x1FF ; wm[4 ] = (sskpd >>32 ) &0x1FF ; }else if (INTEL_GEN (dev_priv) >=6 ) { -uint32_t sskpd =I915_READ (MCH_SSKPD ); +u32 sskpd =I915_READ (MCH_SSKPD ); wm[0 ] = (sskpd >>SSKPD_WM0_SHIFT ) &SSKPD_WM_MASK ; wm[1 ] = (sskpd >>SSKPD_WM1_SHIFT ) &SSKPD_WM_MASK ; wm[2 ] = (sskpd >>SSKPD_WM2_SHIFT ) &SSKPD_WM_MASK ; wm[3 ] = (sskpd >>SSKPD_WM3_SHIFT ) &SSKPD_WM_MASK ; }else if (INTEL_GEN (dev_priv) >=5 ) { -uint32_t mltr =I915_READ (MLTR_ILK ); +u32 mltr =I915_READ (MLTR_ILK );/* ILK primary LP0 latency is 700 ns */ wm[0 ] =7 ;
@@ -2920,7 +2918,7 @@ static void intel_read_wm_latency(struct drm_i915_private *dev_priv, }static void intel_fixup_spr_wm_latency (struct drm_i915_private *dev_priv, -uint16_t wm[5 ]) +u16 wm[5 ]) {/* ILK sprite LP0 latency is 1300 ns */ if (IS_GEN (dev_priv,5 ))
@@ -2928,7 +2926,7 @@ static void intel_fixup_spr_wm_latency(struct drm_i915_private *dev_priv, }static void intel_fixup_cur_wm_latency (struct drm_i915_private *dev_priv, -uint16_t wm[5 ]) +u16 wm[5 ]) {/* ILK cursor LP0 latency is 1300 ns */ if (IS_GEN (dev_priv,5 ))
@@ -2950,7 +2948,7 @@ int ilk_wm_max_level(const struct drm_i915_private *dev_priv)static void intel_print_wm_latency (struct drm_i915_private *dev_priv,const char *name, -const uint16_t wm[8 ]) +const u16 wm[8 ]) {int level, max_level =ilk_wm_max_level (dev_priv);
@@ -2979,7 +2977,7 @@ static void intel_print_wm_latency(struct drm_i915_private *dev_priv, }static bool ilk_increase_wm_latency (struct drm_i915_private *dev_priv, -uint16_t wm[5 ],uint16_t min) +u16 wm[5 ],u16 min) {int level, max_level =ilk_wm_max_level (dev_priv);
@@ -2988,7 +2986,7 @@ static bool ilk_increase_wm_latency(struct drm_i915_private *dev_priv, wm[0 ] =max (wm[0 ], min);for (level =1 ; level <= max_level; level++) - wm[level] =max_t (uint16_t, wm[level],DIV_ROUND_UP (min,5 )); + wm[level] =max_t (u16, wm[level],DIV_ROUND_UP (min,5 ));return true; }
@@ -3535,7 +3533,7 @@ static void ilk_write_wm_values(struct drm_i915_private *dev_priv, {struct ilk_wm_values *previous = &dev_priv->wm.hw;unsigned int dirty; -uint32_t val; +u32 val; dirty =ilk_compute_wm_dirty (dev_priv, previous, results);if (!dirty)
@@ -4033,7 +4031,7 @@ skl_plane_downscale_amount(const struct intel_crtc_state *cstate, const struct intel_plane_state *pstate) {struct intel_plane *plane =to_intel_plane (pstate->base.plane); -uint32_t src_w, src_h, dst_w, dst_h; +u32 src_w, src_h, dst_w, dst_h;uint_fixed_16_16_t fp_w_ratio, fp_h_ratio;uint_fixed_16_16_t downscale_h, downscale_w;
@@ -4079,8 +4077,8 @@ skl_pipe_downscale_amount(const struct intel_crtc_state *crtc_state)return pipe_downscale;if (crtc_state->pch_pfit.enabled) { -uint32_t src_w, src_h, dst_w, dst_h; -uint32_t pfit_size = crtc_state->pch_pfit.size; +u32 src_w, src_h, dst_w, dst_h; +u32 pfit_size = crtc_state->pch_pfit.size;uint_fixed_16_16_t fp_w_ratio, fp_h_ratio;uint_fixed_16_16_t downscale_h, downscale_w;
@@ -4113,7 +4111,7 @@ int skl_check_pipe_max_pixel_rate(struct intel_crtc *intel_crtc,const struct drm_plane_state *pstate;struct intel_plane_state *intel_pstate;int crtc_clock, dotclk; -uint32_t pipe_max_pixel_rate; +u32 pipe_max_pixel_rate;uint_fixed_16_16_t pipe_downscale;uint_fixed_16_16_t max_downscale =u32_to_fixed16 (1 );
@@ -4169,8 +4167,8 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate, {struct intel_plane *intel_plane =to_intel_plane (intel_pstate->base.plane); -uint32_t data_rate; -uint32_t width =0 , height =0 ; +u32 data_rate; +u32 width =0 , height =0 ;struct drm_framebuffer *fb;u32 format;uint_fixed_16_16_t down_scale_amount;
@@ -4313,15 +4311,15 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct skl_ddb_entry *alloc = &cstate->wm.skl.ddb;struct skl_plane_wm *wm; -uint16_t alloc_size, start =0 ; -uint16_t total[I915_MAX_PLANES ] = {}; -uint16_t uv_total[I915_MAX_PLANES ] = {}; +u16 alloc_size, start =0 ; +u16 total[I915_MAX_PLANES ] = {}; +u16 uv_total[I915_MAX_PLANES ] = {};u64 total_data_rate;enum plane_id plane_id;int num_active;u64 plane_data_rate[I915_MAX_PLANES ] = {};u64 uv_plane_data_rate[I915_MAX_PLANES ] = {}; -uint16_t blocks =0 ; +u16 blocks =0 ;int level;/* Clear the partitioning for disabled planes. */
@@ -4493,10 +4491,10 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,* 2xcdclk is 1350 MHz and the pixel rate should never exceed that. */ static uint_fixed_16_16_t -skl_wm_method1 (const struct drm_i915_private *dev_priv,uint32_t pixel_rate, -uint8_t cpp,uint32_t latency,uint32_t dbuf_block_size) +skl_wm_method1 (const struct drm_i915_private *dev_priv,u32 pixel_rate, +u8 cpp,u32 latency,u32 dbuf_block_size) { -uint32_t wm_intermediate_val; +u32 wm_intermediate_val;uint_fixed_16_16_t ret;if (latency ==0 )
@@ -4511,12 +4509,11 @@ skl_wm_method1(const struct drm_i915_private *dev_priv, uint32_t pixel_rate,return ret; } -static uint_fixed_16_16_t skl_wm_method2 (uint32_t pixel_rate, -uint32_t pipe_htotal, -uint32_t latency, -uint_fixed_16_16_t plane_blocks_per_line) +static uint_fixed_16_16_t +skl_wm_method2 (u32 pixel_rate,u32 pipe_htotal,u32 latency, +uint_fixed_16_16_t plane_blocks_per_line) { -uint32_t wm_intermediate_val; +u32 wm_intermediate_val;uint_fixed_16_16_t ret;if (latency ==0 )
@@ -4532,8 +4529,8 @@ static uint_fixed_16_16_t skl_wm_method2(uint32_t pixel_rate,static uint_fixed_16_16_t intel_get_linetime_us (const struct intel_crtc_state *cstate) { -uint32_t pixel_rate; -uint32_t crtc_htotal; +u32 pixel_rate; +u32 crtc_htotal;uint_fixed_16_16_t linetime_us;if (!cstate->base.active)
@@ -4550,11 +4547,11 @@ intel_get_linetime_us(const struct intel_crtc_state *cstate)return linetime_us; } -static uint32_t +static u32 skl_adjusted_plane_pixel_rate (const struct intel_crtc_state *cstate,const struct intel_plane_state *pstate) { -uint64_t adjusted_pixel_rate; +u64 adjusted_pixel_rate;uint_fixed_16_16_t downscale_amount;/* Shouldn't reach here on disabled planes... */
@@ -4581,7 +4578,7 @@ skl_compute_plane_wm_params(const struct intel_crtc_state *cstate,struct drm_i915_private *dev_priv =to_i915 (plane->base.dev);const struct drm_plane_state *pstate = &intel_pstate->base;const struct drm_framebuffer *fb = pstate->fb; -uint32_t interm_pbpl; +u32 interm_pbpl;struct intel_atomic_state *state =to_intel_atomic_state (cstate->base.state);bool apply_memory_bw_wa =skl_needs_memory_bw_wa (state);
@@ -4686,10 +4683,10 @@ static void skl_compute_plane_wm(const struct intel_crtc_state *cstate, {struct drm_i915_private *dev_priv =to_i915 (intel_pstate->base.plane->dev); -uint32_t latency = dev_priv->wm.skl_latency[level]; +u32 latency = dev_priv->wm.skl_latency[level];uint_fixed_16_16_t method1, method2;uint_fixed_16_16_t selected_result; -uint32_t res_blocks, res_lines; +u32 res_blocks, res_lines;struct intel_atomic_state *state =to_intel_atomic_state (cstate->base.state);bool apply_memory_bw_wa =skl_needs_memory_bw_wa (state);
@@ -4795,13 +4792,13 @@ skl_compute_wm_levels(const struct intel_crtc_state *cstate, } } -static uint32_t +static u32 skl_compute_linetime_wm (const struct intel_crtc_state *cstate) {struct drm_atomic_state *state = cstate->base.state;struct drm_i915_private *dev_priv =to_i915 (state->dev);uint_fixed_16_16_t linetime_us; -uint32_t linetime_wm; +u32 linetime_wm; linetime_us =intel_get_linetime_us (cstate);
@@ -4824,9 +4821,9 @@ static void skl_compute_transition_wm(const struct intel_crtc_state *cstate, {struct drm_device *dev = cstate->base.crtc->dev;const struct drm_i915_private *dev_priv =to_i915 (dev); -uint16_t trans_min, trans_y_tile_min; -const uint16_t trans_amount =10 ;/* This is configurable amount */ -uint16_t wm0_sel_res_b, trans_offset_b, res_blocks; +u16 trans_min, trans_y_tile_min; +const u16 trans_amount =10 ;/* This is configurable amount */ +u16 wm0_sel_res_b, trans_offset_b, res_blocks;/* Transition WM are not recommended by HW team for GEN9 */ if (INTEL_GEN (dev_priv) <=9 )
@@ -4855,8 +4852,8 @@ static void skl_compute_transition_wm(const struct intel_crtc_state *cstate, wm0_sel_res_b = wm->wm[0 ].plane_res_b -1 ;if (wp->y_tiled) { - trans_y_tile_min = (uint16_t )mul_round_up_u32_fixed16 (2 , - wp->y_tile_minimum); + trans_y_tile_min = + (u16 )mul_round_up_u32_fixed16 (2 , wp->y_tile_minimum); res_blocks =max (wm0_sel_res_b, trans_y_tile_min) + trans_offset_b; }else {
@@ -5030,7 +5027,7 @@ static void skl_write_wm_level(struct drm_i915_private *dev_priv,i915_reg_t reg, const struct skl_wm_level *level) { - uint32_t val = 0; + u32 val = 0;if (level->plane_en) { val |=PLANE_WM_EN ;
@@ -5161,12 +5158,12 @@ static int skl_update_pipe_wm(struct intel_crtc_state *cstate,return 0 ; } -static uint32_t +static u32 pipes_modified (struct intel_atomic_state *state) {struct intel_crtc *crtc;struct intel_crtc_state *cstate; -uint32_t i, ret =0 ; +u32 i, ret =0 ;for_each_new_intel_crtc_in_state (state, crtc, cstate, i) ret |=drm_crtc_mask (&crtc->base);
@@ -5267,7 +5264,7 @@ skl_ddb_add_affected_pipes(struct intel_atomic_state *state, bool *changed)const struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc *crtc;struct intel_crtc_state *crtc_state; -uint32_t realloc_pipes =pipes_modified (state); +u32 realloc_pipes =pipes_modified (state);int ret, i;/*
@@ -5566,7 +5563,7 @@ static void ilk_optimize_watermarks(struct intel_atomic_state *state,mutex_unlock (&dev_priv->wm.wm_mutex); } -static inline void skl_wm_level_from_reg_val (uint32_t val, +static inline void skl_wm_level_from_reg_val (u32 val,struct skl_wm_level *level) { level->plane_en = val &PLANE_WM_EN ;
@@ -5582,7 +5579,7 @@ void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc,enum pipe pipe = crtc->pipe;int level, max_level;enum plane_id plane_id; -uint32_t val; +u32 val; max_level =ilk_wm_max_level (dev_priv);
@@ -5694,7 +5691,7 @@ static void ilk_pipe_wm_get_hw_state(struct intel_crtc *crtc)static void g4x_read_wm_values (struct drm_i915_private *dev_priv,struct g4x_wm_values *wm) { -uint32_t tmp; +u32 tmp; tmp =I915_READ (DSPFW1 ); wm->sr.plane =_FW_WM (tmp,SR );
@@ -5721,7 +5718,7 @@ static void vlv_read_wm_values(struct drm_i915_private *dev_priv, struct vlv_wm_values *wm) {enum pipe pipe; -uint32_t tmp; +u32 tmp;for_each_pipe (dev_priv, pipe) { tmp =I915_READ (VLV_DDL (pipe));
@@ -8505,7 +8502,7 @@ static void g4x_disable_trickle_feed(struct drm_i915_private *dev_priv)static void ilk_init_clock_gating (struct drm_i915_private *dev_priv) { -uint32_t dspclk_gate =ILK_VRHUNIT_CLOCK_GATE_DISABLE ; +u32 dspclk_gate =ILK_VRHUNIT_CLOCK_GATE_DISABLE ;/* * Required for FBC
@@ -8577,7 +8574,7 @@ static void ilk_init_clock_gating(struct drm_i915_private *dev_priv)static void cpt_init_clock_gating (struct drm_i915_private *dev_priv) {int pipe; -uint32_t val; +u32 val;/* * On Ibex Peak and Cougar Point, we need to disable clock
@@ -8612,7 +8609,7 @@ static void cpt_init_clock_gating(struct drm_i915_private *dev_priv)static void gen6_check_mch_setup (struct drm_i915_private *dev_priv) { -uint32_t tmp; +u32 tmp; tmp =I915_READ (MCH_SSKPD );if ((tmp &MCH_SSKPD_WM0_MASK ) !=MCH_SSKPD_WM0_VAL )
@@ -8622,7 +8619,7 @@ static void gen6_check_mch_setup(struct drm_i915_private *dev_priv)static void gen6_init_clock_gating (struct drm_i915_private *dev_priv) { -uint32_t dspclk_gate =ILK_VRHUNIT_CLOCK_GATE_DISABLE ; +u32 dspclk_gate =ILK_VRHUNIT_CLOCK_GATE_DISABLE ;I915_WRITE (ILK_DSPCLK_GATE_D , dspclk_gate);
@@ -8716,7 +8713,7 @@ static void gen6_init_clock_gating(struct drm_i915_private *dev_priv)static void gen7_setup_fixed_func_scheduler (struct drm_i915_private *dev_priv) { -uint32_t reg =I915_READ (GEN7_FF_THREAD_MODE ); +u32 reg =I915_READ (GEN7_FF_THREAD_MODE );/* * WaVSThreadDispatchOverride:ivb,vlv
@@ -8752,7 +8749,7 @@ static void lpt_init_clock_gating(struct drm_i915_private *dev_priv)static void lpt_suspend_hw (struct drm_i915_private *dev_priv) {if (HAS_PCH_LPT_LP (dev_priv)) { -uint32_t val =I915_READ (SOUTH_DSPCLK_GATE_D ); +u32 val =I915_READ (SOUTH_DSPCLK_GATE_D ); val &= ~PCH_LP_PARTITION_LEVEL_DISABLE ;I915_WRITE (SOUTH_DSPCLK_GATE_D , val);
@@ -8990,7 +8987,7 @@ static void hsw_init_clock_gating(struct drm_i915_private *dev_priv)static void ivb_init_clock_gating (struct drm_i915_private *dev_priv) { -uint32_t snpcr; +u32 snpcr;I915_WRITE (ILK_DSPCLK_GATE_D ,ILK_VRHUNIT_CLOCK_GATE_DISABLE );
@@ -9199,7 +9196,7 @@ static void chv_init_clock_gating(struct drm_i915_private *dev_priv)static void g4x_init_clock_gating (struct drm_i915_private *dev_priv) { -uint32_t dspclk_gate; +u32 dspclk_gate;I915_WRITE (RENCLK_GATE_D1 ,0 ); I915_WRITE(RENCLK_GATE_D2, VF_UNIT_CLOCK_GATE_DISABLE |
@@ -9449,7 +9446,7 @@ void intel_init_pm(struct drm_i915_private *dev_priv)static inline int gen6_check_mailbox_status (struct drm_i915_private *dev_priv) { -uint32_t flags = +u32 flags =I915_READ_FW (GEN6_PCODE_MAILBOX ) &GEN6_PCODE_ERROR_MASK ;switch (flags) {
@@ -9472,7 +9469,7 @@ static inline int gen6_check_mailbox_status(struct drm_i915_private *dev_priv)static inline int gen7_check_mailbox_status (struct drm_i915_private *dev_priv) { -uint32_t flags = +u32 flags =I915_READ_FW (GEN6_PCODE_MAILBOX ) &GEN6_PCODE_ERROR_MASK ;switch (flags) {
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/8 drm/i915/ddi: switch to kernel types
In reply to Jani NikulaMixed C99 and kernel types use is getting ugly. Prefer kernel types.
sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'
--- drivers/gpu/drm/i915/intel_ddi.c | 52 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +26 -26
@@ -974,7 +974,7 @@ static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,DRM_ERROR ("Timeout waiting for DDI BUF %c idle bit\n" ,port_name (port)); } -static uint32_t hsw_pll_to_ddi_pll_sel (const struct intel_shared_dpll *pll) +static u32 hsw_pll_to_ddi_pll_sel (const struct intel_shared_dpll *pll) {switch (pll->info->id) {case DPLL_ID_WRPLL1 :
@@ -995,8 +995,8 @@ static uint32_t hsw_pll_to_ddi_pll_sel(const struct intel_shared_dpll *pll) } } -static uint32_t icl_pll_to_ddi_pll_sel (struct intel_encoder *encoder, -const struct intel_crtc_state *crtc_state) +static u32 icl_pll_to_ddi_pll_sel (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state) {const struct intel_shared_dpll *pll = crtc_state->shared_dpll;int clock = crtc_state->port_clock;
@@ -1243,8 +1243,8 @@ static int skl_calc_wrpll_link(struct drm_i915_private *dev_priv, enum intel_dpll_id pll_id) {i915_reg_t cfgcr1_reg, cfgcr2_reg; -uint32_t cfgcr1_val, cfgcr2_val; -uint32_t p0, p1, p2, dco_freq; +u32 cfgcr1_val, cfgcr2_val; +u32 p0, p1, p2, dco_freq; cfgcr1_reg =DPLL_CFGCR1 (pll_id); cfgcr2_reg =DPLL_CFGCR2 (pll_id);
@@ -1305,8 +1305,8 @@ static int skl_calc_wrpll_link(struct drm_i915_private *dev_priv,int cnl_calc_wrpll_link (struct drm_i915_private *dev_priv,enum intel_dpll_id pll_id) { -uint32_t cfgcr0, cfgcr1; -uint32_t p0, p1, p2, dco_freq, ref_clock; +u32 cfgcr0, cfgcr1; +u32 p0, p1, p2, dco_freq, ref_clock;if (INTEL_GEN (dev_priv) >=11 ) { cfgcr0 =I915_READ (ICL_DPLL_CFGCR0 (pll_id));
@@ -1471,7 +1471,7 @@ static void icl_ddi_clock_get(struct intel_encoder *encoder,struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port = encoder->port;int link_clock =0 ; -uint32_t pll_id; +u32 pll_id; pll_id =intel_get_shared_dpll_id (dev_priv, pipe_config->shared_dpll);if (intel_port_is_combophy (dev_priv, port)) {
@@ -1496,7 +1496,7 @@ static void cnl_ddi_clock_get(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);int link_clock =0 ; -uint32_t cfgcr0; +u32 cfgcr0;enum intel_dpll_id pll_id; pll_id =intel_get_shared_dpll_id (dev_priv, pipe_config->shared_dpll);
@@ -1550,7 +1550,7 @@ static void skl_ddi_clock_get(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);int link_clock =0 ; -uint32_t dpll_ctl1; +u32 dpll_ctl1;enum intel_dpll_id pll_id; pll_id =intel_get_shared_dpll_id (dev_priv, pipe_config->shared_dpll);
@@ -1739,7 +1739,7 @@ void intel_ddi_set_vc_payload_alloc(const struct intel_crtc_state *crtc_state,struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; -uint32_t temp; +u32 temp; temp =I915_READ (TRANS_DDI_FUNC_CTL (cpu_transcoder));if (state == true)
@@ -1757,7 +1757,7 @@ void intel_ddi_enable_transcoder_func(const struct intel_crtc_state *crtc_state)enum pipe pipe = crtc->pipe;enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;enum port port = encoder->port; -uint32_t temp; +u32 temp;/* Enable TRANS_DDI_FUNC_CTL for the pipe to work in HDMI mode */ temp =TRANS_DDI_FUNC_ENABLE ;
@@ -1841,7 +1841,7 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_statestruct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;i915_reg_t reg =TRANS_DDI_FUNC_CTL (cpu_transcoder); -uint32_t val =I915_READ (reg); +u32 val =I915_READ (reg); val &= ~(TRANS_DDI_FUNC_ENABLE |TRANS_DDI_PORT_MASK |TRANS_DDI_DP_VC_PAYLOAD_ALLOC ); val |=TRANS_DDI_PORT_NONE ;
@@ -1863,7 +1863,7 @@ int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder,intel_wakeref_t wakeref;enum pipe pipe =0 ;int ret =0 ; -uint32_t tmp; +u32 tmp; wakeref =intel_display_power_get_if_enabled (dev_priv, intel_encoder->power_domain);
@@ -1896,7 +1896,7 @@ bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)enum transcoder cpu_transcoder;intel_wakeref_t wakeref;enum pipe pipe =0 ; -uint32_t tmp; +u32 tmp;bool ret; wakeref = intel_display_power_get_if_enabled(dev_priv,
@@ -2132,7 +2132,7 @@ void intel_ddi_disable_pipe_clock(const struct intel_crtc_state *crtc_state) }static void _skl_ddi_set_iboost (struct drm_i915_private *dev_priv, -enum port port,uint8_t iboost) +enum port port,u8 iboost) {u32 tmp;
@@ -2151,7 +2151,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder,struct intel_digital_port *intel_dig_port =enc_to_dig_port (&encoder->base);struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port = encoder->port; -uint8_t iboost; +u8 iboost;if (type ==INTEL_OUTPUT_HDMI ) iboost = dev_priv->vbt.ddi_port_info[port].hdmi_boost_level;
@@ -2665,7 +2665,7 @@ static void icl_ddi_vswing_sequence(struct intel_encoder *encoder,icl_mg_phy_ddi_vswing_sequence (encoder, link_clock, level); } -static uint32_t translate_signal_level (int signal_levels) +static u32 translate_signal_level (int signal_levels) {int i;
@@ -2680,9 +2680,9 @@ static uint32_t translate_signal_level(int signal_levels)return 0 ; } -static uint32_t intel_ddi_dp_level (struct intel_dp *intel_dp) +static u32 intel_ddi_dp_level (struct intel_dp *intel_dp) { -uint8_t train_set = intel_dp->train_set[0 ]; +u8 train_set = intel_dp->train_set[0 ];int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK |DP_TRAIN_PRE_EMPHASIS_MASK );
@@ -2707,7 +2707,7 @@ u32 bxt_signal_levels(struct intel_dp *intel_dp)return 0 ; } -uint32_t ddi_signal_levels (struct intel_dp *intel_dp) +u32 ddi_signal_levels (struct intel_dp *intel_dp) {struct intel_digital_port *dport =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =to_i915 (dport->base.base.dev);
@@ -2721,8 +2721,8 @@ uint32_t ddi_signal_levels(struct intel_dp *intel_dp) }static inline -uint32_t icl_dpclka_cfgcr0_clk_off (struct drm_i915_private *dev_priv, -enum port port) +u32 icl_dpclka_cfgcr0_clk_off (struct drm_i915_private *dev_priv, +enum port port) {if (intel_port_is_combophy (dev_priv, port)) {return ICL_DPCLKA_CFGCR0_DDI_CLK_OFF (port);
@@ -2857,7 +2857,7 @@ static void intel_ddi_clk_select(struct intel_encoder *encoder, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev);enum port port = encoder->port; -uint32_t val; +u32 val;const struct intel_shared_dpll *pll = crtc_state->shared_dpll;if (WARN_ON (!pll))
@@ -3356,7 +3356,7 @@ void intel_ddi_fdi_post_disable(struct intel_encoder *encoder, const struct drm_connector_state *old_conn_state) {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -uint32_t val; +u32 val;/* * Bspec lists this as both step 13 (before DDI_BUF_CTL disable)
@@ -3644,7 +3644,7 @@ void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)struct drm_i915_private *dev_priv =to_i915 (intel_dig_port->base.base.dev);enum port port = intel_dig_port->base.port; -uint32_t val; +u32 val;bool wait = false;if (I915_READ (DP_TP_CTL (port)) &DP_TP_CTL_ENABLE ) {
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/8 drm/i915/csr: switch to kernel types
In reply to Jani NikulaMixed C99 and kernel types use is getting ugly. Prefer kernel types.
sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'
Minor checkpatch/whitepace fixes sprinkled on top of the changed lines.
v2: more whitespace fixes (Ville, José)
--- drivers/gpu/drm/i915/intel_csr.c | 68 ++++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +34 -34
@@ -70,50 +70,50 @@ MODULE_FIRMWARE(BXT_CSR_PATH);struct intel_css_header {/* 0x09 for DMC */ -uint32_t module_type; +u32 module_type;/* Includes the DMC specific header in dwords */ -uint32_t header_len; +u32 header_len;/* always value would be 0x10000 */ -uint32_t header_ver; +u32 header_ver;/* Not used */ -uint32_t module_id; +u32 module_id;/* Not used */ -uint32_t module_vendor; +u32 module_vendor;/* in YYYYMMDD format */ -uint32_t date; +u32 date;/* Size in dwords (CSS_Headerlen + PackageHeaderLen + dmc FWsLen)/4 */ -uint32_t size; +u32 size;/* Not used */ -uint32_t key_size; +u32 key_size;/* Not used */ -uint32_t modulus_size; +u32 modulus_size;/* Not used */ -uint32_t exponent_size; +u32 exponent_size;/* Not used */ -uint32_t reserved1[12 ]; +u32 reserved1[12 ];/* Major Minor */ -uint32_t version; +u32 version;/* Not used */ -uint32_t reserved2[8 ]; +u32 reserved2[8 ];/* Not used */ -uint32_t kernel_header_info; +u32 kernel_header_info; } __packed;struct intel_fw_info { -uint16_t reserved1; +u16 reserved1;/* Stepping (A, B, C, ..., *). * is a wildcard */ char stepping;
@@ -121,8 +121,8 @@ struct intel_fw_info {/* Sub-stepping (0, 1, ..., *). * is a wildcard */ char substepping; -uint32_t offset; -uint32_t reserved2; +u32 offset; +u32 reserved2; } __packed;struct intel_package_header {
@@ -135,14 +135,14 @@ struct intel_package_header {unsigned char reserved[10 ];/* Number of valid entries in the FWInfo array below */ -uint32_t num_entries; +u32 num_entries;struct intel_fw_info fw_info[20 ]; } __packed;struct intel_dmc_header {/* always value would be 0x40403E3E */ -uint32_t signature; +u32 signature;/* DMC binary header length */ unsigned char header_len;
@@ -151,30 +151,30 @@ struct intel_dmc_header {unsigned char header_ver;/* Reserved */ -uint16_t dmcc_ver; +u16 dmcc_ver;/* Major, Minor */ -uint32_t project; +u32 project;/* Firmware program size (excluding header) in dwords */ -uint32_t fw_size; +u32 fw_size;/* Major Minor version */ -uint32_t fw_version; +u32 fw_version;/* Number of valid MMIO cycles present. */ -uint32_t mmio_count; +u32 mmio_count;/* MMIO address */ -uint32_t mmioaddr[8 ]; +u32 mmioaddr[8 ];/* MMIO data */ -uint32_t mmiodata[8 ]; +u32 mmiodata[8 ];/* FW filename */ unsigned char dfile[32 ]; -uint32_t reserved1[2 ]; +u32 reserved1[2 ]; } __packed;struct stepping_info {
@@ -230,7 +230,7 @@ intel_get_stepping_info(struct drm_i915_private *dev_priv)static void gen9_set_dc_state_debugmask (struct drm_i915_private *dev_priv) { -uint32_t val, mask; +u32 val, mask; mask =DC_STATE_DEBUG_MASK_MEMORY_UP ;
@@ -257,7 +257,7 @@ static void gen9_set_dc_state_debugmask(struct drm_i915_private *dev_priv)void intel_csr_load_program (struct drm_i915_private *dev_priv) {u32 *payload = dev_priv->csr.dmc_payload; -uint32_t i, fw_size; +u32 i, fw_size;if (!HAS_CSR (dev_priv)) {DRM_ERROR ("No CSR support available for this platform\n" );
@@ -289,17 +289,17 @@ void intel_csr_load_program(struct drm_i915_private *dev_priv)gen9_set_dc_state_debugmask (dev_priv); } -static uint32_t *parse_csr_fw (struct drm_i915_private *dev_priv, -const struct firmware *fw) +static u32 *parse_csr_fw (struct drm_i915_private *dev_priv, +const struct firmware *fw) {struct intel_css_header *css_header;struct intel_package_header *package_header;struct intel_dmc_header *dmc_header;struct intel_csr *csr = &dev_priv->csr;const struct stepping_info *si =intel_get_stepping_info (dev_priv); -uint32_t dmc_offset =CSR_DEFAULT_FW_OFFSET , readcount =0 , nbytes; -uint32_t i; -uint32_t *dmc_payload; +u32 dmc_offset =CSR_DEFAULT_FW_OFFSET , readcount =0 , nbytes; +u32 i; +u32 *dmc_payload;if (!fw)return NULL ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/8 drm/i915/display: switch to kernel types
In reply to Jani NikulaMixed C99 and kernel types use is getting ugly. Prefer kernel types.
sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'
--- drivers/gpu/drm/i915/intel_display.c | 104 +++++++++++++-------------- 1 file changed, 52 insertions(+), 52 deletions(-)
drivers/gpu/drm/i915/intel_display.c +52 -52
@@ -52,7 +52,7 @@#include "i915_trace.h" /* Primary plane formats for gen <= 3 */ -static const uint32_t i8xx_primary_formats[] = { +static const u32 i8xx_primary_formats[] = {DRM_FORMAT_C8 ,DRM_FORMAT_RGB565 ,DRM_FORMAT_XRGB1555 ,
@@ -60,7 +60,7 @@ static const uint32_t i8xx_primary_formats[] = { };/* Primary plane formats for gen >= 4 */ -static const uint32_t i965_primary_formats[] = { +static const u32 i965_primary_formats[] = {DRM_FORMAT_C8 ,DRM_FORMAT_RGB565 ,DRM_FORMAT_XRGB8888 ,
@@ -69,18 +69,18 @@ static const uint32_t i965_primary_formats[] = { DRM_FORMAT_XBGR2101010, }; -static const uint64_t i9xx_format_modifiers[] = { +static const u64 i9xx_format_modifiers[] = {I915_FORMAT_MOD_X_TILED ,DRM_FORMAT_MOD_LINEAR ,DRM_FORMAT_MOD_INVALID };/* Cursor formats */ -static const uint32_t intel_cursor_formats[] = { +static const u32 intel_cursor_formats[] = {DRM_FORMAT_ARGB8888 , }; -static const uint64_t cursor_format_modifiers[] = { +static const u64 cursor_format_modifiers[] = {DRM_FORMAT_MOD_LINEAR ,DRM_FORMAT_MOD_INVALID };
@@ -496,7 +496,7 @@ static int pnv_calc_dpll_params(int refclk, struct dpll *clock)return clock->dot; } -static uint32_t i9xx_dpll_compute_m (struct dpll *dpll) +static u32 i9xx_dpll_compute_m (struct dpll *dpll) {return 5 * (dpll->m1 +2 ) + (dpll->m2 +2 ); }
@@ -531,8 +531,8 @@ int chv_calc_dpll_params(int refclk, struct dpll *clock) clock->p = clock->p1 * clock->p2;if (WARN_ON (clock->n ==0 || clock->p ==0 ))return 0 ; - clock->vco =DIV_ROUND_CLOSEST_ULL ((uint64_t )refclk * clock->m, - clock->n <<22 ); + clock->vco =DIV_ROUND_CLOSEST_ULL ((u64 )refclk * clock->m, + clock->n <<22 ); clock->dot =DIV_ROUND_CLOSEST (clock->vco, clock->p);return clock->dot /5 ;
@@ -894,7 +894,7 @@ chv_find_best_dpll(const struct intel_limit *limit,struct drm_device *dev = crtc->base.dev;unsigned int best_error_ppm;struct dpll clock; -uint64_t m2; +u64 m2;int found = false;memset (best_clock,0 ,sizeof (*best_clock));
@@ -916,7 +916,7 @@ chv_find_best_dpll(const struct intel_limit *limit, clock.p = clock.p1 * clock.p2; - m2 =DIV_ROUND_CLOSEST_ULL (((uint64_t )target * clock.p * + m2 =DIV_ROUND_CLOSEST_ULL (((u64 )target * clock.p * clock.n) <<22 , refclk * clock.m1);if (m2 >INT_MAX /clock.m1)
@@ -1613,7 +1613,7 @@ static void ironlake_enable_pch_transcoder(const struct intel_crtc_state *crtc_sstruct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe;i915_reg_t reg; -uint32_t val, pipeconf_val; +u32 val, pipeconf_val;/* Make sure PCH DPLL is enabled */ assert_shared_dpll_enabled (dev_priv, crtc_state->shared_dpll);
@@ -1701,7 +1701,7 @@ static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv, enum pipe pipe) {i915_reg_t reg; -uint32_t val; +u32 val;/* FDI relies on the transcoder */ assert_fdi_tx_disabled (dev_priv, pipe);
@@ -2378,7 +2378,7 @@ static int intel_fb_offset_to_xy(int *x, int *y,return 0 ; } -static unsigned int intel_fb_modifier_to_tiling (uint64_t fb_modifier) +static unsigned int intel_fb_modifier_to_tiling (u64 fb_modifier) {switch (fb_modifier) {case I915_FORMAT_MOD_X_TILED :
@@ -3510,7 +3510,7 @@ u32 skl_plane_stride(const struct intel_plane_state *plane_state,return stride /skl_plane_stride_mult (fb, color_plane, rotation); } -static u32 skl_plane_ctl_format (uint32_t pixel_format) +static u32 skl_plane_ctl_format (u32 pixel_format) {switch (pixel_format) {case DRM_FORMAT_C8 :
@@ -3580,7 +3580,7 @@ static u32 glk_plane_color_ctl_alpha(const struct intel_plane_state *plane_state } } -static u32 skl_plane_ctl_tiling (uint64_t fb_modifier) +static u32 skl_plane_ctl_tiling (u64 fb_modifier) {switch (fb_modifier) {case DRM_FORMAT_MOD_LINEAR :
@@ -4600,7 +4600,7 @@ static void ironlake_pch_transcoder_set_timings(const struct intel_crtc_state *cstatic void cpt_set_fdi_bc_bifurcation (struct drm_i915_private *dev_priv,bool enable) { -uint32_t temp; +u32 temp; temp =I915_READ (SOUTH_CHICKEN1 );if (!!(temp &FDI_BC_BIFURCATION_SELECT ) == enable)
@@ -5723,7 +5723,7 @@ static void icl_pipe_mbus_enable(struct intel_crtc *crtc) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -uint32_t val; +u32 val; val =MBUS_DBOX_A_CREDIT (2 ); val |=MBUS_DBOX_BW_CREDIT (1 );
@@ -6627,9 +6627,9 @@ static bool intel_crtc_supports_double_wide(const struct intel_crtc *crtc) (crtc->pipe ==PIPE_A ||IS_I915G (dev_priv)); } -static uint32_t ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config) +static u32 ilk_pipe_pixel_rate (const struct intel_crtc_state *pipe_config) { -uint32_t pixel_rate; +u32 pixel_rate; pixel_rate = pipe_config->base.adjusted_mode.crtc_clock;
@@ -6639,8 +6639,8 @@ static uint32_t ilk_pipe_pixel_rate(const struct intel_crtc_state *pipe_config)*/ if (pipe_config->pch_pfit.enabled) { -uint64_t pipe_w, pipe_h, pfit_w, pfit_h; -uint32_t pfit_size = pipe_config->pch_pfit.size; +u64 pipe_w, pipe_h, pfit_w, pfit_h; +u32 pfit_size = pipe_config->pch_pfit.size; pipe_w = pipe_config->pipe_src_w; pipe_h = pipe_config->pipe_src_h;
@@ -6655,7 +6655,7 @@ static uint32_t ilk_pipe_pixel_rate(const struct intel_crtc_state *pipe_config)if (WARN_ON (!pfit_w || !pfit_h))return pixel_rate; - pixel_rate =div_u64 ((uint64_t ) pixel_rate * pipe_w * pipe_h, + pixel_rate =div_u64 ((u64 )pixel_rate * pipe_w * pipe_h, pfit_w * pfit_h); }
@@ -6751,7 +6751,7 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc, }static void -intel_reduce_m_n_ratio (uint32_t *num,uint32_t *den) +intel_reduce_m_n_ratio (u32 *num,u32 *den) {while (*num >DATA_LINK_M_N_MASK || *den >DATA_LINK_M_N_MASK ) {
@@ -6761,7 +6761,7 @@ intel_reduce_m_n_ratio(uint32_t *num, uint32_t *den) }static void compute_m_n (unsigned int m,unsigned int n, -uint32_t *ret_m,uint32_t *ret_n, +u32 *ret_m,u32 *ret_n,bool constant_n) {/*
@@ -6776,7 +6776,7 @@ static void compute_m_n(unsigned int m, unsigned int n,else *ret_n = min_t(unsigned int, roundup_pow_of_two(n), DATA_LINK_N_MAX); - *ret_m =div_u64 ((uint64_t ) m * *ret_n, n); + *ret_m =div_u64 ((u64 )m * *ret_n, n);intel_reduce_m_n_ratio (ret_m, ret_n); }
@@ -6806,12 +6806,12 @@ static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv) && !(dev_priv->quirks &QUIRK_LVDS_SSC_DISABLE ); } -static uint32_t pnv_dpll_compute_fp (struct dpll *dpll) +static u32 pnv_dpll_compute_fp (struct dpll *dpll) {return (1 << dpll->n) <<16 | dpll->m2; } -static uint32_t i9xx_dpll_compute_fp (struct dpll *dpll) +static u32 i9xx_dpll_compute_fp (struct dpll *dpll) {return dpll->n <<16 | dpll->m1 <<8 | dpll->m2; }
@@ -7367,7 +7367,7 @@ static void intel_set_pipe_timings(const struct intel_crtc_state *crtc_state)enum pipe pipe = crtc->pipe;enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;const struct drm_display_mode *adjusted_mode = &crtc_state->base.adjusted_mode; -uint32_t crtc_vtotal, crtc_vblank_end; +u32 crtc_vtotal, crtc_vblank_end;int vsyncshift =0 ;/* We need to be careful not to changed the adjusted mode, for otherwise
@@ -7442,7 +7442,7 @@ static void intel_get_pipe_timings(struct intel_crtc *crtc,struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);enum transcoder cpu_transcoder = pipe_config->cpu_transcoder; -uint32_t tmp; +u32 tmp; tmp =I915_READ (HTOTAL (cpu_transcoder)); pipe_config->base.adjusted_mode.crtc_hdisplay = (tmp &0xffff ) +1 ;
@@ -7513,7 +7513,7 @@ static void i9xx_set_pipeconf(const struct intel_crtc_state *crtc_state) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -uint32_t pipeconf; +u32 pipeconf; pipeconf =0 ;
@@ -7758,7 +7758,7 @@ static void i9xx_get_pfit_config(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config) {struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev); -uint32_t tmp; +u32 tmp;if (INTEL_GEN (dev_priv) <=3 && (IS_I830 (dev_priv) || !IS_MOBILE (dev_priv)))
@@ -7974,7 +7974,7 @@ static bool i9xx_get_pipe_config(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum intel_display_power_domain power_domain;intel_wakeref_t wakeref; -uint32_t tmp; +u32 tmp;bool ret; power_domain =POWER_DOMAIN_PIPE (crtc->pipe);
@@ -8254,7 +8254,7 @@ static void ironlake_init_pch_refclk(struct drm_i915_private *dev_priv)static void lpt_reset_fdi_mphy (struct drm_i915_private *dev_priv) { -uint32_t tmp; +u32 tmp; tmp =I915_READ (SOUTH_CHICKEN2 ); tmp |=FDI_MPHY_IOSFSB_RESET_CTL ;
@@ -8276,7 +8276,7 @@ static void lpt_reset_fdi_mphy(struct drm_i915_private *dev_priv)/* WaMPhyProgramming:hsw */ static void lpt_program_fdi_mphy (struct drm_i915_private *dev_priv) { -uint32_t tmp; +u32 tmp; tmp =intel_sbi_read (dev_priv,0x8008 ,SBI_MPHY ); tmp &= ~(0xFF <<24 );
@@ -8357,7 +8357,7 @@ static void lpt_program_fdi_mphy(struct drm_i915_private *dev_priv)static void lpt_enable_clkout_dp (struct drm_i915_private *dev_priv,bool with_spread,bool with_fdi) { -uint32_t reg, tmp; +u32 reg, tmp;if (WARN (with_fdi && !with_spread,"FDI requires downspread\n" )) with_spread = true;
@@ -8396,7 +8396,7 @@ static void lpt_enable_clkout_dp(struct drm_i915_private *dev_priv,/* Sequence to disable CLKOUT_DP */ static void lpt_disable_clkout_dp (struct drm_i915_private *dev_priv) { -uint32_t reg, tmp; +u32 reg, tmp;mutex_lock (&dev_priv->sb_lock);
@@ -8421,7 +8421,7 @@ static void lpt_disable_clkout_dp(struct drm_i915_private *dev_priv)#define BEND_IDX (steps) ((50 + (steps)) / 5) -static const uint16_t sscdivintphase[] = { +static const u16 sscdivintphase[] = { [BEND_IDX (50 )] =0x3B23 , [BEND_IDX (45 )] =0x3B23 , [BEND_IDX (40 )] =0x3C23 ,
@@ -8453,7 +8453,7 @@ static const uint16_t sscdivintphase[] = {*/ static void lpt_bend_clkout_dp (struct drm_i915_private *dev_priv,int steps) { -uint32_t tmp; +u32 tmp;int idx =BEND_IDX (steps);if (WARN_ON (steps %5 !=0 ))
@@ -8519,7 +8519,7 @@ static void ironlake_set_pipeconf(const struct intel_crtc_state *crtc_state)struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -uint32_t val; +u32 val; val =0 ;
@@ -8866,7 +8866,7 @@ static void skylake_get_pfit_config(struct intel_crtc *crtc,struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_crtc_scaler_state *scaler_state = &pipe_config->scaler_state; -uint32_t ps_ctrl =0 ; +u32 ps_ctrl =0 ;int id =-1 ;int i;
@@ -9022,7 +9022,7 @@ static void ironlake_get_pfit_config(struct intel_crtc *crtc, {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); -uint32_t tmp; +u32 tmp; tmp =I915_READ (PF_CTL (crtc->pipe));
@@ -9048,7 +9048,7 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (dev);enum intel_display_power_domain power_domain;intel_wakeref_t wakeref; -uint32_t tmp; +u32 tmp;bool ret; power_domain =POWER_DOMAIN_PIPE (crtc->pipe);
@@ -9176,7 +9176,7 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv)I915_STATE_WARN (intel_irqs_enabled (dev_priv),"IRQs enabled\n" ); } -static uint32_t hsw_read_dcomp (struct drm_i915_private *dev_priv) +static u32 hsw_read_dcomp (struct drm_i915_private *dev_priv) {if (IS_HASWELL (dev_priv))return I915_READ (D_COMP_HSW );
@@ -9184,7 +9184,7 @@ static uint32_t hsw_read_dcomp(struct drm_i915_private *dev_priv)return I915_READ (D_COMP_BDW ); } -static void hsw_write_dcomp (struct drm_i915_private *dev_priv,uint32_t val) +static void hsw_write_dcomp (struct drm_i915_private *dev_priv,u32 val) {if (IS_HASWELL (dev_priv)) {mutex_lock (&dev_priv->pcu_lock);
@@ -9209,7 +9209,7 @@ static void hsw_write_dcomp(struct drm_i915_private *dev_priv, uint32_t val)static void hsw_disable_lcpll (struct drm_i915_private *dev_priv,bool switch_to_fclk,bool allow_power_down) { -uint32_t val; +u32 val;assert_can_disable_lcpll (dev_priv);
@@ -9256,7 +9256,7 @@ static void hsw_disable_lcpll(struct drm_i915_private *dev_priv,*/ static void hsw_restore_lcpll (struct drm_i915_private *dev_priv) { -uint32_t val; +u32 val; val =I915_READ (LCPLL_CTL );
@@ -9331,7 +9331,7 @@ static void hsw_restore_lcpll(struct drm_i915_private *dev_priv)*/ void hsw_enable_pc8 (struct drm_i915_private *dev_priv) { -uint32_t val; +u32 val;DRM_DEBUG_KMS ("Enabling package C8+\n" );
@@ -9347,7 +9347,7 @@ void hsw_enable_pc8(struct drm_i915_private *dev_priv)void hsw_disable_pc8 (struct drm_i915_private *dev_priv) { -uint32_t val; +u32 val;DRM_DEBUG_KMS ("Disabling package C8+\n" );
@@ -9469,7 +9469,7 @@ static void haswell_get_ddi_pll(struct drm_i915_private *dev_priv, struct intel_crtc_state *pipe_config) {enum intel_dpll_id id; -uint32_t ddi_pll_sel =I915_READ (PORT_CLK_SEL (port)); +u32 ddi_pll_sel =I915_READ (PORT_CLK_SEL (port));switch (ddi_pll_sel) {case PORT_CLK_SEL_WRPLL1 :
@@ -9639,7 +9639,7 @@ static void haswell_get_ddi_port_state(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_shared_dpll *pll;enum port port; -uint32_t tmp; +u32 tmp; tmp =I915_READ (TRANS_DDI_FUNC_CTL (pipe_config->cpu_transcoder));
@@ -13756,8 +13756,8 @@ intel_legacy_cursor_update(struct drm_plane *plane,struct drm_framebuffer *fb, int crtc_x, int crtc_y, unsigned int crtc_w, unsigned int crtc_h, - uint32_t src_x, uint32_t src_y, - uint32_t src_w, uint32_t src_h, + u32 src_x, u32 src_y, + u32 src_w, u32 src_h, struct drm_modeset_acquire_ctx *ctx) { struct drm_i915_private *dev_priv = to_i915(crtc->dev);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/8 drm/i915/i915_drv.h: switch to kernel types
In reply to Jani NikulaMixed C99 and kernel types use is getting ugly. Prefer kernel types.
sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'
--- drivers/gpu/drm/i915/i915_drv.h | 158 ++++++++++++++++---------------- 1 file changed, 79 insertions(+), 79 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +79 -79
@@ -334,16 +334,16 @@ struct drm_i915_display_funcs {struct intel_csr {struct work_struct work;const char *fw_path; -uint32_t required_version; -uint32_t max_fw_size;/* bytes */ -uint32_t *dmc_payload; -uint32_t dmc_fw_size;/* dwords */ -uint32_t version; -uint32_t mmio_count; +u32 required_version; +u32 max_fw_size;/* bytes */ +u32 *dmc_payload; +u32 dmc_fw_size;/* dwords */ +u32 version; +u32 mmio_count;i915_reg_t mmioaddr[8 ]; -uint32_t mmiodata[8 ]; -uint32_t dc_state; -uint32_t allowed_dc_mask; +u32 mmiodata[8 ]; +u32 dc_state; +u32 allowed_dc_mask;intel_wakeref_t wakeref; };
@@ -400,7 +400,7 @@ struct intel_fbc {struct {unsigned int mode_flags; -uint32_t hsw_bdw_pixel_rate; +u32 hsw_bdw_pixel_rate; } crtc;struct {
@@ -419,7 +419,7 @@ struct intel_fbc {int y; -uint16_t pixel_blend_mode; +u16 pixel_blend_mode; } plane;struct {
@@ -559,7 +559,7 @@ struct i915_suspend_saved_registers {u32 saveSWF0[16 ];u32 saveSWF1[16 ];u32 saveSWF3[3 ]; -uint64_t saveFENCE[I915_MAX_NUM_FENCES ]; +u64 saveFENCE[I915_MAX_NUM_FENCES ];u32 savePCH_PORT_HOTPLUG;u16 saveGCDGMBUS; };
@@ -906,9 +906,9 @@ struct i915_gem_mm {atomic_t bsd_engine_dispatch_index;/** Bit 6 swizzling required for X tiling */ -uint32_t bit_6_swizzle_x; +u32 bit_6_swizzle_x;/** Bit 6 swizzling required for Y tiling */ -uint32_t bit_6_swizzle_y; +u32 bit_6_swizzle_y;/* accounting, useful for userland debugging */ spinlock_t object_stat_lock;
@@ -935,20 +935,20 @@ struct ddi_vbt_port_info {* populate this field. */ #define HDMI_LEVEL_SHIFT_UNKNOWN 0xff -uint8_t hdmi_level_shift; +u8 hdmi_level_shift; - uint8_t supports_dvi:1; - uint8_t supports_hdmi:1; - uint8_t supports_dp:1; - uint8_t supports_edp:1; - uint8_t supports_typec_usb:1; - uint8_t supports_tbt:1; + u8 supports_dvi:1; + u8 supports_hdmi:1; + u8 supports_dp:1; + u8 supports_edp:1; + u8 supports_typec_usb:1; + u8 supports_tbt:1; -uint8_t alternate_aux_channel; -uint8_t alternate_ddc_pin; +u8 alternate_aux_channel; +u8 alternate_ddc_pin; -uint8_t dp_boost_level; -uint8_t hdmi_boost_level; +u8 dp_boost_level; +u8 hdmi_boost_level;int dp_max_link_rate;/* 0 for not limited by VBT */ };
@@ -1039,41 +1039,41 @@ enum intel_ddb_partitioning {struct intel_wm_level {bool enable; -uint32_t pri_val; -uint32_t spr_val; -uint32_t cur_val; -uint32_t fbc_val; +u32 pri_val; +u32 spr_val; +u32 cur_val; +u32 fbc_val; };struct ilk_wm_values { -uint32_t wm_pipe[3 ]; -uint32_t wm_lp[3 ]; -uint32_t wm_lp_spr[3 ]; -uint32_t wm_linetime[3 ]; +u32 wm_pipe[3 ]; +u32 wm_lp[3 ]; +u32 wm_lp_spr[3 ]; +u32 wm_linetime[3 ];bool enable_fbc_wm;enum intel_ddb_partitioning partitioning; };struct g4x_pipe_wm { -uint16_t plane[I915_MAX_PLANES ]; -uint16_t fbc; +u16 plane[I915_MAX_PLANES ]; +u16 fbc; };struct g4x_sr_wm { -uint16_t plane; -uint16_t cursor; -uint16_t fbc; +u16 plane; +u16 cursor; +u16 fbc; };struct vlv_wm_ddl_values { -uint8_t plane[I915_MAX_PLANES ]; +u8 plane[I915_MAX_PLANES ]; };struct vlv_wm_values {struct g4x_pipe_wm pipe[3 ];struct g4x_sr_wm sr;struct vlv_wm_ddl_values ddl[3 ]; -uint8_t level; +u8 level;bool cxsr; };
@@ -1087,10 +1087,10 @@ struct g4x_wm_values { };struct skl_ddb_entry { -uint16_t start, end;/* in number of blocks, 'end' is exclusive */ +u16 start, end;/* in number of blocks, 'end' is exclusive */ }; -static inline uint16_t skl_ddb_entry_size (const struct skl_ddb_entry *entry) +static inline u16 skl_ddb_entry_size (const struct skl_ddb_entry *entry) {return entry->end - entry->start; }
@@ -1114,8 +1114,8 @@ struct skl_ddb_values { };struct skl_wm_level { -uint16_t plane_res_b; -uint8_t plane_res_l; +u16 plane_res_b; +u8 plane_res_l;bool plane_en; };
@@ -1124,15 +1124,15 @@ struct skl_wm_params {bool x_tiled, y_tiled;bool rc_surface;bool is_planar; -uint32_t width; -uint8_t cpp; -uint32_t plane_pixel_rate; -uint32_t y_min_scanlines; -uint32_t plane_bytes_per_line; +u32 width; +u8 cpp; +u32 plane_pixel_rate; +u32 y_min_scanlines; +u32 plane_bytes_per_line;uint_fixed_16_16_t plane_blocks_per_line;uint_fixed_16_16_t y_tile_minimum; -uint32_t linetime_us; -uint32_t dbuf_block_size; +u32 linetime_us; +u32 dbuf_block_size; };/*
@@ -1515,14 +1515,14 @@ struct drm_i915_private {* Base address of where the gmbus and gpio blocks are located (either * on PCH or on SoC for platforms without PCH). */ -uint32_t gpio_mmio_base; +u32 gpio_mmio_base;/* MMIO base address for MIPI regs */ -uint32_t mipi_mmio_base; +u32 mipi_mmio_base; -uint32_t psr_mmio_base; +u32 psr_mmio_base; -uint32_t pps_mmio_base; +u32 pps_mmio_base;wait_queue_head_t gmbus_wait_queue;
@@ -1777,17 +1777,17 @@ struct drm_i915_private {* in 0.5us units for WM1+. */ /* primary */ -uint16_t pri_latency[5 ]; +u16 pri_latency[5 ];/* sprite */ -uint16_t spr_latency[5 ]; +u16 spr_latency[5 ];/* cursor */ -uint16_t cur_latency[5 ]; +u16 cur_latency[5 ];/* * Raw watermark memory latency values * for SKL for all 8 levels * in 1us units. */ -uint16_t skl_latency[8 ]; +u16 skl_latency[8 ];/* current hardware state */ union {
@@ -1797,7 +1797,7 @@ struct drm_i915_private {struct g4x_wm_values g4x; }; -uint8_t max_level; +u8 max_level;/* * Should be held around atomic WM register writing; also
@@ -2686,45 +2686,45 @@ i915_disable_pipestat(struct drm_i915_private *dev_priv, enum pipe pipe,void valleyview_enable_display_irqs (struct drm_i915_private *dev_priv);void valleyview_disable_display_irqs (struct drm_i915_private *dev_priv);void i915_hotplug_interrupt_update (struct drm_i915_private *dev_priv, -uint32_t mask, -uint32_t bits); +u32 mask, +u32 bits);void ilk_update_display_irq (struct drm_i915_private *dev_priv, -uint32_t interrupt_mask, -uint32_t enabled_irq_mask); +u32 interrupt_mask, +u32 enabled_irq_mask);static inline void -ilk_enable_display_irq (struct drm_i915_private *dev_priv,uint32_t bits) +ilk_enable_display_irq (struct drm_i915_private *dev_priv,u32 bits) {ilk_update_display_irq (dev_priv, bits, bits); }static inline void -ilk_disable_display_irq (struct drm_i915_private *dev_priv,uint32_t bits) +ilk_disable_display_irq (struct drm_i915_private *dev_priv,u32 bits) {ilk_update_display_irq (dev_priv, bits,0 ); }void bdw_update_pipe_irq (struct drm_i915_private *dev_priv,enum pipe pipe, -uint32_t interrupt_mask, -uint32_t enabled_irq_mask); +u32 interrupt_mask, +u32 enabled_irq_mask);static inline void bdw_enable_pipe_irq (struct drm_i915_private *dev_priv, -enum pipe pipe,uint32_t bits) +enum pipe pipe,u32 bits) {bdw_update_pipe_irq (dev_priv, pipe, bits, bits); }static inline void bdw_disable_pipe_irq (struct drm_i915_private *dev_priv, -enum pipe pipe,uint32_t bits) +enum pipe pipe,u32 bits) {bdw_update_pipe_irq (dev_priv, pipe, bits,0 ); }void ibx_display_interrupt_update (struct drm_i915_private *dev_priv, -uint32_t interrupt_mask, -uint32_t enabled_irq_mask); +u32 interrupt_mask, +u32 enabled_irq_mask);static inline void -ibx_enable_display_interrupt (struct drm_i915_private *dev_priv,uint32_t bits) +ibx_enable_display_interrupt (struct drm_i915_private *dev_priv,u32 bits) {ibx_display_interrupt_update (dev_priv, bits, bits); }static inline void -ibx_disable_display_interrupt (struct drm_i915_private *dev_priv,uint32_t bits) +ibx_disable_display_interrupt (struct drm_i915_private *dev_priv,u32 bits) {ibx_display_interrupt_update (dev_priv, bits,0 ); }
@@ -2984,7 +2984,7 @@ int i915_gem_dumb_create(struct drm_file *file_priv,struct drm_device *dev, struct drm_mode_create_dumb *args);int i915_gem_mmap_gtt (struct drm_file *file_priv,struct drm_device *dev, -uint32_t handle,uint64_t *offset); +u32 handle,u64 *offset);int i915_gem_mmap_gtt_version (void ); void i915_gem_track_fb(struct drm_i915_gem_object *old,
@@ -3125,7 +3125,7 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data, struct drm_file *file);void i915_oa_init_reg_state (struct intel_engine_cs *engine,struct i915_gem_context *ctx, -uint32_t *reg_state); +u32 *reg_state);/* i915_gem_evict.c */ int __must_check i915_gem_evict_something(struct i915_address_space *vm,
@@ -3377,10 +3377,10 @@ bool bxt_ddi_phy_is_enabled(struct drm_i915_private *dev_priv, enum dpio_phy phy);bool bxt_ddi_phy_verify_state (struct drm_i915_private *dev_priv,enum dpio_phy phy); -uint8_t bxt_ddi_phy_calc_lane_lat_optim_mask (uint8_t lane_count); +u8 bxt_ddi_phy_calc_lane_lat_optim_mask (u8 lane_count);void bxt_ddi_phy_set_lane_optim_mask (struct intel_encoder *encoder, -uint8_t lane_lat_optim_mask); -uint8_t bxt_ddi_phy_get_lane_lat_optim_mask (struct intel_encoder *encoder); +u8 lane_lat_optim_mask); +u8 bxt_ddi_phy_get_lane_lat_optim_mask (struct intel_encoder *encoder); void chv_set_phy_signal_level(struct intel_encoder *encoder, u32 deemph_reg_value, u32 margin_reg_value,
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 8/8 drm/i915/intel_drv.h: switch to kernel types
In reply to Jani NikulaMixed C99 and kernel types use is getting ugly. Prefer kernel types.
sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'
Minor checkpatch fixes sprinkled on top of the changed lines.
--- drivers/gpu/drm/i915/intel_drv.h | 94 ++++++++++++++++---------------- 1 file changed, 46 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/intel_drv.h +46 -48
@@ -300,13 +300,12 @@ struct intel_panel {/* Connector and platform specific backlight functions */ int (*setup)(struct intel_connector *connector,enum pipe pipe); -uint32_t (*get)(struct intel_connector *connector); -void (*set)(const struct drm_connector_state *conn_state,uint32_t level); +u32 (*get)(struct intel_connector *connector); +void (*set)(const struct drm_connector_state *conn_state,u32 level);void (*disable)(const struct drm_connector_state *conn_state);void (*enable)(const struct intel_crtc_state *crtc_state,const struct drm_connector_state *conn_state); -uint32_t (*hz_to_pwm)(struct intel_connector *connector, -uint32_t hz); +u32 (*hz_to_pwm)(struct intel_connector *connector,u32 hz);void (*power)(struct intel_connector *,bool enable); } backlight; };
@@ -598,7 +597,7 @@ struct intel_initial_plane_config {struct intel_scaler {int in_use; -uint32_t mode; +u32 mode; };struct intel_crtc_scaler_state {
@@ -636,7 +635,7 @@ struct intel_crtc_scaler_state {struct intel_pipe_wm {struct intel_wm_level wm[5 ]; -uint32_t linetime; +u32 linetime;bool fbc_wm_enabled;bool pipe_enabled;bool sprites_enabled;
@@ -652,7 +651,7 @@ struct skl_plane_wm {struct skl_pipe_wm {struct skl_plane_wm planes[I915_MAX_PLANES ]; -uint32_t linetime; +u32 linetime; };enum vlv_wm_level {
@@ -665,7 +664,7 @@ enum vlv_wm_level {struct vlv_wm_state {struct g4x_pipe_wm wm[NUM_VLV_WM_LEVELS ];struct g4x_sr_wm sr[NUM_VLV_WM_LEVELS ]; -uint8_t num_levels; +u8 num_levels;bool cxsr; };
@@ -878,13 +877,13 @@ struct intel_crtc_state {/* Used by SDVO (and if we ever fix it, HDMI). */ unsigned pixel_multiplier; -uint8_t lane_count; +u8 lane_count;/* * Used by platforms having DP/HDMI PHY with programmable lane * latency optimization. */ -uint8_t lane_lat_optim_mask; +u8 lane_lat_optim_mask;/* minimum acceptable voltage level */ u8 min_voltage_level;
@@ -928,7 +927,7 @@ struct intel_crtc_state {struct intel_crtc_wm_state wm;/* Gamma mode programmed on the pipe */ -uint32_t gamma_mode; +u32 gamma_mode;/* bitmask of visible planes (enum plane_id) */ u8 active_planes;
@@ -1014,7 +1013,7 @@ struct intel_plane {enum pipe pipe;bool has_fbc;bool has_ccs; -uint32_t frontbuffer_bit; +u32 frontbuffer_bit;struct {u32 base, cntl, size;
@@ -1109,9 +1108,9 @@ enum link_m_n_set {struct intel_dp_compliance_data {unsigned long edid; -uint8_t video_pattern; -uint16_t hdisplay, vdisplay; -uint8_t bpc; +u8 video_pattern; +u16 hdisplay, vdisplay; +u8 bpc; };struct intel_dp_compliance {
@@ -1124,18 +1123,18 @@ struct intel_dp_compliance {struct intel_dp {i915_reg_t output_reg; -uint32_t DP; +u32 DP;int link_rate; -uint8_t lane_count; -uint8_t sink_count; +u8 lane_count; +u8 sink_count;bool link_mst;bool link_trained;bool has_audio;bool reset_link_params; -uint8_t dpcd[DP_RECEIVER_CAP_SIZE ]; -uint8_t psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE ]; -uint8_t downstream_ports[DP_MAX_DOWNSTREAM_PORTS ]; -uint8_t edp_dpcd[EDP_DISPLAY_CTL_CAP_SIZE ]; +u8 dpcd[DP_RECEIVER_CAP_SIZE ]; +u8 psr_dpcd[EDP_PSR_RECEIVER_CAP_SIZE ]; +u8 downstream_ports[DP_MAX_DOWNSTREAM_PORTS ]; +u8 edp_dpcd[EDP_DISPLAY_CTL_CAP_SIZE ];u8 dsc_dpcd[DP_DSC_RECEIVER_CAP_SIZE ];u8 fec_capable;/* source rates */
@@ -1155,7 +1154,7 @@ struct intel_dp {/* sink or branch descriptor */ struct drm_dp_desc desc;struct drm_dp_aux aux; -uint8_t train_set[4 ]; +u8 train_set[4 ];int panel_power_up_delay;int panel_power_down_delay;int panel_power_cycle_delay;
@@ -1197,14 +1196,13 @@ struct intel_dp {struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES ];struct drm_dp_mst_topology_mgr mst_mgr; -uint32_t (*get_aux_clock_divider)(struct intel_dp *dp,int index); +u32 (*get_aux_clock_divider)(struct intel_dp *dp,int index);/* * This function returns the value we have to program the AUX_CTL * register with to kick off an AUX transaction. */ -uint32_t (*get_aux_send_ctl)(struct intel_dp *dp, -int send_bytes, -uint32_t aux_clock_divider); +u32 (*get_aux_send_ctl)(struct intel_dp *dp,int send_bytes, +u32 aux_clock_divider);i915_reg_t (*aux_ch_ctl_reg)(struct intel_dp *dp);i915_reg_t (*aux_ch_data_reg)(struct intel_dp *dp,int index);
@@ -1238,7 +1236,7 @@ struct intel_digital_port {struct intel_lspcon lspcon;enum irqreturn (*hpd_pulse)(struct intel_digital_port *,bool );bool release_cl2_override; -uint8_t max_lanes; +u8 max_lanes;/* Used for DP and ICL+ TypeC/DP and TypeC/HDMI ports. */ enum aux_ch aux_ch;enum intel_display_power_domain ddi_io_power_domain;
@@ -1473,8 +1471,8 @@ void intel_check_cpu_fifo_underruns(struct drm_i915_private *dev_priv);void intel_check_pch_fifo_underruns (struct drm_i915_private *dev_priv);/* i915_irq.c */ -void gen5_enable_gt_irq (struct drm_i915_private *dev_priv,uint32_t mask); -void gen5_disable_gt_irq (struct drm_i915_private *dev_priv,uint32_t mask); +void gen5_enable_gt_irq (struct drm_i915_private *dev_priv,u32 mask); +void gen5_disable_gt_irq (struct drm_i915_private *dev_priv,u32 mask);void gen6_mask_pm_irq (struct drm_i915_private *dev_priv,u32 mask);void gen6_unmask_pm_irq (struct drm_i915_private *dev_priv,u32 mask);void gen11_reset_rps_interrupts (struct drm_i915_private *dev_priv);
@@ -1537,7 +1535,7 @@ void intel_ddi_set_vc_payload_alloc(const struct intel_crtc_state *crtc_state,void intel_ddi_compute_min_voltage_level (struct drm_i915_private *dev_priv,struct intel_crtc_state *crtc_state);u32 bxt_signal_levels (struct intel_dp *intel_dp); -uint32_t ddi_signal_levels (struct intel_dp *intel_dp); +u32 ddi_signal_levels (struct intel_dp *intel_dp);u8 intel_ddi_dp_voltage_max (struct intel_encoder *encoder);u8 intel_ddi_dp_pre_emphasis_max (struct intel_encoder *encoder,u8 voltage_swing);
@@ -1677,11 +1675,11 @@ void intel_cleanup_plane_fb(struct drm_plane *plane,int intel_plane_atomic_get_property (struct drm_plane *plane,const struct drm_plane_state *state,struct drm_property *property, -uint64_t *val); +u64 *val);int intel_plane_atomic_set_property (struct drm_plane *plane,struct drm_plane_state *state,struct drm_property *property, -uint64_t val); +u64 val); int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_state, struct drm_crtc_state *crtc_state, const struct intel_plane_state *old_plane_state,
@@ -1801,10 +1799,10 @@ bool intel_dp_init(struct drm_i915_private *dev_priv, i915_reg_t output_reg,bool intel_dp_init_connector (struct intel_digital_port *intel_dig_port,struct intel_connector *intel_connector);void intel_dp_set_link_params (struct intel_dp *intel_dp, -int link_rate,uint8_t lane_count, +int link_rate,u8 lane_count,bool link_mst);int intel_dp_get_link_train_fallback_values (struct intel_dp *intel_dp, -int link_rate,uint8_t lane_count); +int link_rate,u8 lane_count);void intel_dp_start_link_train (struct intel_dp *intel_dp);void intel_dp_stop_link_train (struct intel_dp *intel_dp); int intel_dp_retrain_link(struct intel_encoder *encoder,
@@ -1836,7 +1834,7 @@ int intel_dp_max_lane_count(struct intel_dp *intel_dp);int intel_dp_rate_select (struct intel_dp *intel_dp,int rate);void intel_dp_hot_plug (struct intel_encoder *intel_encoder);void intel_power_sequencer_reset (struct drm_i915_private *dev_priv); -uint32_t intel_dp_pack_aux (const uint8_t *src,int src_bytes); +u32 intel_dp_pack_aux (const u8 *src,int src_bytes);void intel_plane_destroy (struct drm_plane *plane);void intel_edp_drrs_enable (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state);
@@ -1849,24 +1847,24 @@ void intel_edp_drrs_flush(struct drm_i915_private *dev_priv,void intel_dp_program_link_training_pattern (struct intel_dp *intel_dp, -uint8_t dp_train_pat); +u8 dp_train_pat);void intel_dp_set_signal_levels (struct intel_dp *intel_dp);void intel_dp_set_idle_link_train (struct intel_dp *intel_dp); -uint8_t +u8 intel_dp_voltage_max (struct intel_dp *intel_dp); -uint8_t -intel_dp_pre_emphasis_max (struct intel_dp *intel_dp,uint8_t voltage_swing); +u8 +intel_dp_pre_emphasis_max (struct intel_dp *intel_dp,u8 voltage_swing);void intel_dp_compute_rate (struct intel_dp *intel_dp,int port_clock, -uint8_t *link_bw,uint8_t *rate_select); +u8 *link_bw,u8 *rate_select);bool intel_dp_source_supports_hbr2 (struct intel_dp *intel_dp);bool intel_dp_source_supports_hbr3 (struct intel_dp *intel_dp);bool -intel_dp_get_link_status (struct intel_dp *intel_dp,uint8_t link_status[DP_LINK_STATUS_SIZE ]); -uint16_t intel_dp_dsc_get_output_bpp (int link_clock,uint8_t lane_count, -int mode_clock,int mode_hdisplay); -uint8_t intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp,int mode_clock, -int mode_hdisplay); +intel_dp_get_link_status (struct intel_dp *intel_dp,u8 link_status[DP_LINK_STATUS_SIZE ]); +u16 intel_dp_dsc_get_output_bpp (int link_clock,u8 lane_count, +int mode_clock,int mode_hdisplay); +u8 intel_dp_dsc_get_slice_count (struct intel_dp *intel_dp,int mode_clock, +int mode_hdisplay);/* intel_vdsc.c */ int intel_dp_compute_dsc_params(struct intel_dp *intel_dp,
@@ -2324,11 +2322,11 @@ void intel_tv_init(struct drm_i915_private *dev_priv);int intel_digital_connector_atomic_get_property (struct drm_connector *connector,const struct drm_connector_state *state,struct drm_property *property, -uint64_t *val); +u64 *val);int intel_digital_connector_atomic_set_property (struct drm_connector *connector,struct drm_connector_state *state,struct drm_property *property, -uint64_t val); +u64 val);int intel_digital_connector_atomic_check (struct drm_connector *conn,struct drm_connector_state *new_state); struct drm_connector_state *
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for series starting with [v2,1/8] drm/i915/sdvo: switch to kernel types
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [v2,1/8] drm/i915/sdvo: switch to kernel types
URL : https://patchwork.freedesktop.org/series/55405/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm/i915/sdvo: switch to kernel types Okay!
Commit: drm/i915/color: switch to kernel types
Okay!
Commit: drm/i915/pm: switch to kernel types -O:drivers/gpu/drm/i915/intel_pm.c:2734:35: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_pm.c:2734:35: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_pm.c:2735:35: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_pm.c:2735:35: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_pm.c:2736:35: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_pm.c:2736:35: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_pm.c:2989:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_pm.c:2989:17: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_pm.c:2991:29: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_pm.c:2991:29: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:2732:35: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:2732:35: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:2733:35: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:2733:35: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:2734:35: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:2734:35: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:2987:17: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:2987:17: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:2989:29: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:2989:29: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_pm.c:4860:30: warning: expression using sizeof(void) -O:drivers/gpu/drm/i915/intel_pm.c:4860:30: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:4857:30: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_pm.c:4857:30: warning: expression using sizeof(void)
Commit: drm/i915/ddi: switch to kernel types
Okay!
Commit: drm/i915/csr: switch to kernel types
Okay!
Commit: drm/i915/display: switch to kernel types -O:drivers/gpu/drm/i915/intel_display.c:6777:26: warning: expression using sizeof(void) +drivers/gpu/drm/i915/intel_display.c:6777:26: warning: expression using sizeof(void)
Commit: drm/i915/i915_drv.h: switch to kernel types Okay!
Commit: drm/i915/intel_drv.h: switch to kernel types Okay!
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v2,1/8] drm/i915/sdvo: switch to kernel types
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [v2,1/8] drm/i915/sdvo: switch to kernel types
URL : https://patchwork.freedesktop.org/series/55405/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5447 -> Patchwork_11982
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/55405/revisions/1/mbox/
Known issues
------------
Here are the changes found in Patchwork_11982 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@cs-compute:
- fi-kbl-8809g: NOTRUN -> FAIL [fdo#108094]
* igt@amdgpu/amd_prime@amd-to-i915:
- fi-kbl-8809g: NOTRUN -> FAIL [fdo#107341]
* igt@gem_ctx_create@basic-files:
- fi-kbl-7560u: PASS -> INCOMPLETE [fdo#103665]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: PASS -> FAIL [fdo#108767]
* igt@kms_pipe_crc_basic@read-crc-pipe-b:
- fi-byt-clapper: PASS -> FAIL [fdo#107362]
#### Possible fixes ####
* igt@amdgpu/amd_basic@userptr:
- fi-kbl-8809g: DMESG-WARN [fdo#108965] -> PASS
* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS
* igt@kms_frontbuffer_tracking@basic:
- fi-byt-clapper: FAIL [fdo#103167] -> PASS
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
- fi-byt-clapper: FAIL [fdo#107362] -> PASS
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS +2
* igt@prime_vgem@basic-fence-flip:
- fi-ilk-650: FAIL [fdo#104008] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#104008]: https://bugs.freedesktop.org/show_bug.cgi?id=104008
[fdo#107341]: https://bugs.freedesktop.org/show_bug.cgi?id=107341
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108094]: https://bugs.freedesktop.org/show_bug.cgi?id=108094
[fdo#108767]: https://bugs.freedesktop.org/show_bug.cgi?id=108767
[fdo#108965]: https://bugs.freedesktop.org/show_bug.cgi?id=108965
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
Participating hosts (47 -> 44)
------------------------------
Additional (1): fi-skl-6260u
Missing (4): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan
Build changes
-------------
* Linux: CI_DRM_5447 -> Patchwork_11982
CI_DRM_5447: 1fb7b31e074e222be369480ecef1c5c3a48991c9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4778: 0c80bd7f2a964605f307e0220c6bb756685582b9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11982: aa0bbbe79e671469c4995b0fd10af6f7f941070b @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
aa0bbbe79e67 drm/i915/intel_drv.h: switch to kernel types 929cc61e5519 drm/i915/i915_drv.h: switch to kernel types b12f56e334e2 drm/i915/display: switch to kernel types 90882c441f55 drm/i915/csr: switch to kernel types 71a190563ace drm/i915/ddi: switch to kernel types 3769d82334ec drm/i915/pm: switch to kernel types f0da617f2235 drm/i915/color: switch to kernel types 098679f95032 drm/i915/sdvo: switch to kernel types
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_11982/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [v2,1/8] drm/i915/sdvo: switch to kernel types
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [v2,1/8] drm/i915/sdvo: switch to kernel types
URL : https://patchwork.freedesktop.org/series/55405/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5447_full -> Patchwork_11982_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_11982_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_schedule@pi-ringfull-blt:
- shard-iclb: NOTRUN -> FAIL [fdo#103158]
* igt@gem_softpin@noreloc-s3:
- shard-skl: PASS -> INCOMPLETE [fdo#104108] / [fdo#107773]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
- shard-iclb: NOTRUN -> DMESG-WARN [fdo#107956] +1
* igt@kms_busy@extended-pageflip-hang-newfb-render-a:
- shard-hsw: PASS -> INCOMPLETE [fdo#103540]
* igt@kms_color@pipe-c-ctm-max:
- shard-apl: PASS -> FAIL [fdo#108147]
* igt@kms_cursor_crc@cursor-128x128-random:
- shard-skl: PASS -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-256x256-random:
- shard-glk: PASS -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-256x85-random:
- shard-apl: PASS -> FAIL [fdo#103232] +4
* igt@kms_cursor_crc@cursor-64x64-dpms:
- shard-apl: NOTRUN -> FAIL [fdo#103232]
- shard-iclb: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
- shard-glk: PASS -> FAIL [fdo#105454] / [fdo#106509]
* igt@kms_flip@modeset-vs-vblank-race:
- shard-glk: PASS -> FAIL [fdo#103060]
* igt@kms_frontbuffer_tracking@fbc-shrfb-scaledprimary:
- shard-glk: PASS -> FAIL [fdo#103167] +1
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-iclb: NOTRUN -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-fullscreen:
- shard-iclb: PASS -> FAIL [fdo#103167] +2
* igt@kms_plane@pixel-format-pipe-b-planes-source-clamping:
- shard-apl: PASS -> FAIL [fdo#108948]
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-glk: PASS -> FAIL [fdo#103166]
* igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
- shard-skl: NOTRUN -> FAIL [fdo#107815] / [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: PASS -> FAIL [fdo#107815]
* igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
- shard-apl: PASS -> FAIL [fdo#103166] +1
* igt@kms_plane_scaling@pipe-b-scaler-with-rotation:
- shard-iclb: PASS -> DMESG-WARN [fdo#107724] +2
* igt@pm_rpm@cursor-dpms:
- shard-skl: PASS -> INCOMPLETE [fdo#107807] +2
* igt@pm_rpm@system-suspend:
- shard-skl: PASS -> INCOMPLETE [fdo#104108] / [fdo#107807]
* igt@pm_rpm@system-suspend-execbuf:
- shard-iclb: PASS -> INCOMPLETE [fdo#107713] / [fdo#108840]
#### Possible fixes ####
* igt@kms_atomic_transition@plane-all-modeset-transition-internal-panels:
- shard-iclb: DMESG-WARN [fdo#107724] -> PASS +2
* igt@kms_color@pipe-a-ctm-max:
- shard-apl: FAIL [fdo#108147] -> PASS
* igt@kms_color@pipe-b-degamma:
- shard-apl: FAIL [fdo#104782] -> PASS
* igt@kms_cursor_crc@cursor-128x128-random:
- shard-apl: FAIL [fdo#103232] -> PASS +4
* igt@kms_cursor_crc@cursor-256x256-suspend:
- shard-apl: FAIL [fdo#103191] / [fdo#103232] -> PASS
* igt@kms_cursor_crc@cursor-64x21-random:
- shard-kbl: DMESG-WARN [fdo#103313] / [fdo#105345] -> PASS +1
* igt@kms_cursor_crc@cursor-64x64-offscreen:
- shard-hsw: DMESG-FAIL [fdo#102614] / [fdo#103232] -> PASS +1
* igt@kms_cursor_crc@cursor-64x64-onscreen:
- shard-glk: FAIL [fdo#103232] -> PASS +1
* igt@kms_cursor_legacy@cursora-vs-flipb-atomic-transitions:
- shard-hsw: DMESG-WARN [fdo#102614] -> PASS +2
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: INCOMPLETE [fdo#103665] -> PASS +1
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff:
- shard-apl: FAIL [fdo#103167] -> PASS +1
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
- shard-iclb: FAIL [fdo#103167] -> PASS +3
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-shrfb-plflip-blt:
- shard-hsw: DMESG-FAIL [fdo#102614] / [fdo#103167] -> PASS
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
- shard-glk: FAIL [fdo#103167] -> PASS +4
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-iclb: INCOMPLETE [fdo#107713] -> PASS +2
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
- shard-apl: FAIL [fdo#108145] -> PASS
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-glk: FAIL [fdo#108145] -> PASS
* igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
- shard-apl: FAIL [fdo#103166] -> PASS +1
* igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
- shard-iclb: FAIL [fdo#103166] -> PASS +1
* igt@kms_rotation_crc@sprite-rotation-180:
- shard-apl: INCOMPLETE [fdo#103927] -> PASS
* igt@kms_universal_plane@universal-plane-pipe-c-functional:
- shard-glk: FAIL [fdo#103166] -> PASS +1
* igt@perf@oa-exponents:
- shard-glk: FAIL [fdo#105483] -> PASS
* igt@pm_rpm@legacy-planes-dpms:
- shard-iclb: INCOMPLETE [fdo#108840] / [fdo#109369] -> PASS
* igt@testdisplay:
- shard-kbl: DMESG-WARN [fdo#105345] -> PASS
#### Warnings ####
* igt@i915_suspend@shrink:
- shard-kbl: INCOMPLETE [fdo#103665] / [fdo#106886] -> DMESG-WARN [fdo#109244]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103158]: https://bugs.freedesktop.org/show_bug.cgi?id=103158
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103313]: https://bugs.freedesktop.org/show_bug.cgi?id=103313
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105345]: https://bugs.freedesktop.org/show_bug.cgi?id=105345
[fdo#105454]: https://bugs.freedesktop.org/show_bug.cgi?id=105454
[fdo#105483]: https://bugs.freedesktop.org/show_bug.cgi?id=105483
[fdo#106509]: https://bugs.freedesktop.org/show_bug.cgi?id=106509
[fdo#106886]: https://bugs.freedesktop.org/show_bug.cgi?id=106886
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#107815]: https://bugs.freedesktop.org/show_bug.cgi?id=107815
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#108948]: https://bugs.freedesktop.org/show_bug.cgi?id=108948
[fdo#109244]: https://bugs.freedesktop.org/show_bug.cgi?id=109244
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109281]: https://bugs.freedesktop.org/show_bug.cgi?id=109281
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109286]: https://bugs.freedesktop.org/show_bug.cgi?id=109286
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109290]: https://bugs.freedesktop.org/show_bug.cgi?id=109290
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109300]: https://bugs.freedesktop.org/show_bug.cgi?id=109300
[fdo#109301]: https://bugs.freedesktop.org/show_bug.cgi?id=109301
[fdo#109369]: https://bugs.freedesktop.org/show_bug.cgi?id=109369
[fdo#109378]: https://bugs.freedesktop.org/show_bug.cgi?id=109378
Participating hosts (7 -> 7)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_5447 -> Patchwork_11982
CI_DRM_5447: 1fb7b31e074e222be369480ecef1c5c3a48991c9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4778: 0c80bd7f2a964605f307e0220c6bb756685582b9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_11982: aa0bbbe79e671469c4995b0fd10af6f7f941070b @ 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_11982/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Jani Nikula
Mixed C99 and kernel types use is getting ugly. Prefer kernel types.
sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'
v2: rebase
Acked-by Chris Wilson <[email protected]>Acked-by Tvrtko Ursulin <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>Reviewed-by José Roberto de Souza <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Thanks for the reviews and acks. Pushed everything *except* this patch, which seems to need a drm-next backmerge for the avi infoframe stuff.
BR,
Jani.
Quoted 269 lines
--- drivers/gpu/drm/i915/intel_sdvo.c | 78 +++++++++++++++---------------- 1 file changed, 39 insertions(+), 39 deletions(-)drivers/gpu/drm/i915/intel_sdvo.c +39
-39@@ -76,7 +76,7 @@ struct intel_sdvo {i915_reg_t sdvo_reg;/* Active outputs controlled by this SDVO output */ -uint16_t controlled_output; +u16 controlled_output;/* * Capabilities of the SDVO device returned by @@ -91,12 +91,12 @@ struct intel_sdvo {* For multiple function SDVO device, * this is for current attached outputs. */ -uint16_t attached_output; +u16 attached_output;/* * Hotplug activation bits for this device */ -uint16_t hotplug_active; +u16 hotplug_active;enum port port;@@ -104,19 +104,19 @@ struct intel_sdvo {bool has_hdmi_audio;/* DDC bus used by this SDVO encoder */ -uint8_t ddc_bus; +u8 ddc_bus;/* * the sdvo flag gets lost in round trip: dtd->adjusted_mode->dtd */ -uint8_t dtd_sdvo_flags; +u8 dtd_sdvo_flags; };struct intel_sdvo_connector {struct intel_connector base;/* Mark the type of connector */ -uint16_t output_flag; +u16 output_flag;/* This contains all current supported TV format */ u8 tv_format_supported[TV_FORMAT_NUM ];@@ -184,7 +184,7 @@ to_intel_sdvo_connector(struct drm_connector *connector) container_of((conn_state), struct intel_sdvo_connector_state, base.base)static bool -intel_sdvo_output_setup (struct intel_sdvo *intel_sdvo,uint16_t flags); +intel_sdvo_output_setup (struct intel_sdvo *intel_sdvo,u16 flags); static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo, struct intel_sdvo_connector *intel_sdvo_connector,@@ -746,9 +746,9 @@ static bool intel_sdvo_get_input_timing(struct intel_sdvo *intel_sdvo,static bool intel_sdvo_create_preferred_input_timing (struct intel_sdvo *intel_sdvo,struct intel_sdvo_connector *intel_sdvo_connector, -uint16_t clock, -uint16_t width, -uint16_t height) +u16 clock, +u16 width, +u16 height) {struct intel_sdvo_preferred_input_timing_args args;@@ -791,9 +791,9 @@ static bool intel_sdvo_set_clock_rate_mult(struct intel_sdvo *intel_sdvo, u8 valstatic void intel_sdvo_get_dtd_from_mode (struct intel_sdvo_dtd *dtd,const struct drm_display_mode *mode) { -uint16_t width, height; -uint16_t h_blank_len, h_sync_len, v_blank_len, v_sync_len; -uint16_t h_sync_offset, v_sync_offset; +u16 width, height; +u16 h_blank_len, h_sync_len, v_blank_len, v_sync_len; +u16 h_sync_offset, v_sync_offset;int mode_clock;memset (dtd,0 ,sizeof (*dtd));@@ -898,13 +898,13 @@ static bool intel_sdvo_check_supp_encode(struct intel_sdvo *intel_sdvo) }static bool intel_sdvo_set_encode (struct intel_sdvo *intel_sdvo, -uint8_t mode) +u8 mode) {return intel_sdvo_set_value (intel_sdvo,SDVO_CMD_SET_ENCODE , &mode,1 ); }static bool intel_sdvo_set_colorimetry (struct intel_sdvo *intel_sdvo, -uint8_t mode) +u8 mode) {return intel_sdvo_set_value (intel_sdvo,SDVO_CMD_SET_COLORIMETRY , &mode,1 ); }@@ -913,11 +913,11 @@ static bool intel_sdvo_set_colorimetry(struct intel_sdvo *intel_sdvo,static void intel_sdvo_dump_hdmi_buf (struct intel_sdvo *intel_sdvo) {int i, j; -uint8_t set_buf_index[2 ]; -uint8_t av_split; -uint8_t buf_size; -uint8_t buf[48 ]; -uint8_t *pos; +u8 set_buf_index[2 ]; +u8 av_split; +u8 buf_size; +u8 buf[48 ]; +u8 *pos;intel_sdvo_get_value (encoder,SDVO_CMD_GET_HBUF_AV_SPLIT , &av_split,1 );@@ -940,11 +940,11 @@ static void intel_sdvo_dump_hdmi_buf(struct intel_sdvo *intel_sdvo)#endif static bool intel_sdvo_write_infoframe(struct intel_sdvo *intel_sdvo, - unsigned if_index, uint8_t tx_rate, - const uint8_t *data, unsigned length) + unsigned int if_index, u8 tx_rate, + const u8 *data, unsigned int length) { - uint8_t set_buf_index[2] = { if_index, 0 }; - uint8_t hbuf_size, tmp[8]; + u8 set_buf_index[2] = { if_index, 0 }; + u8 hbuf_size, tmp[8]; int i; if (!intel_sdvo_set_value(intel_sdvo,@@ -984,7 +984,7 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo, {const struct drm_display_mode *adjusted_mode = &pipe_config->base.adjusted_mode; -uint8_t sdvo_data[HDMI_INFOFRAME_SIZE (AVI )]; +u8 sdvo_data[HDMI_INFOFRAME_SIZE (AVI )];union hdmi_infoframe frame;int ret;ssize_t len;@@ -1017,7 +1017,7 @@ static bool intel_sdvo_set_tv_format(struct intel_sdvo *intel_sdvo, const struct drm_connector_state *conn_state) {struct intel_sdvo_tv_format format; -uint32_t format_map; +u32 format_map; format_map =1 << conn_state->tv.mode;memset (&format,0 ,sizeof (format));@@ -1208,7 +1208,7 @@ static void intel_sdvo_update_props(struct intel_sdvo *intel_sdvo,const struct drm_connector_state *conn_state = &sdvo_state->base.base;struct intel_sdvo_connector *intel_sdvo_conn =to_intel_sdvo_connector (conn_state->connector); -uint16_t val; +u16 val;if (intel_sdvo_conn->left)UPDATE_PROPERTY (sdvo_state->tv.overscan_h,OVERSCAN_H );@@ -1692,10 +1692,10 @@ static bool intel_sdvo_get_capabilities(struct intel_sdvo *intel_sdvo, struct inreturn true; } -static uint16_t intel_sdvo_get_hotplug_support (struct intel_sdvo *intel_sdvo) +static u16 intel_sdvo_get_hotplug_support (struct intel_sdvo *intel_sdvo) {struct drm_i915_private *dev_priv =to_i915 (intel_sdvo->base.base.dev); -uint16_t hotplug; +u16 hotplug;if (!I915_HAS_HOTPLUG (dev_priv))return 0 ;@@ -1826,7 +1826,7 @@ intel_sdvo_connector_matches_edid(struct intel_sdvo_connector *sdvo,static enum drm_connector_status intel_sdvo_detect (struct drm_connector *connector,bool force) { -uint16_t response; +u16 response;struct intel_sdvo *intel_sdvo =intel_attached_sdvo (connector);struct intel_sdvo_connector *intel_sdvo_connector =to_intel_sdvo_connector (connector);enum drm_connector_status ret;@@ -1977,7 +1977,7 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)struct intel_sdvo *intel_sdvo =intel_attached_sdvo (connector);const struct drm_connector_state *conn_state = connector->state;struct intel_sdvo_sdtv_resolution_request tv_res; -uint32_t reply =0 , format_map =0 ; +u32 reply =0 , format_map =0 ;int i; DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",@@ -2062,7 +2062,7 @@ static int intel_sdvo_connector_atomic_get_property(struct drm_connector *connector, const struct drm_connector_state *state, struct drm_property *property, - uint64_t *val) + u64 *val) { struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);const struct intel_sdvo_connector_state *sdvo_state =to_intel_sdvo_connector_state ((void *)state);@@ -2121,7 +2121,7 @@ static int intel_sdvo_connector_atomic_set_property(struct drm_connector *connector, struct drm_connector_state *state, struct drm_property *property, - uint64_t val) + u64 val) { struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);struct intel_sdvo_connector_state *sdvo_state =to_intel_sdvo_connector_state (state);@@ -2270,7 +2270,7 @@ static const struct drm_encoder_funcs intel_sdvo_enc_funcs = {static void intel_sdvo_guess_ddc_bus (struct intel_sdvo *sdvo) { -uint16_t mask =0 ; +u16 mask =0 ;unsigned int num_bits;/* @@ -2671,7 +2671,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) }static bool -intel_sdvo_output_setup (struct intel_sdvo *intel_sdvo,uint16_t flags) +intel_sdvo_output_setup (struct intel_sdvo *intel_sdvo,u16 flags) {/* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/ @@ -2747,7 +2747,7 @@ static bool intel_sdvo_tv_create_property(struct intel_sdvo *intel_sdvo, {struct drm_device *dev = intel_sdvo->base.base.dev;struct intel_sdvo_tv_format format; -uint32_t format_map, i; +u32 format_map, i;if (!intel_sdvo_set_target_output (intel_sdvo, type))return false;@@ -2814,7 +2814,7 @@ intel_sdvo_create_enhance_property_tv(struct intel_sdvo *intel_sdvo,struct drm_connector_state *conn_state = connector->state;struct intel_sdvo_connector_state *sdvo_state =to_intel_sdvo_connector_state (conn_state); -uint16_t response, data_value[2 ]; +u16 response, data_value[2 ];/* when horizontal overscan is supported, Add the left/right property */ if (enhancements.overscan_h) {@@ -2925,7 +2925,7 @@ intel_sdvo_create_enhance_property_lvds(struct intel_sdvo *intel_sdvo, {struct drm_device *dev = intel_sdvo->base.base.dev;struct drm_connector *connector = &intel_sdvo_connector->base.base; -uint16_t response, data_value[2 ]; +u16 response, data_value[2 ];ENHANCEMENT (&connector->state->tv, brightness,BRIGHTNESS );@@ -2939,7 +2939,7 @@ static bool intel_sdvo_create_enhance_property(struct intel_sdvo *intel_sdvo, {union {struct intel_sdvo_enhancements_reply reply; -uint16_t response; +u16 response; } enhancements;BUILD_BUG_ON (sizeof (enhancements) !=2 );
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 7 lines · Jani Nikula
Quoted 6 lines · Jani Nikula
Mixed C99 and kernel types use is getting ugly. Prefer kernel types.
sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'
v2: rebase
Quoted 8 lines
Quoted 5 lines
Acked-by Chris Wilson <[email protected]>Acked-by Tvrtko Ursulin <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>Reviewed-by José Roberto de Souza <[email protected]>Signed-off-by Jani Nikula <[email protected]>Thanks for the reviews and acks. Pushed everything *except* this patch, which seems to need a drm-next backmerge for the avi infoframe stuff.
And now pushed. We no longer have any C99 uint types left. \o/
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