drm/i915: drm device based logging changes
Subsystems (3)
cover drm/i915: drm device based logging changes
Here's a batch of logging conversion.
BR,
Jani.
Jani Nikula (13):
drm/i915/ddi: use struct drm_device based logging drm/i915/display_power: use struct drm_device based logging drm/i915/dp_aux_backlight: use struct drm_device based logging drm/i915/dp_mst: use struct drm_device based logging drm/i915/dsi: use struct drm_device based logging drm/i915/hdmi: use struct drm_device based logging drm/i915/dsi: use struct drm_device based logging drm/i915/connector: use MISSING_CASE instead of logging drm/i915/tv: use struct drm_device based logging drm/i915/display: clean up intel_PLL_is_valid() drm/i915/display: use struct drm_device based logging drm/i915/psr: use struct drm_device based logging drm/i915/wopcm: convert to drm device based logging
drivers/gpu/drm/i915/display/icl_dsi.c | 10 +- .../gpu/drm/i915/display/intel_connector.c | 2 +- drivers/gpu/drm/i915/display/intel_ddi.c | 118 ++++++----- drivers/gpu/drm/i915/display/intel_display.c | 65 +++--- .../drm/i915/display/intel_display_power.c | 22 +- .../drm/i915/display/intel_dp_aux_backlight.c | 84 ++++---- drivers/gpu/drm/i915/display/intel_dp_mst.c | 26 ++- drivers/gpu/drm/i915/display/intel_dsi.c | 9 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 11 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 189 +++++++++++------- drivers/gpu/drm/i915/display/intel_psr.c | 47 +++-- drivers/gpu/drm/i915/display/intel_tv.c | 6 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 3 +- drivers/gpu/drm/i915/intel_wopcm.c | 22 +- 14 files changed, 367 insertions(+), 247 deletions(-)
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/13 drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
--- drivers/gpu/drm/i915/display/intel_ddi.c | 118 ++++++++++++++--------- 1 file changed, 72 insertions(+), 46 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +72 -46
@@ -1102,7 +1102,8 @@ static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,if (intel_de_read (dev_priv, reg) &DDI_BUF_IS_IDLE )return ; } -DRM_ERROR ("Timeout waiting for DDI BUF %c idle bit\n" ,port_name (port)); +drm_err (&dev_priv->drm,"Timeout waiting for DDI BUF %c idle bit\n" , +port_name (port)); }static u32 hsw_pll_to_ddi_pll_sel (const struct intel_shared_dpll *pll)
@@ -1249,7 +1250,8 @@ void hsw_fdi_link_train(struct intel_encoder *encoder, temp =intel_de_read (dev_priv,DP_TP_STATUS (PORT_E ));if (temp &DP_TP_STATUS_AUTOTRAIN_DONE ) { -DRM_DEBUG_KMS ("FDI link training done on step %d\n" , i); +drm_dbg_kms (&dev_priv->drm, +"FDI link training done on step %d\n" , i);break ; }
@@ -1258,7 +1260,7 @@ void hsw_fdi_link_train(struct intel_encoder *encoder,* Results in less fireworks from the state checker. */ if (i ==ARRAY_SIZE (hsw_ddi_translations_fdi) *2 -1 ) { -DRM_ERROR ("FDI link training failed!\n" ); +drm_err (&dev_priv->drm,"FDI link training failed!\n" );break ; }
@@ -1605,7 +1607,8 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_stateif (dev_priv->quirks &QUIRK_INCREASE_DDI_DISABLED_TIME &&intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) { -DRM_DEBUG_KMS ("Quirk Increase DDI disabled time\n" ); +drm_dbg_kms (&dev_priv->drm, +"Quirk Increase DDI disabled time\n" );/* Quirk time at 100ms for reliable operation */ msleep (100 ); }
@@ -1786,20 +1789,23 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, }if (!*pipe_mask) -DRM_DEBUG_KMS ("No pipe for [ENCODER:%d:%s] found\n" , - encoder->base.base.id, encoder->base.name); +drm_dbg_kms (&dev_priv->drm, +"No pipe for [ENCODER:%d:%s] found\n" , + encoder->base.base.id, encoder->base.name);if (!mst_pipe_mask &&hweight8 (*pipe_mask) >1 ) { -DRM_DEBUG_KMS ("Multiple pipes for [ENCODER:%d:%s] (pipe_mask %02x)\n" , - encoder->base.base.id, encoder->base.name, - *pipe_mask); +drm_dbg_kms (&dev_priv->drm, +"Multiple pipes for [ENCODER:%d:%s] (pipe_mask %02x)\n" , + encoder->base.base.id, encoder->base.name, + *pipe_mask); *pipe_mask =BIT (ffs (*pipe_mask) -1 ); }if (mst_pipe_mask && mst_pipe_mask != *pipe_mask) -DRM_DEBUG_KMS ("Conflicting MST and non-MST state for [ENCODER:%d:%s] (pipe_mask %02x mst_pipe_mask %02x)\n" , - encoder->base.base.id, encoder->base.name, - *pipe_mask, mst_pipe_mask); +drm_dbg_kms (&dev_priv->drm, +"Conflicting MST and non-MST state for [ENCODER:%d:%s] (pipe_mask %02x mst_pipe_mask %02x)\n" , + encoder->base.base.id, encoder->base.name, + *pipe_mask, mst_pipe_mask);else *is_dp_mst = mst_pipe_mask;
@@ -1809,9 +1815,9 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,if ((tmp & (BXT_PHY_CMNLANE_POWERDOWN_ACK |BXT_PHY_LANE_POWERDOWN_ACK |BXT_PHY_LANE_ENABLED )) !=BXT_PHY_LANE_ENABLED ) -DRM_ERROR ("[ENCODER:%d:%s] enabled but PHY powered down? " -"(PHY_CTL %08x)\n" , encoder->base.base.id, - encoder->base.name, tmp); +drm_err (&dev_priv->drm, +"[ENCODER:%d:%s] enabled but PHY powered down? (PHY_CTL %08x)\n" , + encoder->base.base.id, encoder->base.name, tmp); }intel_display_power_put (dev_priv, encoder->power_domain, wakeref);
@@ -1973,7 +1979,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder,/* Make sure that the requested I_boost is valid */ if (iboost && iboost !=0x1 && iboost !=0x3 && iboost !=0x7 ) { -DRM_ERROR ("Invalid I_boost value %u\n" , iboost); +drm_err (&dev_priv->drm,"Invalid I_boost value %u\n" , iboost);return ; }
@@ -2232,7 +2238,9 @@ static void icl_ddi_combo_vswing_program(struct drm_i915_private *dev_priv,return ;if (level >= n_entries) { -DRM_DEBUG_KMS ("DDI translation not found for level %d. Using %d instead." , level, n_entries -1 ); +drm_dbg_kms (&dev_priv->drm, +"DDI translation not found for level %d. Using %d instead." , + level, n_entries -1 ); level = n_entries -1 ; }
@@ -2358,8 +2366,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, ddi_translations = icl_mg_phy_ddi_translations;/* The table does not have values for level 3 and level 9. */ if (level >= n_entries || level ==3 || level ==9 ) { -DRM_DEBUG_KMS ("DDI translation not found for level %d. Using %d instead." , - level, n_entries -2 ); +drm_dbg_kms (&dev_priv->drm, +"DDI translation not found for level %d. Using %d instead." , + level, n_entries -2 ); level = n_entries -2 ; }
@@ -2693,8 +2702,9 @@ static void icl_sanitize_port_clk_off(struct drm_i915_private *dev_priv,if (drm_WARN_ON (&dev_priv->drm, ddi_clk_needed))continue ; -DRM_NOTE ("PHY %c is disabled/in DSI mode with an ungated DDI clock, gate it\n" , -phy_name (phy)); +drm_notice (&dev_priv->drm, +"PHY %c is disabled/in DSI mode with an ungated DDI clock, gate it\n" , +phy_name (phy)); val |=icl_dpclka_cfgcr0_clk_off (dev_priv, phy);intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val); }
@@ -2931,11 +2941,14 @@ icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port,static void intel_dp_sink_set_fec_ready (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); +if (!crtc_state->fec_enable)return ;if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_FEC_CONFIGURATION ,DP_FEC_READY ) <=0 ) -DRM_DEBUG_KMS ("Failed to set FEC_READY in the sink\n" ); +drm_dbg_kms (&i915->drm, +"Failed to set FEC_READY in the sink\n" ); } static void intel_ddi_enable_fec(struct intel_encoder *encoder,
@@ -2955,7 +2968,8 @@ static void intel_ddi_enable_fec(struct intel_encoder *encoder,if (intel_de_wait_for_set (dev_priv, intel_dp->regs.dp_tp_status,DP_TP_STATUS_FEC_ENABLE_LIVE ,1 )) -DRM_ERROR ("Timed out waiting for FEC Enable Status\n" ); +drm_err (&dev_priv->drm, +"Timed out waiting for FEC Enable Status\n" ); } static void intel_ddi_disable_fec_state(struct intel_encoder *encoder,
@@ -3413,8 +3427,9 @@ static void icl_disable_transcoder_port_sync(const struct intel_crtc_state *old_if (old_crtc_state->master_transcoder ==INVALID_TRANSCODER )return ; -DRM_DEBUG_KMS ("Disabling Transcoder Port Sync on Slave Transcoder %s\n" , -transcoder_name (old_crtc_state->cpu_transcoder)); +drm_dbg_kms (&dev_priv->drm, +"Disabling Transcoder Port Sync on Slave Transcoder %s\n" , +transcoder_name (old_crtc_state->cpu_transcoder));intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL2 (old_crtc_state->cpu_transcoder),0 );
@@ -3565,9 +3580,9 @@ static void intel_enable_ddi_hdmi(struct intel_encoder *encoder,if (!intel_hdmi_handle_sink_scrambling (encoder, connector, crtc_state->hdmi_high_tmds_clock_ratio, crtc_state->hdmi_scrambling)) -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] Failed to configure sink " -"scrambling/TMDS bit clock ratio\n" , - connector->base.id, connector->name); +drm_dbg_kms (&dev_priv->drm, +"[CONNECTOR:%d:%s] Failed to configure sink scrambling/TMDS bit clock ratio\n" , + connector->base.id, connector->name);/* Display WA #1143: skl,kbl,cfl */ if (IS_GEN9_BC (dev_priv)) {
@@ -3662,6 +3677,7 @@ static void intel_disable_ddi_hdmi(struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev);struct drm_connector *connector = old_conn_state->connector;if (old_crtc_state->has_audio)
@@ -3670,8 +3686,9 @@ static void intel_disable_ddi_hdmi(struct intel_encoder *encoder,if (!intel_hdmi_handle_sink_scrambling (encoder, connector, false, false)) -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] Failed to reset sink scrambling/TMDS bit clock ratio\n" , - connector->base.id, connector->name); +drm_dbg_kms (&i915->drm, +"[CONNECTOR:%d:%s] Failed to reset sink scrambling/TMDS bit clock ratio\n" , + connector->base.id, connector->name); } static void intel_disable_ddi(struct intel_encoder *encoder,
@@ -3922,9 +3939,10 @@ void intel_ddi_get_config(struct intel_encoder *encoder, pipe_config->fec_enable =intel_de_read (dev_priv, dp_tp_ctl) &DP_TP_CTL_FEC_ENABLE ; -DRM_DEBUG_KMS ("[ENCODER:%d:%s] Fec status: %u\n" , - encoder->base.base.id, encoder->base.name, - pipe_config->fec_enable); +drm_dbg_kms (&dev_priv->drm, +"[ENCODER:%d:%s] Fec status: %u\n" , + encoder->base.base.id, encoder->base.name, + pipe_config->fec_enable); }break ;
@@ -3961,8 +3979,9 @@ void intel_ddi_get_config(struct intel_encoder *encoder,* up by the BIOS, and thus we can't get the mode at module * load. */ -DRM_DEBUG_KMS ("pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n" , - pipe_config->pipe_bpp, dev_priv->vbt.edp.bpp); +drm_dbg_kms (&dev_priv->drm, +"pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n" , + pipe_config->pipe_bpp, dev_priv->vbt.edp.bpp); dev_priv->vbt.edp.bpp = pipe_config->pipe_bpp; }
@@ -4121,12 +4140,13 @@ static int intel_ddi_compute_config_late(struct intel_encoder *encoder,struct intel_crtc_state *crtc_state, struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev);struct drm_connector *connector = conn_state->connector;u8 port_sync_transcoders =0 ; -DRM_DEBUG_KMS ("[ENCODER:%d:%s] [CRTC:%d:%s]" , - encoder->base.base.id, encoder->base.name, - crtc_state->uapi.crtc->base.id, crtc_state->uapi.crtc->name); +drm_dbg_kms (&i915->drm,"[ENCODER:%d:%s] [CRTC:%d:%s]" , + encoder->base.base.id, encoder->base.name, + crtc_state->uapi.crtc->base.id, crtc_state->uapi.crtc->name); if (connector->has_tile) port_sync_transcoders = intel_ddi_port_sync_transcoders(crtc_state,
@@ -4265,7 +4285,8 @@ static int intel_hdmi_reset_link(struct intel_encoder *encoder, ret =drm_scdc_readb (adapter,SCDC_TMDS_CONFIG , &config);if (ret <0 ) { -DRM_ERROR ("Failed to read TMDS config: %d\n" , ret); +drm_err (&dev_priv->drm,"Failed to read TMDS config: %d\n" , + ret);return 0 ; }
@@ -4411,7 +4432,8 @@ intel_ddi_max_lanes(struct intel_digital_port *intel_dport)* so we use the proper lane count for our calculations. */ if (intel_ddi_a_force_4_lanes (intel_dport)) { -DRM_DEBUG_KMS ("Forcing DDI_A_4_LANES for port A\n" ); +drm_dbg_kms (&dev_priv->drm, +"Forcing DDI_A_4_LANES for port A\n" ); intel_dport->saved_port_bits |=DDI_A_4_LANES ; max_lanes =4 ; }
@@ -4439,12 +4461,14 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) init_dp = true; init_lspcon = true; init_hdmi = false; -DRM_DEBUG_KMS ("VBT says port %c has lspcon\n" ,port_name (port)); +drm_dbg_kms (&dev_priv->drm,"VBT says port %c has lspcon\n" , +port_name (port)); }if (!init_dp && !init_hdmi) { -DRM_DEBUG_KMS ("VBT says port %c is not DVI/HDMI/DP compatible, respect it\n" , -port_name (port)); +drm_dbg_kms (&dev_priv->drm, +"VBT says port %c is not DVI/HDMI/DP compatible, respect it\n" , +port_name (port));return ; }
@@ -4523,14 +4547,16 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)if (init_lspcon) {if (lspcon_init (intel_dig_port))/* TODO: handle hdmi info frame part */ -DRM_DEBUG_KMS ("LSPCON init success on port %c\n" , -port_name (port)); +drm_dbg_kms (&dev_priv->drm, +"LSPCON init success on port %c\n" , +port_name (port));else /* * LSPCON init faied, but DP init was success, so * lets try to drive as DP++ port. */ -DRM_ERROR ("LSPCON init failed on port %c\n" , +drm_err (&dev_priv->drm, +"LSPCON init failed on port %c\n" ,port_name (port)); }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/13 drm/i915/display_power: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
--- .../drm/i915/display/intel_display_power.c | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/display/intel_display_power.c +15 -7
@@ -1873,20 +1873,27 @@ __async_put_domains_state_ok(struct i915_power_domains *power_domains)static void print_power_domains (struct i915_power_domains *power_domains,const char *prefix,u64 mask) { +struct drm_i915_private *i915 =container_of (power_domains, + struct drm_i915_private, + power_domains);enum intel_display_power_domain domain; -DRM_DEBUG_DRIVER ("%s (%lu):\n" , prefix,hweight64 (mask)); +drm_dbg (&i915->drm,"%s (%lu):\n" , prefix,hweight64 (mask));for_each_power_domain (domain, mask) -DRM_DEBUG_DRIVER ("%s use_count %d\n" , -intel_display_power_domain_str (domain), - power_domains->domain_use_count[domain]); +drm_dbg (&i915->drm,"%s use_count %d\n" , +intel_display_power_domain_str (domain), + power_domains->domain_use_count[domain]); }static void print_async_put_domains_state (struct i915_power_domains *power_domains) { -DRM_DEBUG_DRIVER ("async_put_wakeref %u\n" , - power_domains->async_put_wakeref); +struct drm_i915_private *i915 =container_of (power_domains, + struct drm_i915_private, + power_domains); + +drm_dbg (&i915->drm,"async_put_wakeref %u\n" , + power_domains->async_put_wakeref);print_power_domains (power_domains,"async_put_domains[0]" , power_domains->async_put_domains[0 ]);
@@ -4480,7 +4487,8 @@ void icl_dbuf_slices_update(struct drm_i915_private *dev_priv,drm_WARN (&dev_priv->drm,hweight8 (req_slices) > max_slices,"Invalid number of dbuf slices requested\n" ); -DRM_DEBUG_KMS ("Updating dbuf slices to 0x%x\n" , req_slices); +drm_dbg_kms (&dev_priv->drm,"Updating dbuf slices to 0x%x\n" , + req_slices);/* * Might be running this in parallel to gen9_dc_off_power_well_enable
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/13 drm/i915/dp_aux_backlight: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
--- .../drm/i915/display/intel_dp_aux_backlight.c | 84 +++++++++++-------- 1 file changed, 50 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +50 -34
@@ -27,6 +27,7 @@static void set_aux_backlight_enable (struct intel_dp *intel_dp,bool enable) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 reg_val =0 ;/* Early return when display use other mechanism to enable backlight. */
@@ -35,8 +36,8 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)if (drm_dp_dpcd_readb (&intel_dp->aux,DP_EDP_DISPLAY_CONTROL_REGISTER , ®_val) <0 ) { -DRM_DEBUG_KMS ("Failed to read DPCD register 0x%x\n" , -DP_EDP_DISPLAY_CONTROL_REGISTER ); +drm_dbg_kms (&i915->drm,"Failed to read DPCD register 0x%x\n" , +DP_EDP_DISPLAY_CONTROL_REGISTER );return ; }if (enable)
@@ -46,8 +47,8 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_EDP_DISPLAY_CONTROL_REGISTER , reg_val) !=1 ) { -DRM_DEBUG_KMS ("Failed to %s aux backlight\n" , - enable ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm,"Failed to %s aux backlight\n" , + enable ?"enable" :"disable" ); } }
@@ -58,6 +59,7 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)static u32 intel_dp_aux_get_backlight (struct intel_connector *connector) {struct intel_dp *intel_dp =intel_attached_dp (connector); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 read_val[2 ] = {0x0 };u8 mode_reg;u16 level =0 ;
@@ -65,8 +67,9 @@ static u32 intel_dp_aux_get_backlight(struct intel_connector *connector)if (drm_dp_dpcd_readb (&intel_dp->aux,DP_EDP_BACKLIGHT_MODE_SET_REGISTER , &mode_reg) !=1 ) { -DRM_DEBUG_KMS ("Failed to read the DPCD register 0x%x\n" , -DP_EDP_BACKLIGHT_MODE_SET_REGISTER ); +drm_dbg_kms (&i915->drm, +"Failed to read the DPCD register 0x%x\n" , +DP_EDP_BACKLIGHT_MODE_SET_REGISTER );return 0 ; }
@@ -80,8 +83,8 @@ static u32 intel_dp_aux_get_backlight(struct intel_connector *connector)if (drm_dp_dpcd_read (&intel_dp->aux,DP_EDP_BACKLIGHT_BRIGHTNESS_MSB , &read_val,sizeof (read_val)) <0 ) { -DRM_DEBUG_KMS ("Failed to read DPCD register 0x%x\n" , -DP_EDP_BACKLIGHT_BRIGHTNESS_MSB ); +drm_dbg_kms (&i915->drm,"Failed to read DPCD register 0x%x\n" , +DP_EDP_BACKLIGHT_BRIGHTNESS_MSB );return 0 ; } level = read_val[0 ];
@@ -100,6 +103,7 @@ intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 lev {struct intel_connector *connector =to_intel_connector (conn_state->connector);struct intel_dp *intel_dp =intel_attached_dp (connector); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 vals[2 ] = {0x0 }; vals[0 ] = level;
@@ -111,7 +115,8 @@ intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 lev }if (drm_dp_dpcd_write (&intel_dp->aux,DP_EDP_BACKLIGHT_BRIGHTNESS_MSB , vals,sizeof (vals)) <0 ) { -DRM_DEBUG_KMS ("Failed to write aux backlight level\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write aux backlight level\n" );return ; } }
@@ -133,7 +138,8 @@ static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector) freq = dev_priv->vbt.backlight.pwm_freq_hz;if (!freq) { -DRM_DEBUG_KMS ("Use panel default backlight frequency\n" ); +drm_dbg_kms (&dev_priv->drm, +"Use panel default backlight frequency\n" );return false; }
@@ -146,13 +152,14 @@ static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector) fxp_max =DIV_ROUND_CLOSEST (fxp *5 ,4 );if (fxp_min > fxp_actual || fxp_actual > fxp_max) { -DRM_DEBUG_KMS ("Actual frequency out of range\n" ); +drm_dbg_kms (&dev_priv->drm,"Actual frequency out of range\n" );return false; }if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_EDP_BACKLIGHT_FREQ_SET , (u8 ) f) <0 ) { -DRM_DEBUG_KMS ("Failed to write aux backlight freq\n" ); +drm_dbg_kms (&dev_priv->drm, +"Failed to write aux backlight freq\n" );return false; }return true;
@@ -163,13 +170,14 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st {struct intel_connector *connector =to_intel_connector (conn_state->connector);struct intel_dp *intel_dp =intel_attached_dp (connector); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_panel *panel = &connector->panel;u8 dpcd_buf, new_dpcd_buf, edp_backlight_mode;if (drm_dp_dpcd_readb (&intel_dp->aux,DP_EDP_BACKLIGHT_MODE_SET_REGISTER , &dpcd_buf) !=1 ) { -DRM_DEBUG_KMS ("Failed to read DPCD register 0x%x\n" , -DP_EDP_BACKLIGHT_MODE_SET_REGISTER ); +drm_dbg_kms (&i915->drm,"Failed to read DPCD register 0x%x\n" , +DP_EDP_BACKLIGHT_MODE_SET_REGISTER );return ; }
@@ -186,7 +194,8 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_stif (drm_dp_dpcd_writeb (&intel_dp->aux,DP_EDP_PWMGEN_BIT_COUNT , panel->backlight.pwmgen_bit_count) <0 ) -DRM_DEBUG_KMS ("Failed to write aux pwmgen bit count\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write aux pwmgen bit count\n" );break ;
@@ -203,7 +212,8 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_stif (new_dpcd_buf != dpcd_buf) {if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_EDP_BACKLIGHT_MODE_SET_REGISTER , new_dpcd_buf) <0 ) { -DRM_DEBUG_KMS ("Failed to write aux backlight mode\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write aux backlight mode\n" ); } }
@@ -237,9 +247,11 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector)* minimum value will applied automatically. So no need to check that. */ freq = i915->vbt.backlight.pwm_freq_hz; -DRM_DEBUG_KMS ("VBT defined backlight frequency %u Hz\n" , freq); +drm_dbg_kms (&i915->drm,"VBT defined backlight frequency %u Hz\n" , + freq);if (!freq) { -DRM_DEBUG_KMS ("Use panel default backlight frequency\n" ); +drm_dbg_kms (&i915->drm, +"Use panel default backlight frequency\n" );return max_backlight; }
@@ -254,12 +266,14 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector)*/ if (drm_dp_dpcd_readb (&intel_dp->aux,DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN , &pn_min) !=1 ) { -DRM_DEBUG_KMS ("Failed to read pwmgen bit count cap min\n" ); +drm_dbg_kms (&i915->drm, +"Failed to read pwmgen bit count cap min\n" );return max_backlight; }if (drm_dp_dpcd_readb (&intel_dp->aux,DP_EDP_PWMGEN_BIT_COUNT_CAP_MAX , &pn_max) !=1 ) { -DRM_DEBUG_KMS ("Failed to read pwmgen bit count cap max\n" ); +drm_dbg_kms (&i915->drm, +"Failed to read pwmgen bit count cap max\n" );return max_backlight; } pn_min &=DP_EDP_PWMGEN_BIT_COUNT_MASK ;
@@ -268,7 +282,8 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector) fxp_min =DIV_ROUND_CLOSEST (fxp *3 ,4 ); fxp_max =DIV_ROUND_CLOSEST (fxp *5 ,4 );if (fxp_min < (1 << pn_min) || (255 << pn_max) < fxp_max) { -DRM_DEBUG_KMS ("VBT defined backlight frequency out of range\n" ); +drm_dbg_kms (&i915->drm, +"VBT defined backlight frequency out of range\n" );return max_backlight; }
@@ -279,10 +294,11 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector)break ; } -DRM_DEBUG_KMS ("Using eDP pwmgen bit count of %d\n" , pn); +drm_dbg_kms (&i915->drm,"Using eDP pwmgen bit count of %d\n" , pn);if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_EDP_PWMGEN_BIT_COUNT , pn) <0 ) { -DRM_DEBUG_KMS ("Failed to write aux pwmgen bit count\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write aux pwmgen bit count\n" );return max_backlight; } panel->backlight.pwmgen_bit_count = pn;
@@ -312,6 +328,7 @@ static bool intel_dp_aux_display_control_capable(struct intel_connector *connector) {struct intel_dp *intel_dp =intel_attached_dp (connector); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);/* Check the eDP Display control capabilities registers to determine if * the panel can support backlight control over the aux channel
@@ -319,7 +336,7 @@ intel_dp_aux_display_control_capable(struct intel_connector *connector)if (intel_dp->edp_dpcd[1 ] &DP_EDP_TCON_BACKLIGHT_ADJUSTMENT_CAP && (intel_dp->edp_dpcd[2 ] &DP_EDP_BACKLIGHT_BRIGHTNESS_AUX_SET_CAP ) && !(intel_dp->edp_dpcd[2 ] &DP_EDP_BACKLIGHT_BRIGHTNESS_PWM_PIN_CAP )) { -DRM_DEBUG_KMS ("AUX Backlight Control Supported!\n" ); +drm_dbg_kms (&i915->drm,"AUX Backlight Control Supported!\n" );return true; }return false;
@@ -329,8 +346,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) {struct intel_panel *panel = &intel_connector->panel;struct intel_dp *intel_dp =enc_to_intel_dp (intel_connector->encoder); -struct drm_device *dev = intel_connector->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (i915_modparams.enable_dpcd_backlight ==0 || !intel_dp_aux_display_control_capable (intel_connector))
@@ -340,17 +356,17 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector)* There are a lot of machines that don't advertise the backlight * control interface to use properly in their VBIOS, :\ */ -if (dev_priv->vbt.backlight.type != +if (i915->vbt.backlight.type !=INTEL_BACKLIGHT_VESA_EDP_AUX_INTERFACE && !drm_dp_has_quirk (&intel_dp->desc, intel_dp->edid_quirks,DP_QUIRK_FORCE_DPCD_BACKLIGHT )) { -DRM_DEV_INFO (dev->dev, -"Panel advertises DPCD backlight support, but " -"VBT disagrees. If your backlight controls " -"don't work try booting with " -"i915.enable_dpcd_backlight=1. If your machine " -"needs this, please file a _new_ bug report on " -"drm/i915, see " FDO_BUG_URL " for details.\n" ); +drm_info (&i915->drm, +"Panel advertises DPCD backlight support, but " +"VBT disagrees. If your backlight controls " +"don't work try booting with " +"i915.enable_dpcd_backlight=1. If your machine " +"needs this, please file a _new_ bug report on " +"drm/i915, see " FDO_BUG_URL " for details.\n" );return -ENODEV ; }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/13 drm/i915/dp_mst: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 26 ++++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/display/intel_dp_mst.c +17 -9
@@ -47,6 +47,7 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,struct intel_dp *intel_dp = &intel_mst->primary->dp;struct intel_connector *connector =to_intel_connector (conn_state->connector); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;void *port = connector->port;
@@ -73,7 +74,8 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, }if (slots <0 ) { -DRM_DEBUG_KMS ("failed finding vcpi slots:%d\n" , slots); +drm_dbg_kms (&i915->drm,"failed finding vcpi slots:%d\n" , + slots);return slots; }
@@ -322,15 +324,17 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder,struct intel_dp *intel_dp = &intel_dig_port->dp;struct intel_connector *connector =to_intel_connector (old_conn_state->connector); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);int ret; -DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links); +drm_dbg_kms (&i915->drm,"active links %d\n" , + intel_dp->active_mst_links);drm_dp_mst_reset_vcpi_slots (&intel_dp->mst_mgr, connector->port); ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr);if (ret) { -DRM_DEBUG_KMS ("failed to update payload %d\n" , ret); +drm_dbg_kms (&i915->drm,"failed to update payload %d\n" , ret); }if (old_crtc_state->has_audio) intel_audio_codec_disable(encoder,
@@ -371,7 +375,8 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,if (intel_de_wait_for_set (dev_priv, intel_dp->regs.dp_tp_status,DP_TP_STATUS_ACT_SENT ,1 )) -DRM_ERROR ("Timed out waiting for ACT sent when disabling\n" ); +drm_err (&dev_priv->drm, +"Timed out waiting for ACT sent when disabling\n" );drm_dp_check_act_status (&intel_dp->mst_mgr);drm_dp_mst_deallocate_vcpi (&intel_dp->mst_mgr, connector->port);
@@ -405,7 +410,8 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, intel_dig_port->base.post_disable (&intel_dig_port->base, old_crtc_state,NULL ); -DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links); +drm_dbg_kms (&dev_priv->drm,"active links %d\n" , + intel_dp->active_mst_links); } static void intel_mst_pre_pll_enable_dp(struct intel_encoder *encoder,
@@ -445,7 +451,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,INTEL_GEN (dev_priv) >=12 && first_mst_stream && !intel_dp_mst_is_master_trans(pipe_config)); -DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links); +drm_dbg_kms (&dev_priv->drm,"active links %d\n" , + intel_dp->active_mst_links);if (first_mst_stream)intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_ON );
@@ -461,7 +468,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, pipe_config->pbn, pipe_config->dp_m_n.tu);if (!ret) -DRM_ERROR ("failed to allocate vcpi\n" ); +drm_err (&dev_priv->drm,"failed to allocate vcpi\n" ); intel_dp->active_mst_links++; temp =intel_de_read (dev_priv, intel_dp->regs.dp_tp_status);
@@ -499,11 +506,12 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,intel_crtc_vblank_on (pipe_config); -DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links); +drm_dbg_kms (&dev_priv->drm,"active links %d\n" , + intel_dp->active_mst_links);if (intel_de_wait_for_set (dev_priv, intel_dp->regs.dp_tp_status,DP_TP_STATUS_ACT_SENT ,1 )) -DRM_ERROR ("Timed out waiting for ACT sent\n" ); +drm_err (&dev_priv->drm,"Timed out waiting for ACT sent\n" );drm_dp_check_act_status (&intel_dp->mst_mgr);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/13 drm/i915/dsi: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
--- drivers/gpu/drm/i915/display/intel_dsi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_dsi.c +5 -4
@@ -31,20 +31,21 @@ int intel_dsi_tlpx_ns(const struct intel_dsi *intel_dsi)int intel_dsi_get_modes (struct drm_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->dev);struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_display_mode *mode; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );if (!intel_connector->panel.fixed_mode) { -DRM_DEBUG_KMS ("no fixed mode\n" ); +drm_dbg_kms (&i915->drm,"no fixed mode\n" );return 0 ; } mode =drm_mode_duplicate (connector->dev, intel_connector->panel.fixed_mode);if (!mode) { -DRM_DEBUG_KMS ("drm_mode_duplicate failed\n" ); +drm_dbg_kms (&i915->drm,"drm_mode_duplicate failed\n" );return 0 ; }
@@ -60,7 +61,7 @@ enum drm_mode_status intel_dsi_mode_valid(struct drm_connector *connector,const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;int max_dotclk =to_i915 (connector->dev)->max_dotclk_freq; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&dev_priv->drm,"\n" );if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/13 drm/i915/hdmi: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
--- drivers/gpu/drm/i915/display/intel_hdmi.c | 189 ++++++++++++++-------- 1 file changed, 121 insertions(+), 68 deletions(-)
drivers/gpu/drm/i915/display/intel_hdmi.c +121 -68
@@ -691,6 +691,7 @@ void intel_read_infoframe(struct intel_encoder *encoder, union hdmi_infoframe *frame) {struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);u8 buffer[VIDEO_DIP_DATA_SIZE ];int ret;
@@ -707,13 +708,15 @@ void intel_read_infoframe(struct intel_encoder *encoder,/* see comment above for the reason for this offset */ ret =hdmi_infoframe_unpack (frame, buffer +1 ,sizeof (buffer) -1 );if (ret) { -DRM_DEBUG_KMS ("Failed to unpack infoframe type 0x%02x\n" , type); +drm_dbg_kms (&i915->drm, +"Failed to unpack infoframe type 0x%02x\n" , type);return ; }if (frame->any.type != type) -DRM_DEBUG_KMS ("Found the wrong infoframe type 0x%x (expected 0x%02x)\n" , - frame->any.type, type); +drm_dbg_kms (&i915->drm, +"Found the wrong infoframe type 0x%x (expected 0x%02x)\n" , + frame->any.type, type); } static bool
@@ -853,7 +856,8 @@ intel_hdmi_compute_drm_infoframe(struct intel_encoder *encoder, ret =drm_hdmi_infoframe_set_hdr_metadata (frame, conn_state);if (ret <0 ) { -DRM_DEBUG_KMS ("couldn't set HDR metadata in infoframe\n" ); +drm_dbg_kms (&dev_priv->drm, +"couldn't set HDR metadata in infoframe\n" );return false; }
@@ -893,8 +897,9 @@ static void g4x_set_infoframes(struct intel_encoder *encoder,if (!(val &VIDEO_DIP_ENABLE ))return ;if (port != (val &VIDEO_DIP_PORT_MASK )) { -DRM_DEBUG_KMS ("video DIP still enabled on port %c\n" , - (val &VIDEO_DIP_PORT_MASK ) >>29 ); +drm_dbg_kms (&dev_priv->drm, +"video DIP still enabled on port %c\n" , + (val &VIDEO_DIP_PORT_MASK ) >>29 );return ; } val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI |
@@ -906,8 +911,9 @@ static void g4x_set_infoframes(struct intel_encoder *encoder,if (port != (val &VIDEO_DIP_PORT_MASK )) {if (val &VIDEO_DIP_ENABLE ) { -DRM_DEBUG_KMS ("video DIP already enabled on port %c\n" , - (val &VIDEO_DIP_PORT_MASK ) >>29 ); +drm_dbg_kms (&dev_priv->drm, +"video DIP already enabled on port %c\n" , + (val &VIDEO_DIP_PORT_MASK ) >>29 );return ; } val &= ~VIDEO_DIP_PORT_MASK ;
@@ -1264,8 +1270,8 @@ void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable)if (hdmi->dp_dual_mode.type <DRM_DP_DUAL_MODE_TYPE2_DVI )return ; -DRM_DEBUG_KMS ("%s DP dual mode adaptor TMDS output\n" , - enable ?"Enabling" :"Disabling" ); +drm_dbg_kms (&dev_priv->drm,"%s DP dual mode adaptor TMDS output\n" , + enable ?"Enabling" :"Disabling" );drm_dp_dual_mode_set_tmds_output (hdmi->dp_dual_mode.type, adapter, enable);
@@ -1346,13 +1352,14 @@ int intel_hdmi_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, ret =intel_hdmi_hdcp_write (intel_dig_port,DRM_HDCP_DDC_AN , an,DRM_HDCP_AN_LEN );if (ret) { -DRM_DEBUG_KMS ("Write An over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Write An over DDC failed (%d)\n" , + ret);return ret; } ret =intel_gmbus_output_aksv (adapter);if (ret <0 ) { -DRM_DEBUG_KMS ("Failed to output aksv (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Failed to output aksv (%d)\n" , ret);return ret; }return 0 ;
@@ -1361,11 +1368,14 @@ int intel_hdmi_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,static int intel_hdmi_hdcp_read_bksv (struct intel_digital_port *intel_dig_port,u8 *bksv) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev); +int ret; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_BKSV , bksv,DRM_HDCP_KSV_LEN );if (ret) -DRM_DEBUG_KMS ("Read Bksv over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Read Bksv over DDC failed (%d)\n" , + ret);return ret; }
@@ -1373,11 +1383,14 @@ staticint intel_hdmi_hdcp_read_bstatus (struct intel_digital_port *intel_dig_port,u8 *bstatus) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev); +int ret; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_BSTATUS , bstatus,DRM_HDCP_BSTATUS_LEN );if (ret) -DRM_DEBUG_KMS ("Read bstatus over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Read bstatus over DDC failed (%d)\n" , + ret);return ret; }
@@ -1385,12 +1398,14 @@ staticint intel_hdmi_hdcp_repeater_present (struct intel_digital_port *intel_dig_port,bool *repeater_present) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);int ret;u8 val; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_BCAPS , &val,1 );if (ret) { -DRM_DEBUG_KMS ("Read bcaps over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Read bcaps over DDC failed (%d)\n" , + ret);return ret; } *repeater_present = val &DRM_HDCP_DDC_BCAPS_REPEATER_PRESENT ;
@@ -1401,11 +1416,14 @@ staticint intel_hdmi_hdcp_read_ri_prime (struct intel_digital_port *intel_dig_port,u8 *ri_prime) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev); +int ret; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_RI_PRIME , ri_prime,DRM_HDCP_RI_LEN );if (ret) -DRM_DEBUG_KMS ("Read Ri' over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Read Ri' over DDC failed (%d)\n" , + ret);return ret; }
@@ -1413,12 +1431,14 @@ staticint intel_hdmi_hdcp_read_ksv_ready (struct intel_digital_port *intel_dig_port,bool *ksv_ready) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);int ret;u8 val; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_BCAPS , &val,1 );if (ret) { -DRM_DEBUG_KMS ("Read bcaps over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Read bcaps over DDC failed (%d)\n" , + ret);return ret; } *ksv_ready = val &DRM_HDCP_DDC_BCAPS_KSV_FIFO_READY ;
@@ -1429,11 +1449,13 @@ staticint intel_hdmi_hdcp_read_ksv_fifo (struct intel_digital_port *intel_dig_port,int num_downstream,u8 *ksv_fifo) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);int ret; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_KSV_FIFO , ksv_fifo, num_downstream *DRM_HDCP_KSV_LEN );if (ret) { -DRM_DEBUG_KMS ("Read ksv fifo over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read ksv fifo over DDC failed (%d)\n" , ret);return ret; }return 0 ;
@@ -1443,6 +1465,7 @@ staticint intel_hdmi_hdcp_read_v_prime_part (struct intel_digital_port *intel_dig_port,int i,u32 *part) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);int ret;if (i >=DRM_HDCP_V_PRIME_NUM_PARTS )
@@ -1451,7 +1474,8 @@ int intel_hdmi_hdcp_read_v_prime_part(struct intel_digital_port *intel_dig_port, ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_V_PRIME (i), part,DRM_HDCP_V_PRIME_PART_LEN );if (ret) -DRM_DEBUG_KMS ("Read V'[%d] over DDC failed (%d)\n" , i, ret); +drm_dbg_kms (&i915->drm,"Read V'[%d] over DDC failed (%d)\n" , + i, ret);return ret; }
@@ -1474,12 +1498,14 @@ static int kbl_repositioning_enc_en_signal(struct intel_connector *connector) ret =intel_ddi_toggle_hdcp_signalling (&intel_dig_port->base, false);if (ret) { -DRM_ERROR ("Disable HDCP signalling failed (%d)\n" , ret); +drm_err (&dev_priv->drm, +"Disable HDCP signalling failed (%d)\n" , ret);return ret; } ret =intel_ddi_toggle_hdcp_signalling (&intel_dig_port->base, true);if (ret) { -DRM_ERROR ("Enable HDCP signalling failed (%d)\n" , ret); +drm_err (&dev_priv->drm, +"Enable HDCP signalling failed (%d)\n" , ret);return ret; }
@@ -1500,8 +1526,8 @@ int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port, ret =intel_ddi_toggle_hdcp_signalling (&intel_dig_port->base, enable);if (ret) { -DRM_ERROR ("%s HDCP signalling failed (%d)\n" , - enable ?"Enable" :"Disable" , ret); +drm_err (&dev_priv->drm,"%s HDCP signalling failed (%d)\n" , + enable ?"Enable" :"Disable" , ret);return ret; }
@@ -1538,8 +1564,10 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)/* Wait for Ri prime match */ if (wait_for (intel_de_read (i915,HDCP_STATUS (i915, cpu_transcoder, port)) & (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 )) { -DRM_ERROR ("Ri' mismatch detected, link check failed (%x)\n" , -intel_de_read (i915,HDCP_STATUS (i915, cpu_transcoder, port))); +drm_err (&i915->drm, +"Ri' mismatch detected, link check failed (%x)\n" , +intel_de_read (i915,HDCP_STATUS (i915, cpu_transcoder, + port)));return false; }return true;
@@ -1588,16 +1616,18 @@ static int get_hdcp2_msg_timeout(u8 msg_id, bool is_paired) }static inline -int hdcp2_detect_msg_availability (struct intel_digital_port *intel_digital_port, +int hdcp2_detect_msg_availability (struct intel_digital_port *intel_dig_port,u8 msg_id,bool *msg_ready,ssize_t *msg_sz) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);u8 rx_status[HDCP_2_2_HDMI_RXSTATUS_LEN ];int ret; - ret =intel_hdmi_hdcp2_read_rx_status (intel_digital_port, rx_status); + ret =intel_hdmi_hdcp2_read_rx_status (intel_dig_port, rx_status);if (ret <0 ) { -DRM_DEBUG_KMS ("rx_status read failed. Err %d\n" , ret); +drm_dbg_kms (&i915->drm,"rx_status read failed. Err %d\n" , + ret);return ret; }
@@ -1617,6 +1647,7 @@ static ssize_t intel_hdmi_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, u8 msg_id, bool paired) { + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);bool msg_ready = false;int timeout, ret;ssize_t msg_sz =0 ;
@@ -1631,8 +1662,8 @@ intel_hdmi_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, !ret && msg_ready && msg_sz, timeout *1000 , 1000, 5 * 1000);if (ret) -DRM_DEBUG_KMS ("msg_id: %d, ret: %d, timeout: %d\n" , - msg_id, ret, timeout); +drm_dbg_kms (&i915->drm,"msg_id: %d, ret: %d, timeout: %d\n" , + msg_id, ret, timeout);return ret ? ret : msg_sz; }
@@ -1651,6 +1682,7 @@ staticint intel_hdmi_hdcp2_read_msg (struct intel_digital_port *intel_dig_port,u8 msg_id,void *buf,size_t size) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);struct intel_hdmi *hdmi = &intel_dig_port->hdmi;struct intel_hdcp *hdcp = &hdmi->attached_connector->hdcp;unsigned int offset;
@@ -1666,15 +1698,17 @@ int intel_hdmi_hdcp2_read_msg(struct intel_digital_port *intel_dig_port,* available buffer. */ if (ret > size) { -DRM_DEBUG_KMS ("msg_sz(%zd) is more than exp size(%zu)\n" , - ret, size); +drm_dbg_kms (&i915->drm, +"msg_sz(%zd) is more than exp size(%zu)\n" , + ret, size);return -1 ; } offset =HDCP_2_2_HDMI_REG_RD_MSG_OFFSET ; ret =intel_hdmi_hdcp_read (intel_dig_port, offset, buf, ret);if (ret) -DRM_DEBUG_KMS ("Failed to read msg_id: %d(%zd)\n" , msg_id, ret); +drm_dbg_kms (&i915->drm,"Failed to read msg_id: %d(%zd)\n" , + msg_id, ret);return ret; }
@@ -1870,11 +1904,12 @@ static void intel_enable_hdmi_audio(struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config, const struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); -drm_WARN_ON (encoder->base.dev, !pipe_config->has_hdmi_sink); -DRM_DEBUG_DRIVER ("Enabling HDMI audio on pipe %c\n" , -pipe_name (crtc->pipe)); +drm_WARN_ON (&i915->drm, !pipe_config->has_hdmi_sink); +drm_dbg_kms (&i915->drm,"Enabling HDMI audio on pipe %c\n" , +pipe_name (crtc->pipe));intel_audio_codec_enable (encoder, pipe_config, conn_state); }
@@ -2289,10 +2324,12 @@ static bool intel_hdmi_ycbcr420_config(struct drm_connector *connector, struct intel_crtc_state *config) { + struct drm_i915_private *i915 = to_i915(connector->dev);struct intel_crtc *intel_crtc =to_intel_crtc (config->uapi.crtc);if (!connector->ycbcr_420_allowed) { -DRM_ERROR ("Platform doesn't support YCBCR420 output\n" ); +drm_err (&i915->drm, +"Platform doesn't support YCBCR420 output\n" );return false; }
@@ -2300,7 +2337,8 @@ intel_hdmi_ycbcr420_config(struct drm_connector *connector,/* YCBCR 420 output conversion needs a scaler */ if (skl_update_scaler_crtc (config)) { -DRM_DEBUG_KMS ("Scaler allocation for output failed\n" ); +drm_dbg_kms (&i915->drm, +"Scaler allocation for output failed\n" );return false; }
@@ -2341,6 +2379,7 @@ static int intel_hdmi_compute_bpc(struct intel_encoder *encoder,static int intel_hdmi_compute_clock (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { +struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;
@@ -2365,13 +2404,15 @@ static int intel_hdmi_compute_clock(struct intel_encoder *encoder,if (crtc_state->pipe_bpp > bpc *3 ) crtc_state->pipe_bpp = bpc *3 ; -DRM_DEBUG_KMS ("picking %d bpc for HDMI output (pipe bpp: %d)\n" , - bpc, crtc_state->pipe_bpp); +drm_dbg_kms (&i915->drm, +"picking %d bpc for HDMI output (pipe bpp: %d)\n" , + bpc, crtc_state->pipe_bpp);if (hdmi_port_clock_valid (intel_hdmi, crtc_state->port_clock, false, crtc_state->has_hdmi_sink) !=MODE_OK ) { -DRM_DEBUG_KMS ("unsupported HDMI clock (%d kHz), rejecting mode\n" , - crtc_state->port_clock); +drm_dbg_kms (&i915->drm, +"unsupported HDMI clock (%d kHz), rejecting mode\n" , + crtc_state->port_clock);return -EINVAL ; }
@@ -2434,7 +2475,8 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,if (drm_mode_is_420_only (&connector->display_info, adjusted_mode)) {if (!intel_hdmi_ycbcr420_config (connector, pipe_config)) { -DRM_ERROR ("Can't support YCBCR420 output\n" ); +drm_err (&dev_priv->drm, +"Can't support YCBCR420 output\n" );return -EINVAL ; } }
@@ -2477,22 +2519,22 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,intel_hdmi_compute_gcp_infoframe (encoder, pipe_config, conn_state);if (!intel_hdmi_compute_avi_infoframe (encoder, pipe_config, conn_state)) { -DRM_DEBUG_KMS ("bad AVI infoframe\n" ); +drm_dbg_kms (&dev_priv->drm,"bad AVI infoframe\n" );return -EINVAL ; }if (!intel_hdmi_compute_spd_infoframe (encoder, pipe_config, conn_state)) { -DRM_DEBUG_KMS ("bad SPD infoframe\n" ); +drm_dbg_kms (&dev_priv->drm,"bad SPD infoframe\n" );return -EINVAL ; }if (!intel_hdmi_compute_hdmi_infoframe (encoder, pipe_config, conn_state)) { -DRM_DEBUG_KMS ("bad HDMI infoframe\n" ); +drm_dbg_kms (&dev_priv->drm,"bad HDMI infoframe\n" );return -EINVAL ; }if (!intel_hdmi_compute_drm_infoframe (encoder, pipe_config, conn_state)) { -DRM_DEBUG_KMS ("bad DRM infoframe\n" ); +drm_dbg_kms (&dev_priv->drm,"bad DRM infoframe\n" );return -EINVAL ; }
@@ -2542,7 +2584,8 @@ intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid)*/ if (has_edid && !connector->override_edid &&intel_bios_is_port_dp_dual_mode (dev_priv, port)) { -DRM_DEBUG_KMS ("Assuming DP dual mode adaptor presence based on VBT\n" ); +drm_dbg_kms (&dev_priv->drm, +"Assuming DP dual mode adaptor presence based on VBT\n" ); type =DRM_DP_DUAL_MODE_TYPE1_DVI ; }else { type =DRM_DP_DUAL_MODE_NONE ;
@@ -2556,9 +2599,10 @@ intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid) hdmi->dp_dual_mode.max_tmds_clock =drm_dp_dual_mode_max_tmds_clock (type, adapter); -DRM_DEBUG_KMS ("DP dual mode adaptor (%s) detected (max TMDS clock: %d kHz)\n" , -drm_dp_get_dual_mode_type_name (type), - hdmi->dp_dual_mode.max_tmds_clock); +drm_dbg_kms (&dev_priv->drm, +"DP dual mode adaptor (%s) detected (max TMDS clock: %d kHz)\n" , +drm_dp_get_dual_mode_type_name (type), + hdmi->dp_dual_mode.max_tmds_clock); } static bool
@@ -2578,7 +2622,8 @@ intel_hdmi_set_edid(struct drm_connector *connector) edid =drm_get_edid (connector, i2c);if (!edid && !intel_gmbus_is_forced_bit (i2c)) { -DRM_DEBUG_KMS ("HDMI GMBUS EDID read failed, retry using GPIO bit-banging\n" ); +drm_dbg_kms (&dev_priv->drm, +"HDMI GMBUS EDID read failed, retry using GPIO bit-banging\n" );intel_gmbus_force_bit (i2c, true); edid =drm_get_edid (connector, i2c);intel_gmbus_force_bit (i2c, false);
@@ -2610,8 +2655,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)struct intel_encoder *encoder = &hdmi_to_dig_port (intel_hdmi)->base;intel_wakeref_t wakeref; -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s]\n" , - connector->base.id, connector->name); +drm_dbg_kms (&dev_priv->drm,"[CONNECTOR:%d:%s]\n" , + connector->base.id, connector->name); wakeref =intel_display_power_get (dev_priv,POWER_DOMAIN_GMBUS );
@@ -2642,8 +2687,10 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)static void intel_hdmi_force (struct drm_connector *connector) { -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s]\n" , - connector->base.id, connector->name); +struct drm_i915_private *i915 =to_i915 (connector->dev); + +drm_dbg_kms (&i915->drm,"[CONNECTOR:%d:%s]\n" , + connector->base.id, connector->name);intel_hdmi_unset_edid (connector);
@@ -2785,6 +2832,7 @@ intel_hdmi_get_i2c_adapter(struct drm_connector *connector)static void intel_hdmi_create_i2c_symlink (struct drm_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->dev);struct i2c_adapter *adapter =intel_hdmi_get_i2c_adapter (connector);struct kobject *i2c_kobj = &adapter->dev.kobj;struct kobject *connector_kobj = &connector->kdev->kobj;
@@ -2792,7 +2840,7 @@ static void intel_hdmi_create_i2c_symlink(struct drm_connector *connector) ret =sysfs_create_link (connector_kobj, i2c_kobj, i2c_kobj->name);if (ret) -DRM_ERROR ("Failed to create i2c symlink (%d)\n" , ret); +drm_err (&i915->drm,"Failed to create i2c symlink (%d)\n" , ret); }static void intel_hdmi_remove_i2c_symlink (struct drm_connector *connector)
@@ -2921,9 +2969,10 @@ bool intel_hdmi_handle_sink_scrambling(struct intel_encoder *encoder,if (!sink_scrambling->supported)return true; -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] scrambling=%s, TMDS bit clock ratio=1/%d\n" , - connector->base.id, connector->name, -yesno (scrambling), high_tmds_clock_ratio ?40 :10 ); +drm_dbg_kms (&dev_priv->drm, +"[CONNECTOR:%d:%s] scrambling=%s, TMDS bit clock ratio=1/%d\n" , + connector->base.id, connector->name, +yesno (scrambling), high_tmds_clock_ratio ?40 :10 );/* Set TMDS bit clock ratio to 1/40 or 1/10, and enable/disable scrambling */ return drm_scdc_set_high_tmds_clock_ratio(adapter,
@@ -3065,8 +3114,9 @@ static u8 intel_hdmi_ddc_pin(struct intel_encoder *encoder) ddc_pin =intel_bios_alternate_ddc_pin (encoder);if (ddc_pin) { -DRM_DEBUG_KMS ("Using DDC pin 0x%x for port %c (VBT)\n" , - ddc_pin,port_name (port)); +drm_dbg_kms (&dev_priv->drm, +"Using DDC pin 0x%x for port %c (VBT)\n" , + ddc_pin,port_name (port));return ddc_pin; }
@@ -3083,8 +3133,9 @@ static u8 intel_hdmi_ddc_pin(struct intel_encoder *encoder)else ddc_pin =g4x_port_to_ddc_pin (dev_priv, port); -DRM_DEBUG_KMS ("Using DDC pin 0x%x for port %c (platform default)\n" , - ddc_pin,port_name (port)); +drm_dbg_kms (&dev_priv->drm, +"Using DDC pin 0x%x for port %c (platform default)\n" , + ddc_pin,port_name (port));return ddc_pin; }
@@ -3141,8 +3192,9 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,enum port port = intel_encoder->port;struct cec_connector_info conn_info; -DRM_DEBUG_KMS ("Adding HDMI connector on [ENCODER:%d:%s]\n" , - intel_encoder->base.base.id, intel_encoder->base.name); +drm_dbg_kms (&dev_priv->drm, +"Adding HDMI connector on [ENCODER:%d:%s]\n" , + intel_encoder->base.base.id, intel_encoder->base.name);if (INTEL_GEN (dev_priv) <12 &&drm_WARN_ON (dev, port ==PORT_A ))return ;
@@ -3186,7 +3238,8 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,int ret =intel_hdcp_init (intel_connector, &intel_hdmi_hdcp_shim);if (ret) -DRM_DEBUG_KMS ("HDCP init failed, skipping.\n" ); +drm_dbg_kms (&dev_priv->drm, +"HDCP init failed, skipping.\n" ); }/* For G4X desktop chip, PEG_BAND_GAP_DATA 3:0 must first be written
@@ -3205,7 +3258,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,cec_notifier_conn_register (dev->dev,port_identifier (port), &conn_info);if (!intel_hdmi->cec_notifier) -DRM_DEBUG_KMS ("CEC notifier get failed\n" ); +drm_dbg_kms (&dev_priv->drm,"CEC notifier get failed\n" ); } static enum intel_hotplug_state
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/13 drm/i915/dsi: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
--- drivers/gpu/drm/i915/display/icl_dsi.c | 10 +++++++--- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 11 +++++------ drivers/gpu/drm/i915/display/vlv_dsi.c | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/display/icl_dsi.c +7 -3
@@ -186,16 +186,19 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host,static int dsi_send_pkt_payld (struct intel_dsi_host *host,struct mipi_dsi_packet pkt) { +struct intel_dsi *intel_dsi = host->intel_dsi; +struct drm_i915_private *i915 =to_i915 (intel_dsi->base.base.dev); +/* payload queue can accept *256 bytes*, check limit */ if (pkt.payload_length >MAX_PLOAD_CREDIT *4 ) { -DRM_ERROR ("payload size exceeds max queue limit\n" ); +drm_err (&i915->drm,"payload size exceeds max queue limit\n" );return -1 ; }/* load data into command payload queue */ if (!add_payld_to_queue (host, pkt.payload, pkt.payload_length)) { -DRM_ERROR ("adding payload to queue failed\n" ); +drm_err (&i915->drm,"adding payload to queue failed\n" );return -1 ; }
@@ -1417,6 +1420,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, base);struct intel_connector *intel_connector = intel_dsi->attached_connector;
@@ -1446,7 +1450,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, pipe_config->clock_set = true;if (gen11_dsi_dsc_compute_config (encoder, pipe_config)) -DRM_DEBUG_KMS ("Attempting to use DSC failed\n" ); +drm_dbg_kms (&i915->drm,"Attempting to use DSC failed\n" ); pipe_config->port_clock =afe_clk (encoder, pipe_config) /5 ;
drivers/gpu/drm/i915/display/intel_dsi_vbt.c +5 -6
@@ -453,8 +453,7 @@ static inline void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi,static const u8 *mipi_exec_i2c (struct intel_dsi *intel_dsi,const u8 *data) { -struct drm_device *drm_dev = intel_dsi->base.base.dev; -struct device *dev = &drm_dev->pdev->dev; +struct drm_i915_private *i915 =to_i915 (intel_dsi->base.base.dev);struct i2c_adapter *adapter;struct i2c_msg msg;int ret;
@@ -471,7 +470,7 @@ static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data) adapter =i2c_get_adapter (intel_dsi->i2c_bus_num);if (!adapter) { -DRM_DEV_ERROR (dev,"Cannot find a valid i2c bus for xfer\n" ); +drm_err (&i915->drm,"Cannot find a valid i2c bus for xfer\n" ); goto err_bus; }
@@ -489,9 +488,9 @@ static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data) ret =i2c_transfer (adapter, &msg,1 );if (ret <0 ) -DRM_DEV_ERROR (dev, -"Failed to xfer payload of size (%u) to reg (%u)\n" , - payload_size, reg_offset); +drm_err (&i915->drm, +"Failed to xfer payload of size (%u) to reg (%u)\n" , + payload_size, reg_offset);kfree (payload_data); err_alloc:
drivers/gpu/drm/i915/display/vlv_dsi.c +2 -1
@@ -875,10 +875,11 @@ static void intel_dsi_disable(struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );intel_dsi_vbt_exec_sequence (intel_dsi,MIPI_SEQ_BACKLIGHT_OFF );intel_panel_disable_backlight (old_conn_state);
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/13 drm/i915/connector: use MISSING_CASE instead of logging
In reply to Jani Nikula--- drivers/gpu/drm/i915/display/intel_connector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_connector.c +1 -1
@@ -290,7 +290,7 @@ intel_attach_colorspace_property(struct drm_connector *connector)return ;break ;default : -DRM_DEBUG_KMS ("Colorspace property not supported\n" ); +MISSING_CASE (connector->connector_type);return ; }
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/13 drm/i915/tv: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
--- drivers/gpu/drm/i915/display/intel_tv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_tv.c +3 -3
@@ -1698,13 +1698,13 @@ intel_tv_detect(struct drm_connector *connector, struct drm_modeset_acquire_ctx *ctx, bool force) { +struct drm_i915_private *i915 =to_i915 (connector->dev);struct intel_tv *intel_tv =intel_attached_tv (to_intel_connector (connector));enum drm_connector_status status;int type; -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] force=%d\n" , - connector->base.id, connector->name, - force); +drm_dbg_kms (&i915->drm,"[CONNECTOR:%d:%s] force=%d\n" , + connector->base.id, connector->name, force);if (force) {struct intel_load_detect_pipe tmp;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/13 drm/i915/display: clean up intel_PLL_is_valid()
In reply to Jani NikulaDrop useless macro hiding the return. Fix superfluous whitespace. Rename function to all lowercase.
--- drivers/gpu/drm/i915/display/intel_display.c | 40 ++++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +19 -21
@@ -620,45 +620,43 @@ int chv_calc_dpll_params(int refclk, struct dpll *clock)return clock->dot /5 ; } -#define INTELPllInvalid (s) do {/* DRM_DEBUG(s); */ return false; }while (0 ) -/* * Returns whether the given set of divisors are valid for a given refclk with * the given connectors. */ -static bool intel_PLL_is_valid(struct drm_i915_private *dev_priv, +static bool intel_pll_is_valid (struct drm_i915_private *dev_priv,const struct intel_limit *limit,const struct dpll *clock) { -if (clock->n < limit->n.min || limit->n.max < clock->n) -INTELPllInvalid ("n out of range\n" ); -if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1) -INTELPllInvalid ("p1 out of range\n" ); -if (clock->m2 < limit->m2.min || limit->m2.max < clock->m2) -INTELPllInvalid ("m2 out of range\n" ); -if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1) -INTELPllInvalid ("m1 out of range\n" ); +if (clock->n < limit->n.min || limit->n.max < clock->n) +return false; +if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1) +return false; +if (clock->m2 < limit->m2.min || limit->m2.max < clock->m2) +return false; +if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1) +return false;if (!IS_PINEVIEW (dev_priv) && !IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv) && !IS_GEN9_LP (dev_priv))if (clock->m1 <= clock->m2) -INTELPllInvalid ("m1 <= m2\n" ); +return false;if (!IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv) && !IS_GEN9_LP (dev_priv)) {if (clock->p < limit->p.min || limit->p.max < clock->p) -INTELPllInvalid ("p out of range\n" ); +return false;if (clock->m < limit->m.min || limit->m.max < clock->m) -INTELPllInvalid ("m out of range\n" ); +return false; }if (clock->vco < limit->vco.min || limit->vco.max < clock->vco) -INTELPllInvalid ("vco out of range\n" ); +return false;/* XXX: We may need to be checking "Dot clock" depending on the multiplier, * connector, etc., rather than just a single range. */ if (clock->dot < limit->dot.min || limit->dot.max < clock->dot) -INTELPllInvalid ("dot out of range\n" ); +return false;return true; }
@@ -725,7 +723,7 @@ i9xx_find_best_dpll(const struct intel_limit *limit,int this_err;i9xx_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;
@@ -781,7 +779,7 @@ pnv_find_best_dpll(const struct intel_limit *limit,int this_err;pnv_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;
@@ -842,7 +840,7 @@ g4x_find_best_dpll(const struct intel_limit *limit,int this_err;i9xx_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;
@@ -939,7 +937,7 @@ vlv_find_best_dpll(const struct intel_limit *limit,vlv_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;
@@ -1008,7 +1006,7 @@ chv_find_best_dpll(const struct intel_limit *limit,chv_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), limit, &clock)) +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ; if (!vlv_PLL_is_optimal(dev, target, &clock, best_clock,
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 11/13 drm/i915/display: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
--- drivers/gpu/drm/i915/display/intel_display.c | 25 +++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +14 -11
@@ -2908,6 +2908,7 @@ intel_fb_plane_get_subsampling(int *hsub, int *vsub,static int intel_fb_check_ccs_xy (struct drm_framebuffer *fb,int ccs_plane,int x,int y) { +struct drm_i915_private *i915 =to_i915 (fb->dev);struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb);int main_plane;int hsub, vsub;
@@ -2936,7 +2937,8 @@ intel_fb_check_ccs_xy(struct drm_framebuffer *fb, int ccs_plane, int x, int y)* x/y offsets must match between CCS and the main surface. */ if (main_x != ccs_x || main_y != ccs_y) { - DRM_DEBUG_KMS("Bad CCS x/y (main %d,%d ccs %d,%d) full (main %d,%d ccs %d,%d)\n", + drm_dbg_kms(&i915->drm, + "Bad CCS x/y (main %d,%d ccs %d,%d) full (main %d,%d ccs %d,%d)\n", main_x, main_y, ccs_x, ccs_y, intel_fb->normal[main_plane].x,
@@ -12882,16 +12884,17 @@ compute_baseline_pipe_bpp(struct intel_crtc *crtc,return 0 ; } -static void intel_dump_crtc_timings (const struct drm_display_mode *mode) +static void intel_dump_crtc_timings (struct drm_i915_private *i915, +const struct drm_display_mode *mode) { -DRM_DEBUG_KMS ("crtc timings: %d %d %d %d %d %d %d %d %d, " -"type: 0x%x flags: 0x%x\n" , - mode->crtc_clock, - mode->crtc_hdisplay, mode->crtc_hsync_start, - mode->crtc_hsync_end, mode->crtc_htotal, - mode->crtc_vdisplay, mode->crtc_vsync_start, - mode->crtc_vsync_end, mode->crtc_vtotal, - mode->type, mode->flags); +drm_dbg_kms (&i915->drm,"crtc timings: %d %d %d %d %d %d %d %d %d, " +"type: 0x%x flags: 0x%x\n" , + mode->crtc_clock, + mode->crtc_hdisplay, mode->crtc_hsync_start, + mode->crtc_hsync_end, mode->crtc_htotal, + mode->crtc_vdisplay, mode->crtc_vsync_start, + mode->crtc_vsync_end, mode->crtc_vtotal, + mode->type, mode->flags); } static inline void
@@ -13075,7 +13078,7 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config,drm_mode_debug_printmodeline (&pipe_config->hw.mode);drm_dbg_kms (&dev_priv->drm,"adjusted mode:\n" );drm_mode_debug_printmodeline (&pipe_config->hw.adjusted_mode); -intel_dump_crtc_timings (&pipe_config->hw.adjusted_mode); +intel_dump_crtc_timings (dev_priv, &pipe_config->hw.adjusted_mode); drm_dbg_kms(&dev_priv->drm, "port clock: %d, pipe src size: %dx%d, pixel rate %d\n", pipe_config->port_clock,
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 12/13 drm/i915/psr: use struct drm_device based logging
In reply to Jani NikulaConvert all the DRM_* logging macros to the struct drm_device based macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
--- drivers/gpu/drm/i915/display/intel_psr.c | 47 +++++++++++++----------- 1 file changed, 26 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/display/intel_psr.c +26 -21
@@ -137,41 +137,42 @@ static void psr_irq_control(struct drm_i915_private *dev_priv)intel_de_write (dev_priv, imr_reg, val); } -static void psr_event_print (u32 val,bool psr2_enabled) +static void psr_event_print (struct drm_i915_private *i915, +u32 val,bool psr2_enabled) { -DRM_DEBUG_KMS ("PSR exit events: 0x%x\n" , val); +drm_dbg_kms (&i915->drm,"PSR exit events: 0x%x\n" , val);if (val &PSR_EVENT_PSR2_WD_TIMER_EXPIRE ) -DRM_DEBUG_KMS ("\tPSR2 watchdog timer expired\n" ); +drm_dbg_kms (&i915->drm,"\tPSR2 watchdog timer expired\n" );if ((val &PSR_EVENT_PSR2_DISABLED ) && psr2_enabled) -DRM_DEBUG_KMS ("\tPSR2 disabled\n" ); +drm_dbg_kms (&i915->drm,"\tPSR2 disabled\n" );if (val &PSR_EVENT_SU_DIRTY_FIFO_UNDERRUN ) -DRM_DEBUG_KMS ("\tSU dirty FIFO underrun\n" ); +drm_dbg_kms (&i915->drm,"\tSU dirty FIFO underrun\n" );if (val &PSR_EVENT_SU_CRC_FIFO_UNDERRUN ) -DRM_DEBUG_KMS ("\tSU CRC FIFO underrun\n" ); +drm_dbg_kms (&i915->drm,"\tSU CRC FIFO underrun\n" );if (val &PSR_EVENT_GRAPHICS_RESET ) -DRM_DEBUG_KMS ("\tGraphics reset\n" ); +drm_dbg_kms (&i915->drm,"\tGraphics reset\n" );if (val &PSR_EVENT_PCH_INTERRUPT ) -DRM_DEBUG_KMS ("\tPCH interrupt\n" ); +drm_dbg_kms (&i915->drm,"\tPCH interrupt\n" );if (val &PSR_EVENT_MEMORY_UP ) -DRM_DEBUG_KMS ("\tMemory up\n" ); +drm_dbg_kms (&i915->drm,"\tMemory up\n" );if (val &PSR_EVENT_FRONT_BUFFER_MODIFY ) -DRM_DEBUG_KMS ("\tFront buffer modification\n" ); +drm_dbg_kms (&i915->drm,"\tFront buffer modification\n" );if (val &PSR_EVENT_WD_TIMER_EXPIRE ) -DRM_DEBUG_KMS ("\tPSR watchdog timer expired\n" ); +drm_dbg_kms (&i915->drm,"\tPSR watchdog timer expired\n" );if (val &PSR_EVENT_PIPE_REGISTERS_UPDATE ) -DRM_DEBUG_KMS ("\tPIPE registers updated\n" ); +drm_dbg_kms (&i915->drm,"\tPIPE registers updated\n" );if (val &PSR_EVENT_REGISTER_UPDATE ) -DRM_DEBUG_KMS ("\tRegister updated\n" ); +drm_dbg_kms (&i915->drm,"\tRegister updated\n" );if (val &PSR_EVENT_HDCP_ENABLE ) -DRM_DEBUG_KMS ("\tHDCP enabled\n" ); +drm_dbg_kms (&i915->drm,"\tHDCP enabled\n" );if (val &PSR_EVENT_KVMR_SESSION_ENABLE ) -DRM_DEBUG_KMS ("\tKVMR session enabled\n" ); +drm_dbg_kms (&i915->drm,"\tKVMR session enabled\n" );if (val &PSR_EVENT_VBI_ENABLE ) -DRM_DEBUG_KMS ("\tVBI enabled\n" ); +drm_dbg_kms (&i915->drm,"\tVBI enabled\n" );if (val &PSR_EVENT_LPSP_MODE_EXIT ) -DRM_DEBUG_KMS ("\tLPSP mode exited\n" ); +drm_dbg_kms (&i915->drm,"\tLPSP mode exited\n" );if ((val &PSR_EVENT_PSR_DISABLE ) && !psr2_enabled) -DRM_DEBUG_KMS ("\tPSR disabled\n" ); +drm_dbg_kms (&i915->drm,"\tPSR disabled\n" ); }void intel_psr_irq_handler (struct drm_i915_private *dev_priv,u32 psr_iir)
@@ -209,7 +210,7 @@ void intel_psr_irq_handler(struct drm_i915_private *dev_priv, u32 psr_iir)intel_de_write (dev_priv,PSR_EVENT (cpu_transcoder), val); -psr_event_print (val, psr2_enabled); +psr_event_print (dev_priv, val, psr2_enabled); } }
@@ -249,18 +250,21 @@ static bool intel_dp_get_alpm_status(struct intel_dp *intel_dp)static u8 intel_dp_get_sink_sync_latency (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 val =8 ;/* assume the worst if we can't read the value */ if (drm_dp_dpcd_readb (&intel_dp->aux,DP_SYNCHRONIZATION_LATENCY_IN_SINK , &val) ==1 ) val &=DP_MAX_RESYNC_FRAME_COUNT_MASK ;else -DRM_DEBUG_KMS ("Unable to get sink synchronization latency, assuming 8 frames\n" ); +drm_dbg_kms (&i915->drm, +"Unable to get sink synchronization latency, assuming 8 frames\n" );return val; }static u16 intel_dp_get_su_x_granulartiy (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u16 val;ssize_t r;
@@ -273,7 +277,8 @@ static u16 intel_dp_get_su_x_granulartiy(struct intel_dp *intel_dp) r =drm_dp_dpcd_read (&intel_dp->aux,DP_PSR2_SU_X_GRANULARITY , &val,2 );if (r !=2 ) -DRM_DEBUG_KMS ("Unable to read DP_PSR2_SU_X_GRANULARITY\n" ); +drm_dbg_kms (&i915->drm, +"Unable to read DP_PSR2_SU_X_GRANULARITY\n" );/* * Spec says that if the value read is 0 the default granularity should
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 13/13 drm/i915/wopcm: convert to drm device based logging
In reply to Jani NikulaPrefer drm_dbg() over DRM_DEV_DEBUG_DRIVER() and drm_err() over dev_err().
--- drivers/gpu/drm/i915/intel_wopcm.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_wopcm.c +10 -12
@@ -86,7 +86,7 @@ void intel_wopcm_init_early(struct intel_wopcm *wopcm)else wopcm->size =GEN9_WOPCM_SIZE ; -DRM_DEV_DEBUG_DRIVER (i915->drm.dev,"WOPCM: %uK\n" , wopcm->size /1024 ); +drm_dbg (&i915->drm,"WOPCM: %uK\n" , wopcm->size /1024 ); }static inline u32 context_reserved_size (struct drm_i915_private *i915)
@@ -112,7 +112,7 @@ static inline bool gen9_check_dword_gap(struct drm_i915_private *i915, offset = guc_wopcm_base +GEN9_GUC_WOPCM_OFFSET ;if (offset > guc_wopcm_size || (guc_wopcm_size - offset) <sizeof (u32)) { -dev_err (i915->drm.dev, +drm_err (&i915->drm,"WOPCM: invalid GuC region size: %uK < %uK\n" , guc_wopcm_size /SZ_1K , (u32)(offset +sizeof (u32)) /SZ_1K );
@@ -131,7 +131,7 @@ static inline bool gen9_check_huc_fw_fits(struct drm_i915_private *i915,* firmware uploading would fail. */ if (huc_fw_size > guc_wopcm_size -GUC_WOPCM_RESERVED ) { -dev_err (i915->drm.dev,"WOPCM: no space for %s: %uK < %uK\n" , +drm_err (&i915->drm,"WOPCM: no space for %s: %uK < %uK\n" ,intel_uc_fw_type_repr (INTEL_UC_FW_TYPE_HUC ), (guc_wopcm_size -GUC_WOPCM_RESERVED ) /SZ_1K , huc_fw_size /1024 );
@@ -166,7 +166,7 @@ static inline bool __check_layout(struct drm_i915_private *i915, u32 wopcm_size, size = wopcm_size - ctx_rsvd;if (unlikely (range_overflows (guc_wopcm_base, guc_wopcm_size, size))) { -dev_err (i915->drm.dev, +drm_err (&i915->drm,"WOPCM: invalid GuC region layout: %uK + %uK > %uK\n" , guc_wopcm_base /SZ_1K , guc_wopcm_size /SZ_1K , size /SZ_1K );
@@ -175,7 +175,7 @@ static inline bool __check_layout(struct drm_i915_private *i915, u32 wopcm_size, size = guc_fw_size +GUC_WOPCM_RESERVED +GUC_WOPCM_STACK_RESERVED ;if (unlikely (guc_wopcm_size < size)) { -dev_err (i915->drm.dev,"WOPCM: no space for %s: %uK < %uK\n" , +drm_err (&i915->drm,"WOPCM: no space for %s: %uK < %uK\n" ,intel_uc_fw_type_repr (INTEL_UC_FW_TYPE_GUC ), guc_wopcm_size /SZ_1K , size /SZ_1K );return false;
@@ -183,7 +183,7 @@ static inline bool __check_layout(struct drm_i915_private *i915, u32 wopcm_size, size = huc_fw_size +WOPCM_RESERVED_SIZE ;if (unlikely (guc_wopcm_base < size)) { -dev_err (i915->drm.dev,"WOPCM: no space for %s: %uK < %uK\n" , +drm_err (&i915->drm,"WOPCM: no space for %s: %uK < %uK\n" ,intel_uc_fw_type_repr (INTEL_UC_FW_TYPE_HUC ), guc_wopcm_base /SZ_1K , size /SZ_1K );return false;
@@ -242,10 +242,8 @@ void intel_wopcm_init(struct intel_wopcm *wopcm)return ;if (__wopcm_regs_locked (gt->uncore, &guc_wopcm_base, &guc_wopcm_size)) { -DRM_DEV_DEBUG_DRIVER (i915->drm.dev, -"GuC WOPCM is already locked [%uK, %uK)\n" , - guc_wopcm_base /SZ_1K , - guc_wopcm_size /SZ_1K ); +drm_dbg (&i915->drm,"GuC WOPCM is already locked [%uK, %uK)\n" , + guc_wopcm_base /SZ_1K , guc_wopcm_size /SZ_1K ); goto check; }
@@ -266,8 +264,8 @@ void intel_wopcm_init(struct intel_wopcm *wopcm) guc_wopcm_size = wopcm->size - ctx_rsvd - guc_wopcm_base; guc_wopcm_size &=GUC_WOPCM_SIZE_MASK ; -DRM_DEV_DEBUG_DRIVER (i915->drm.dev,"Calculated GuC WOPCM [%uK, %uK)\n" , - guc_wopcm_base /SZ_1K , guc_wopcm_size /SZ_1K ); +drm_dbg (&i915->drm,"Calculated GuC WOPCM [%uK, %uK)\n" , + guc_wopcm_base /SZ_1K , guc_wopcm_size /SZ_1K ); check: if (__check_layout(i915, wopcm->size, guc_wopcm_base, guc_wopcm_size,
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: drm device based logging changes
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: drm device based logging changes
URL : https://patchwork.freedesktop.org/series/74927/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip ddb4a444dd75 drm/i915/ddi: use struct drm_device based logging 07dd9ea10f43 drm/i915/display_power: use struct drm_device based logging df9678067397 drm/i915/dp_aux_backlight: use struct drm_device based logging 70006dcff1cf drm/i915/dp_mst: use struct drm_device based logging 96a362dca265 drm/i915/dsi: use struct drm_device based logging 6d311eabae6b drm/i915/hdmi: use struct drm_device based logging 2c83198c9de1 drm/i915/dsi: use struct drm_device based logging 0eea474ebae3 drm/i915/connector: use MISSING_CASE instead of logging -:7: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one
total: 0 errors, 1 warnings, 0 checks, 8 lines checked b1419778ed0f drm/i915/tv: use struct drm_device based logging 87560bf44a17 drm/i915/display: clean up intel_PLL_is_valid() c057e5d545d4 drm/i915/display: use struct drm_device based logging -:113: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #113: FILE: drivers/gpu/drm/i915/display/intel_display.c:2941:
+ drm_dbg_kms(&i915->drm,
+ "Bad CCS x/y (main %d,%d ccs %d,%d) full (main %d,%d ccs %d,%d)\n",
total: 0 errors, 0 warnings, 1 checks, 50 lines checked f022c9422f91 drm/i915/psr: use struct drm_device based logging 5196c0d8ee07 drm/i915/wopcm: convert to drm device based logging
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: drm device based logging changes
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: drm device based logging changes
URL : https://patchwork.freedesktop.org/series/74927/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8167 -> Patchwork_17040
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/index.html
Known issues
------------
Here are the changes found in Patchwork_17040 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@execlists:
- fi-cfl-guc: [PASS][1] -> [INCOMPLETE][2] ([i915#656])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/fi-cfl-guc/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/fi-cfl-guc/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@gem_contexts:
- fi-cml-s: [PASS][3] -> [DMESG-FAIL][4] ([i915#877])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/fi-cml-s/igt@i915_selftest@live@gem_contexts.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/fi-cml-s/igt@i915_selftest@live@gem_contexts.html
#### Possible fixes ####
* igt@kms_chamelium@hdmi-crc-fast:
- fi-icl-u2: [FAIL][5] ([fdo#109635] / [i915#217]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/fi-icl-u2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/fi-icl-u2/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][7] ([fdo#111407]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/fi-kbl-7500u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/fi-kbl-7500u/igt@[email protected]
#### Warnings ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-tgl-y: [FAIL][9] ([CI#94]) -> [INCOMPLETE][10] ([CI#94] / [i915#460])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/fi-tgl-y/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/fi-tgl-y/igt@[email protected]
[CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
[fdo#109635]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
[i915#460]: https://gitlab.freedesktop.org/drm/intel/issues/460
[i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656
[i915#877]: https://gitlab.freedesktop.org/drm/intel/issues/877
Participating hosts (49 -> 42)
------------------------------
Additional (2): fi-skl-6770hq fi-kbl-7560u
Missing (9): fi-ilk-m540 fi-hsw-4200u fi-byt-j1900 fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-hsw-4770 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8167 -> Patchwork_17040
CI-20190529: 20190529
CI_DRM_8167: b51a7e7f4f72cf780661a1e4b479e2b27ddbafc8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5526: f49ebeee9f54d6f23c60a842f75f65561d452ab0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17040: 5196c0d8ee072e997c79eb7a258c2f9d25ab07d6 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
5196c0d8ee07 drm/i915/wopcm: convert to drm device based logging f022c9422f91 drm/i915/psr: use struct drm_device based logging c057e5d545d4 drm/i915/display: use struct drm_device based logging 87560bf44a17 drm/i915/display: clean up intel_PLL_is_valid() b1419778ed0f drm/i915/tv: use struct drm_device based logging 0eea474ebae3 drm/i915/connector: use MISSING_CASE instead of logging 2c83198c9de1 drm/i915/dsi: use struct drm_device based logging 6d311eabae6b drm/i915/hdmi: use struct drm_device based logging 96a362dca265 drm/i915/dsi: use struct drm_device based logging 70006dcff1cf drm/i915/dp_mst: use struct drm_device based logging df9678067397 drm/i915/dp_aux_backlight: use struct drm_device based logging 07dd9ea10f43 drm/i915/display_power: use struct drm_device based logging ddb4a444dd75 drm/i915/ddi: use struct drm_device based logging
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: drm device based logging changes
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: drm device based logging changes
URL : https://patchwork.freedesktop.org/series/74927/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8167_full -> Patchwork_17040_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_17040_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#110841])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb5/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@deep-bsd:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#112146]) +4 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb7/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb1/igt@[email protected]
* igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276]) +14 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb1/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb8/igt@[email protected]
* igt@gem_exec_store@pages-vcs1:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#112080]) +14 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb5/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][9] -> [FAIL][10] ([i915#454])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb4/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb4/igt@[email protected]
- shard-skl: [PASS][11] -> [FAIL][12] ([i915#454])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-skl6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-skl6/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][13] -> [DMESG-WARN][14] ([i915#180]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-apl3/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-apl4/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [PASS][15] -> [DMESG-WARN][16] ([i915#180]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-kbl3/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-kbl7/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-256x256-onscreen:
- shard-skl: [PASS][17] -> [FAIL][18] ([i915#54])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-skl9/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-skl2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [PASS][19] -> [INCOMPLETE][20] ([i915#155])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-kbl6/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-kbl2/igt@[email protected]
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-c:
- shard-skl: [PASS][21] -> [FAIL][22] ([i915#53])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-skl9/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-skl2/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][23] -> [FAIL][24] ([fdo#108145] / [i915#265])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-skl5/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-skl9/igt@[email protected]
* igt@kms_psr@psr2_primary_mmap_gtt:
- shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#109441])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb2/igt@kms_psr@psr2_primary_mmap_gtt.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb3/igt@kms_psr@psr2_primary_mmap_gtt.html
* igt@kms_setmode@basic:
- shard-skl: [PASS][27] -> [FAIL][28] ([i915#31])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-skl4/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-skl2/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [SKIP][29] ([fdo#112080]) -> [PASS][30] +5 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb6/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb2/igt@[email protected]
* igt@gem_exec_schedule@implicit-both-bsd1:
- shard-iclb: [SKIP][31] ([fdo#109276] / [i915#677]) -> [PASS][32] +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb8/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb4/igt@[email protected]
* igt@gem_exec_schedule@pi-common-bsd:
- shard-iclb: [SKIP][33] ([i915#677]) -> [PASS][34] +2 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb1/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb8/igt@[email protected]
* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [SKIP][35] ([fdo#112146]) -> [PASS][36] +7 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb5/igt@[email protected]
* igt@gem_exec_schedule@promotion-bsd1:
- shard-iclb: [SKIP][37] ([fdo#109276]) -> [PASS][38] +20 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb7/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb1/igt@[email protected]
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [FAIL][39] ([i915#644]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-glk5/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-glk8/igt@[email protected]
- shard-kbl: [FAIL][41] ([i915#644]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-kbl1/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-kbl1/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [FAIL][43] ([i915#79]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-skl7/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-skl7/igt@[email protected]
* igt@kms_flip@plain-flip-ts-check:
- shard-skl: [FAIL][45] ([i915#34]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-skl9/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-skl8/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [DMESG-WARN][47] ([i915#180]) -> [PASS][48] +2 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-apl4/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-apl3/igt@[email protected]
- shard-kbl: [DMESG-WARN][49] ([i915#180]) -> [PASS][50] +1 similar issue
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-kbl7/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-kbl4/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][51] ([fdo#108145]) -> [PASS][52] +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-skl3/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-skl10/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-glk: [FAIL][53] ([i915#899]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-glk8/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-glk1/igt@[email protected]
* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][55] ([fdo#109441]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb6/igt@kms_psr@psr2_suspend.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb2/igt@kms_psr@psr2_suspend.html
* {igt@sysfs_preempt_timeout@timeout@vecs0}:
- shard-glk: [FAIL][57] -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-glk6/igt@sysfs_preempt_timeout@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-glk4/igt@sysfs_preempt_timeout@[email protected]
#### Warnings ####
* igt@gem_ctx_persistence@close-replace-race:
- shard-kbl: [DMESG-WARN][59] -> [TIMEOUT][60] ([i915#1340])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-kbl1/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-kbl7/igt@[email protected]
- shard-apl: [INCOMPLETE][61] ([fdo#103927] / [i915#1402]) -> [TIMEOUT][62] ([i915#1340])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-apl6/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-apl8/igt@[email protected]
* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][63] ([i915#588]) -> [SKIP][64] ([i915#658])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-iclb2/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-iclb3/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-tglb: [SKIP][65] ([i915#468]) -> [FAIL][66] ([i915#454])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-tglb2/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-tglb3/igt@[email protected]
* igt@kms_content_protection@lic:
- shard-apl: [TIMEOUT][67] ([i915#1319]) -> [FAIL][68] ([fdo#110321])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-apl3/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-apl8/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [INCOMPLETE][69] ([i915#198]) -> [FAIL][70] ([i915#1188])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8167/shard-skl9/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17040/shard-skl8/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321
[fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841
[fdo#112080]: https://bugs.freedesktop.org/show_bug.cgi?id=112080
[fdo#112146]: https://bugs.freedesktop.org/show_bug.cgi?id=112146
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1340]: https://gitlab.freedesktop.org/drm/intel/issues/1340
[i915#1402]: https://gitlab.freedesktop.org/drm/intel/issues/1402
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468
[i915#53]: https://gitlab.freedesktop.org/drm/intel/issues/53
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#588]: https://gitlab.freedesktop.org/drm/intel/issues/588
[i915#644]: https://gitlab.freedesktop.org/drm/intel/issues/644
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#677]: https://gitlab.freedesktop.org/drm/intel/issues/677
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#899]: https://gitlab.freedesktop.org/drm/intel/issues/899
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_8167 -> Patchwork_17040
CI-20190529: 20190529
CI_DRM_8167: b51a7e7f4f72cf780661a1e4b479e2b27ddbafc8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5526: f49ebeee9f54d6f23c60a842f75f65561d452ab0 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17040: 5196c0d8ee072e997c79eb7a258c2f9d25ab07d6 @ 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_17040/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 01/13] drm/i915/ddi: use struct drm_device based logging
In reply to Jani NikulaQuoted 385 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}@@
identifier fn, T;
@@fn(...) {
...
structdrm_i915_private*T = ...;
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_ddi.c | 118 ++++++++++++++--------- 1 file changed, 72 insertions(+), 46 deletions(-)drivers/gpu/drm/i915/display/intel_ddi.c +70
-45@@ -1102,7 +1102,8 @@ static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,if (intel_de_read (dev_priv, reg) &DDI_BUF_IS_IDLE )return ; } -DRM_ERROR ("Timeout waiting for DDI BUF %c idle bit\n" ,port_name (port)); +drm_err (&dev_priv->drm,"Timeout waiting for DDI BUF %c idle bit\n" , +port_name (port)); }static u32 hsw_pll_to_ddi_pll_sel (const struct intel_shared_dpll *pll)@@ -1249,7 +1250,8 @@ void hsw_fdi_link_train(struct intel_encoder *encoder, temp =intel_de_read (dev_priv,DP_TP_STATUS (PORT_E ));if (temp &DP_TP_STATUS_AUTOTRAIN_DONE ) { -DRM_DEBUG_KMS ("FDI link training done on step %d\n" , i); +drm_dbg_kms (&dev_priv->drm, +"FDI link training done on step %d\n" , i);break ; }@@ -1258,7 +1260,7 @@ void hsw_fdi_link_train(struct intel_encoder *encoder,* Results in less fireworks from the state checker. */ if (i ==ARRAY_SIZE (hsw_ddi_translations_fdi) *2 -1 ) { -DRM_ERROR ("FDI link training failed!\n" ); +drm_err (&dev_priv->drm,"FDI link training failed!\n" );break ; }@@ -1605,7 +1607,8 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_stateif (dev_priv->quirks &QUIRK_INCREASE_DDI_DISABLED_TIME &&intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) { -DRM_DEBUG_KMS ("Quirk Increase DDI disabled time\n" ); +drm_dbg_kms (&dev_priv->drm, +"Quirk Increase DDI disabled time\n" );/* Quirk time at 100ms for reliable operation */ msleep (100 ); }@@ -1786,20 +1789,23 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder, }if (!*pipe_mask) -DRM_DEBUG_KMS ("No pipe for [ENCODER:%d:%s] found\n" , - encoder->base.base.id, encoder->base.name); +drm_dbg_kms (&dev_priv->drm, +"No pipe for [ENCODER:%d:%s] found\n" , + encoder->base.base.id, encoder->base.name);if (!mst_pipe_mask &&hweight8 (*pipe_mask) >1 ) { -DRM_DEBUG_KMS ("Multiple pipes for [ENCODER:%d:%s] (pipe_mask %02x)\n" , - encoder->base.base.id, encoder->base.name, - *pipe_mask); +drm_dbg_kms (&dev_priv->drm, +"Multiple pipes for [ENCODER:%d:%s] (pipe_mask %02x)\n" , + encoder->base.base.id, encoder->base.name, + *pipe_mask); *pipe_mask =BIT (ffs (*pipe_mask) -1 ); }if (mst_pipe_mask && mst_pipe_mask != *pipe_mask) -DRM_DEBUG_KMS ("Conflicting MST and non-MST state for [ENCODER:%d:%s] (pipe_mask %02x mst_pipe_mask %02x)\n" , - encoder->base.base.id, encoder->base.name, - *pipe_mask, mst_pipe_mask); +drm_dbg_kms (&dev_priv->drm, +"Conflicting MST and non-MST state for [ENCODER:%d:%s] (pipe_mask %02x mst_pipe_mask %02x)\n" , + encoder->base.base.id, encoder->base.name, + *pipe_mask, mst_pipe_mask);else *is_dp_mst = mst_pipe_mask;@@ -1809,9 +1815,9 @@ static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,if ((tmp & (BXT_PHY_CMNLANE_POWERDOWN_ACK |BXT_PHY_LANE_POWERDOWN_ACK |BXT_PHY_LANE_ENABLED )) !=BXT_PHY_LANE_ENABLED ) -DRM_ERROR ("[ENCODER:%d:%s] enabled but PHY powered down? " -"(PHY_CTL %08x)\n" , encoder->base.base.id, - encoder->base.name, tmp); +drm_err (&dev_priv->drm, +"[ENCODER:%d:%s] enabled but PHY powered down? (PHY_CTL %08x)\n" , + encoder->base.base.id, encoder->base.name, tmp); }intel_display_power_put (dev_priv, encoder->power_domain, wakeref);@@ -1973,7 +1979,7 @@ static void skl_ddi_set_iboost(struct intel_encoder *encoder,/* Make sure that the requested I_boost is valid */ if (iboost && iboost !=0x1 && iboost !=0x3 && iboost !=0x7 ) { -DRM_ERROR ("Invalid I_boost value %u\n" , iboost); +drm_err (&dev_priv->drm,"Invalid I_boost value %u\n" , iboost);return ; }@@ -2232,7 +2238,9 @@ static void icl_ddi_combo_vswing_program(struct drm_i915_private *dev_priv,return ;if (level >= n_entries) { -DRM_DEBUG_KMS ("DDI translation not found for level %d. Using %d instead." , level, n_entries -1 ); +drm_dbg_kms (&dev_priv->drm, +"DDI translation not found for level %d. Using %d instead." , + level, n_entries -1 ); level = n_entries -1 ; }@@ -2358,8 +2366,9 @@ static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder, ddi_translations = icl_mg_phy_ddi_translations;/* The table does not have values for level 3 and level 9. */ if (level >= n_entries || level ==3 || level ==9 ) { -DRM_DEBUG_KMS ("DDI translation not found for level %d. Using %d instead." , - level, n_entries -2 ); +drm_dbg_kms (&dev_priv->drm, +"DDI translation not found for level %d. Using %d instead." , + level, n_entries -2 ); level = n_entries -2 ; }@@ -2693,8 +2702,9 @@ static void icl_sanitize_port_clk_off(struct drm_i915_private *dev_priv,if (drm_WARN_ON (&dev_priv->drm, ddi_clk_needed))continue ; -DRM_NOTE ("PHY %c is disabled/in DSI mode with an ungated DDI clock, gate it\n" , -phy_name (phy)); +drm_notice (&dev_priv->drm, +"PHY %c is disabled/in DSI mode with an ungated DDI clock, gate it\n" , +phy_name (phy)); val |=icl_dpclka_cfgcr0_clk_off (dev_priv, phy);intel_de_write (dev_priv,ICL_DPCLKA_CFGCR0 , val); }@@ -2931,11 +2941,14 @@ icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port,static void intel_dp_sink_set_fec_ready (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp); +if (!crtc_state->fec_enable)return ;if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_FEC_CONFIGURATION ,DP_FEC_READY ) <=0 ) -DRM_DEBUG_KMS ("Failed to set FEC_READY in the sink\n" ); +drm_dbg_kms (&i915->drm, +"Failed to set FEC_READY in the sink\n" ); } static void intel_ddi_enable_fec(struct intel_encoder *encoder,@@ -2955,7 +2968,8 @@ static void intel_ddi_enable_fec(struct intel_encoder *encoder,if (intel_de_wait_for_set (dev_priv, intel_dp->regs.dp_tp_status,DP_TP_STATUS_FEC_ENABLE_LIVE ,1 )) -DRM_ERROR ("Timed out waiting for FEC Enable Status\n" ); +drm_err (&dev_priv->drm, +"Timed out waiting for FEC Enable Status\n" ); } static void intel_ddi_disable_fec_state(struct intel_encoder *encoder,@@ -3413,8 +3427,9 @@ static void icl_disable_transcoder_port_sync(const struct intel_crtc_state *old_if (old_crtc_state->master_transcoder ==INVALID_TRANSCODER )return ; -DRM_DEBUG_KMS ("Disabling Transcoder Port Sync on Slave Transcoder %s\n" , -transcoder_name (old_crtc_state->cpu_transcoder)); +drm_dbg_kms (&dev_priv->drm, +"Disabling Transcoder Port Sync on Slave Transcoder %s\n" , +transcoder_name (old_crtc_state->cpu_transcoder));intel_de_write (dev_priv,TRANS_DDI_FUNC_CTL2 (old_crtc_state->cpu_transcoder),0 );@@ -3565,9 +3580,9 @@ static void intel_enable_ddi_hdmi(struct intel_encoder *encoder,if (!intel_hdmi_handle_sink_scrambling (encoder, connector, crtc_state->hdmi_high_tmds_clock_ratio, crtc_state->hdmi_scrambling)) -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] Failed to configure sink " -"scrambling/TMDS bit clock ratio\n" , - connector->base.id, connector->name); +drm_dbg_kms (&dev_priv->drm, +"[CONNECTOR:%d:%s] Failed to configure sink scrambling/TMDS bit clock ratio\n" , + connector->base.id, connector->name);/* Display WA #1143: skl,kbl,cfl */ if (IS_GEN9_BC (dev_priv)) {@@ -3662,6 +3677,7 @@ static void intel_disable_ddi_hdmi(struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev);struct drm_connector *connector = old_conn_state->connector;if (old_crtc_state->has_audio)@@ -3670,8 +3686,9 @@ static void intel_disable_ddi_hdmi(struct intel_encoder *encoder,if (!intel_hdmi_handle_sink_scrambling (encoder, connector, false, false)) -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] Failed to reset sink scrambling/TMDS bit clock ratio\n" , - connector->base.id, connector->name); +drm_dbg_kms (&i915->drm, +"[CONNECTOR:%d:%s] Failed to reset sink scrambling/TMDS bit clock ratio\n" , + connector->base.id, connector->name); } static void intel_disable_ddi(struct intel_encoder *encoder,@@ -3922,9 +3939,10 @@ void intel_ddi_get_config(struct intel_encoder *encoder, pipe_config->fec_enable =intel_de_read (dev_priv, dp_tp_ctl) &DP_TP_CTL_FEC_ENABLE ; -DRM_DEBUG_KMS ("[ENCODER:%d:%s] Fec status: %u\n" , - encoder->base.base.id, encoder->base.name, - pipe_config->fec_enable); +drm_dbg_kms (&dev_priv->drm, +"[ENCODER:%d:%s] Fec status: %u\n" , + encoder->base.base.id, encoder->base.name, + pipe_config->fec_enable); }break ;@@ -3961,8 +3979,9 @@ void intel_ddi_get_config(struct intel_encoder *encoder,* up by the BIOS, and thus we can't get the mode at module * load. */ -DRM_DEBUG_KMS ("pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n" , - pipe_config->pipe_bpp, dev_priv->vbt.edp.bpp); +drm_dbg_kms (&dev_priv->drm, +"pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n" , + pipe_config->pipe_bpp, dev_priv->vbt.edp.bpp); dev_priv->vbt.edp.bpp = pipe_config->pipe_bpp; }@@ -4121,12 +4140,13 @@ static int intel_ddi_compute_config_late(struct intel_encoder *encoder,struct intel_crtc_state *crtc_state, struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev);struct drm_connector *connector = conn_state->connector;u8 port_sync_transcoders =0 ; -DRM_DEBUG_KMS ("[ENCODER:%d:%s] [CRTC:%d:%s]" , - encoder->base.base.id, encoder->base.name, - crtc_state->uapi.crtc->base.id, crtc_state->uapi.crtc->name); +drm_dbg_kms (&i915->drm,"[ENCODER:%d:%s] [CRTC:%d:%s]" , + encoder->base.base.id, encoder->base.name, + crtc_state->uapi.crtc->base.id, crtc_state->uapi.crtc->name); if (connector->has_tile) port_sync_transcoders = intel_ddi_port_sync_transcoders(crtc_state,@@ -4265,7 +4285,8 @@ static int intel_hdmi_reset_link(struct intel_encoder *encoder, ret =drm_scdc_readb (adapter,SCDC_TMDS_CONFIG , &config);if (ret <0 ) { -DRM_ERROR ("Failed to read TMDS config: %d\n" , ret); +drm_err (&dev_priv->drm,"Failed to read TMDS config: %d\n" , + ret);return 0 ; }@@ -4411,7 +4432,8 @@ intel_ddi_max_lanes(struct intel_digital_port *intel_dport)* so we use the proper lane count for our calculations. */ if (intel_ddi_a_force_4_lanes (intel_dport)) { -DRM_DEBUG_KMS ("Forcing DDI_A_4_LANES for port A\n" ); +drm_dbg_kms (&dev_priv->drm, +"Forcing DDI_A_4_LANES for port A\n" ); intel_dport->saved_port_bits |=DDI_A_4_LANES ; max_lanes =4 ; }@@ -4439,12 +4461,14 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) init_dp = true; init_lspcon = true; init_hdmi = false; -DRM_DEBUG_KMS ("VBT says port %c has lspcon\n" ,port_name (port)); +drm_dbg_kms (&dev_priv->drm,"VBT says port %c has lspcon\n" , +port_name (port)); }if (!init_dp && !init_hdmi) { -DRM_DEBUG_KMS ("VBT says port %c is not DVI/HDMI/DP compatible, respect it\n" , -port_name (port)); +drm_dbg_kms (&dev_priv->drm, +"VBT says port %c is not DVI/HDMI/DP compatible, respect it\n" , +port_name (port));return ; }@@ -4523,14 +4547,16 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)if (init_lspcon) {if (lspcon_init (intel_dig_port))/* TODO: handle hdmi info frame part */ -DRM_DEBUG_KMS ("LSPCON init success on port %c\n" , -port_name (port)); +drm_dbg_kms (&dev_priv->drm, +"LSPCON init success on port %c\n" , +port_name (port));
drivers/gpu/drm/i915/display/intel_ddi.c void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) · line 4561
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_ddi.c +2
-1else /* * LSPCON init faied, but DP init was success, so * lets try to drive as DP++ port. */ -DRM_ERROR ("LSPCON init failed on port %c\n" , +drm_err (&dev_priv->drm, +"LSPCON init failed on port %c\n" ,port_name (port)); }
Quoted 8 lines
Signature · 7 lines
-- 2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 02/13] drm/i915/display_power: use struct drm_device based logging
In reply to Jani NikulaQuoted 97 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}@@
identifier fn, T;
@@fn(...) {
...
structdrm_i915_private*T = ...;
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- .../drm/i915/display/intel_display_power.c | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/display/intel_display_power.c +0
-0
drivers/gpu/drm/i915/display/intel_display_power.c __async_put_domains_state_ok(struct i915_power_domains *power_domains) · line 1878
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_display_power.c +3
-0@@ -1873,20 +1873,27 @@ __async_put_domains_state_ok(struct i915_power_domains *power_domains)static void print_power_domains (struct i915_power_domains *power_domains,const char *prefix,u64 mask) { +struct drm_i915_private *i915 =container_of (power_domains, + struct drm_i915_private, + power_domains);
A power_to_i915() macro would find 3 uses in total, after your patch. With or without that:
Quoted 44 lines
drivers/gpu/drm/i915/display/intel_display_power.c +12
-7enum intel_display_power_domain domain; -DRM_DEBUG_DRIVER ("%s (%lu):\n" , prefix,hweight64 (mask)); +drm_dbg (&i915->drm,"%s (%lu):\n" , prefix,hweight64 (mask));for_each_power_domain (domain, mask) -DRM_DEBUG_DRIVER ("%s use_count %d\n" , -intel_display_power_domain_str (domain), - power_domains->domain_use_count[domain]); +drm_dbg (&i915->drm,"%s use_count %d\n" , +intel_display_power_domain_str (domain), + power_domains->domain_use_count[domain]); }static void print_async_put_domains_state (struct i915_power_domains *power_domains) { -DRM_DEBUG_DRIVER ("async_put_wakeref %u\n" , - power_domains->async_put_wakeref); +struct drm_i915_private *i915 =container_of (power_domains, + struct drm_i915_private, + power_domains); + +drm_dbg (&i915->drm,"async_put_wakeref %u\n" , + power_domains->async_put_wakeref);print_power_domains (power_domains,"async_put_domains[0]" , power_domains->async_put_domains[0 ]);@@ -4480,7 +4487,8 @@ void icl_dbuf_slices_update(struct drm_i915_private *dev_priv,drm_WARN (&dev_priv->drm,hweight8 (req_slices) > max_slices,"Invalid number of dbuf slices requested\n" ); -DRM_DEBUG_KMS ("Updating dbuf slices to 0x%x\n" , req_slices); +drm_dbg_kms (&dev_priv->drm,"Updating dbuf slices to 0x%x\n" , + req_slices);/* * Might be running this in parallel to gen9_dc_off_power_well_enable Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 03/13] drm/i915/dp_aux_backlight: use struct drm_device based logging
In reply to Jani NikulaQuoted 336 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}@@
identifier fn, T;
@@fn(...) {
...
structdrm_i915_private*T = ...;
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- .../drm/i915/display/intel_dp_aux_backlight.c | 84 +++++++++++-------- 1 file changed, 50 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +43
-33@@ -27,6 +27,7 @@static void set_aux_backlight_enable (struct intel_dp *intel_dp,bool enable) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 reg_val =0 ;/* Early return when display use other mechanism to enable backlight. */ @@ -35,8 +36,8 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)if (drm_dp_dpcd_readb (&intel_dp->aux,DP_EDP_DISPLAY_CONTROL_REGISTER , ®_val) <0 ) { -DRM_DEBUG_KMS ("Failed to read DPCD register 0x%x\n" , -DP_EDP_DISPLAY_CONTROL_REGISTER ); +drm_dbg_kms (&i915->drm,"Failed to read DPCD register 0x%x\n" , +DP_EDP_DISPLAY_CONTROL_REGISTER );return ; }if (enable)@@ -46,8 +47,8 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_EDP_DISPLAY_CONTROL_REGISTER , reg_val) !=1 ) { -DRM_DEBUG_KMS ("Failed to %s aux backlight\n" , - enable ?"enable" :"disable" ); +drm_dbg_kms (&i915->drm,"Failed to %s aux backlight\n" , + enable ?"enable" :"disable" ); } }@@ -58,6 +59,7 @@ static void set_aux_backlight_enable(struct intel_dp *intel_dp, bool enable)static u32 intel_dp_aux_get_backlight (struct intel_connector *connector) {struct intel_dp *intel_dp =intel_attached_dp (connector); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 read_val[2 ] = {0x0 };u8 mode_reg;u16 level =0 ;@@ -65,8 +67,9 @@ static u32 intel_dp_aux_get_backlight(struct intel_connector *connector)if (drm_dp_dpcd_readb (&intel_dp->aux,DP_EDP_BACKLIGHT_MODE_SET_REGISTER , &mode_reg) !=1 ) { -DRM_DEBUG_KMS ("Failed to read the DPCD register 0x%x\n" , -DP_EDP_BACKLIGHT_MODE_SET_REGISTER ); +drm_dbg_kms (&i915->drm, +"Failed to read the DPCD register 0x%x\n" , +DP_EDP_BACKLIGHT_MODE_SET_REGISTER );return 0 ; }@@ -80,8 +83,8 @@ static u32 intel_dp_aux_get_backlight(struct intel_connector *connector)if (drm_dp_dpcd_read (&intel_dp->aux,DP_EDP_BACKLIGHT_BRIGHTNESS_MSB , &read_val,sizeof (read_val)) <0 ) { -DRM_DEBUG_KMS ("Failed to read DPCD register 0x%x\n" , -DP_EDP_BACKLIGHT_BRIGHTNESS_MSB ); +drm_dbg_kms (&i915->drm,"Failed to read DPCD register 0x%x\n" , +DP_EDP_BACKLIGHT_BRIGHTNESS_MSB );return 0 ; } level = read_val[0 ];@@ -100,6 +103,7 @@ intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 lev {struct intel_connector *connector =to_intel_connector (conn_state->connector);struct intel_dp *intel_dp =intel_attached_dp (connector); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 vals[2 ] = {0x0 }; vals[0 ] = level;@@ -111,7 +115,8 @@ intel_dp_aux_set_backlight(const struct drm_connector_state *conn_state, u32 lev }if (drm_dp_dpcd_write (&intel_dp->aux,DP_EDP_BACKLIGHT_BRIGHTNESS_MSB , vals,sizeof (vals)) <0 ) { -DRM_DEBUG_KMS ("Failed to write aux backlight level\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write aux backlight level\n" );return ; } }@@ -133,7 +138,8 @@ static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector) freq = dev_priv->vbt.backlight.pwm_freq_hz;if (!freq) { -DRM_DEBUG_KMS ("Use panel default backlight frequency\n" ); +drm_dbg_kms (&dev_priv->drm, +"Use panel default backlight frequency\n" );return false; }@@ -146,13 +152,14 @@ static bool intel_dp_aux_set_pwm_freq(struct intel_connector *connector) fxp_max =DIV_ROUND_CLOSEST (fxp *5 ,4 );if (fxp_min > fxp_actual || fxp_actual > fxp_max) { -DRM_DEBUG_KMS ("Actual frequency out of range\n" ); +drm_dbg_kms (&dev_priv->drm,"Actual frequency out of range\n" );return false; }if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_EDP_BACKLIGHT_FREQ_SET , (u8 ) f) <0 ) { -DRM_DEBUG_KMS ("Failed to write aux backlight freq\n" ); +drm_dbg_kms (&dev_priv->drm, +"Failed to write aux backlight freq\n" );return false; }return true;@@ -163,13 +170,14 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_st {struct intel_connector *connector =to_intel_connector (conn_state->connector);struct intel_dp *intel_dp =intel_attached_dp (connector); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);struct intel_panel *panel = &connector->panel;u8 dpcd_buf, new_dpcd_buf, edp_backlight_mode;if (drm_dp_dpcd_readb (&intel_dp->aux,DP_EDP_BACKLIGHT_MODE_SET_REGISTER , &dpcd_buf) !=1 ) { -DRM_DEBUG_KMS ("Failed to read DPCD register 0x%x\n" , -DP_EDP_BACKLIGHT_MODE_SET_REGISTER ); +drm_dbg_kms (&i915->drm,"Failed to read DPCD register 0x%x\n" , +DP_EDP_BACKLIGHT_MODE_SET_REGISTER );return ; }@@ -186,7 +194,8 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_stif (drm_dp_dpcd_writeb (&intel_dp->aux,DP_EDP_PWMGEN_BIT_COUNT , panel->backlight.pwmgen_bit_count) <0 ) -DRM_DEBUG_KMS ("Failed to write aux pwmgen bit count\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write aux pwmgen bit count\n" );break ;@@ -203,7 +212,8 @@ static void intel_dp_aux_enable_backlight(const struct intel_crtc_state *crtc_stif (new_dpcd_buf != dpcd_buf) {if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_EDP_BACKLIGHT_MODE_SET_REGISTER , new_dpcd_buf) <0 ) { -DRM_DEBUG_KMS ("Failed to write aux backlight mode\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write aux backlight mode\n" ); } }@@ -237,9 +247,11 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector)* minimum value will applied automatically. So no need to check that. */ freq = i915->vbt.backlight.pwm_freq_hz; -DRM_DEBUG_KMS ("VBT defined backlight frequency %u Hz\n" , freq); +drm_dbg_kms (&i915->drm,"VBT defined backlight frequency %u Hz\n" , + freq);if (!freq) { -DRM_DEBUG_KMS ("Use panel default backlight frequency\n" ); +drm_dbg_kms (&i915->drm, +"Use panel default backlight frequency\n" );return max_backlight; }@@ -254,12 +266,14 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector)*/ if (drm_dp_dpcd_readb (&intel_dp->aux,DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN , &pn_min) !=1 ) { -DRM_DEBUG_KMS ("Failed to read pwmgen bit count cap min\n" ); +drm_dbg_kms (&i915->drm, +"Failed to read pwmgen bit count cap min\n" );return max_backlight; }if (drm_dp_dpcd_readb (&intel_dp->aux,DP_EDP_PWMGEN_BIT_COUNT_CAP_MAX , &pn_max) !=1 ) { -DRM_DEBUG_KMS ("Failed to read pwmgen bit count cap max\n" ); +drm_dbg_kms (&i915->drm, +"Failed to read pwmgen bit count cap max\n" );return max_backlight; } pn_min &=DP_EDP_PWMGEN_BIT_COUNT_MASK ;@@ -268,7 +282,8 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector) fxp_min =DIV_ROUND_CLOSEST (fxp *3 ,4 ); fxp_max =DIV_ROUND_CLOSEST (fxp *5 ,4 );if (fxp_min < (1 << pn_min) || (255 << pn_max) < fxp_max) { -DRM_DEBUG_KMS ("VBT defined backlight frequency out of range\n" ); +drm_dbg_kms (&i915->drm, +"VBT defined backlight frequency out of range\n" );return max_backlight; }@@ -279,10 +294,11 @@ static u32 intel_dp_aux_calc_max_backlight(struct intel_connector *connector)break ; } -DRM_DEBUG_KMS ("Using eDP pwmgen bit count of %d\n" , pn); +drm_dbg_kms (&i915->drm,"Using eDP pwmgen bit count of %d\n" , pn);if (drm_dp_dpcd_writeb (&intel_dp->aux,DP_EDP_PWMGEN_BIT_COUNT , pn) <0 ) { -DRM_DEBUG_KMS ("Failed to write aux pwmgen bit count\n" ); +drm_dbg_kms (&i915->drm, +"Failed to write aux pwmgen bit count\n" );return max_backlight; } panel->backlight.pwmgen_bit_count = pn;@@ -312,6 +328,7 @@ static bool intel_dp_aux_display_control_capable(struct intel_connector *connector) {struct intel_dp *intel_dp =intel_attached_dp (connector); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);/* Check the eDP Display control capabilities registers to determine if * the panel can support backlight control over the aux channel @@ -319,7 +336,7 @@ intel_dp_aux_display_control_capable(struct intel_connector *connector)if (intel_dp->edp_dpcd[1 ] &DP_EDP_TCON_BACKLIGHT_ADJUSTMENT_CAP && (intel_dp->edp_dpcd[2 ] &DP_EDP_BACKLIGHT_BRIGHTNESS_AUX_SET_CAP ) && !(intel_dp->edp_dpcd[2 ] &DP_EDP_BACKLIGHT_BRIGHTNESS_PWM_PIN_CAP )) { -DRM_DEBUG_KMS ("AUX Backlight Control Supported!\n" ); +drm_dbg_kms (&i915->drm,"AUX Backlight Control Supported!\n" );return true; }return false;@@ -329,8 +346,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) {struct intel_panel *panel = &intel_connector->panel;struct intel_dp *intel_dp =enc_to_intel_dp (intel_connector->encoder); -struct drm_device *dev = intel_connector->base.dev; -struct drm_i915_private *dev_priv =to_i915 (dev); +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (i915_modparams.enable_dpcd_backlight ==0 || !intel_dp_aux_display_control_capable (intel_connector))@@ -340,17 +356,17 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector)* There are a lot of machines that don't advertise the backlight * control interface to use properly in their VBIOS, :\ */ -if (dev_priv->vbt.backlight.type != +if (i915->vbt.backlight.type !=INTEL_BACKLIGHT_VESA_EDP_AUX_INTERFACE && !drm_dp_has_quirk (&intel_dp->desc, intel_dp->edid_quirks,DP_QUIRK_FORCE_DPCD_BACKLIGHT )) { -DRM_DEV_INFO (dev->dev, -"Panel advertises DPCD backlight support, but " -"VBT disagrees. If your backlight controls " -"don't work try booting with " -"i915.enable_dpcd_backlight=1. If your machine " - "needs this, please file a _new_ bug report on "
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) · line 371
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +7
-1- "drm/i915, see " FDO_BUG_URL " for details.\n"); +drm_info (&i915->drm, +"Panel advertises DPCD backlight support, but " +"VBT disagrees. If your backlight controls " +"don't work try booting with " +"i915.enable_dpcd_backlight=1. If your machine " +"needs this, please file a _new_ bug report on " +"drm/i915, see " FDO_BUG_URL " for details.\n" );return -ENODEV ; }
Quoted 8 lines
Signature · 7 lines
-- 2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 04/13] drm/i915/dp_mst: use struct drm_device based logging
In reply to Jani NikulaQuoted 177 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}@@
identifier fn, T;
@@fn(...) {
...
structdrm_i915_private*T = ...;
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp_mst.c | 26 ++++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-)drivers/gpu/drm/i915/display/intel_dp_mst.c +14
-7@@ -47,6 +47,7 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,struct intel_dp *intel_dp = &intel_mst->primary->dp;struct intel_connector *connector =to_intel_connector (conn_state->connector); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;void *port = connector->port;@@ -73,7 +74,8 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, }if (slots <0 ) { -DRM_DEBUG_KMS ("failed finding vcpi slots:%d\n" , slots); +drm_dbg_kms (&i915->drm,"failed finding vcpi slots:%d\n" , + slots);return slots; }@@ -322,15 +324,17 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder,struct intel_dp *intel_dp = &intel_dig_port->dp;struct intel_connector *connector =to_intel_connector (old_conn_state->connector); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);int ret; -DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links); +drm_dbg_kms (&i915->drm,"active links %d\n" , + intel_dp->active_mst_links);drm_dp_mst_reset_vcpi_slots (&intel_dp->mst_mgr, connector->port); ret =drm_dp_update_payload_part1 (&intel_dp->mst_mgr);if (ret) { -DRM_DEBUG_KMS ("failed to update payload %d\n" , ret); +drm_dbg_kms (&i915->drm,"failed to update payload %d\n" , ret); }if (old_crtc_state->has_audio) intel_audio_codec_disable(encoder,@@ -371,7 +375,8 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder,if (intel_de_wait_for_set (dev_priv, intel_dp->regs.dp_tp_status,DP_TP_STATUS_ACT_SENT ,1 )) -DRM_ERROR ("Timed out waiting for ACT sent when disabling\n" ); +drm_err (&dev_priv->drm, +"Timed out waiting for ACT sent when disabling\n" );drm_dp_check_act_status (&intel_dp->mst_mgr);drm_dp_mst_deallocate_vcpi (&intel_dp->mst_mgr, connector->port);@@ -405,7 +410,8 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, intel_dig_port->base.post_disable (&intel_dig_port->base, old_crtc_state,NULL ); -DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links); +drm_dbg_kms (&dev_priv->drm,"active links %d\n" , + intel_dp->active_mst_links); } static void intel_mst_pre_pll_enable_dp(struct intel_encoder *encoder,@@ -445,7 +451,8 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,INTEL_GEN (dev_priv) >=12 && first_mst_stream && !intel_dp_mst_is_master_trans(pipe_config)); -DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links); +drm_dbg_kms (&dev_priv->drm,"active links %d\n" , + intel_dp->active_mst_links);if (first_mst_stream)intel_dp_sink_dpms (intel_dp,DRM_MODE_DPMS_ON );@@ -461,7 +468,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, pipe_config->pbn, pipe_config->dp_m_n.tu);if (!ret) -DRM_ERROR ("failed to allocate vcpi\n" ); +drm_err (&dev_priv->drm,"failed to allocate vcpi\n" ); intel_dp->active_mst_links++; temp =intel_de_read (dev_priv, intel_dp->regs.dp_tp_status);@@ -499,11 +506,12 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder,intel_crtc_vblank_on (pipe_config);
drivers/gpu/drm/i915/display/intel_dp_mst.c static void intel_mst_enable_dp(struct intel_encoder *encoder, · line 516
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp_mst.c +3
-2-DRM_DEBUG_KMS ("active links %d\n" , intel_dp->active_mst_links); +drm_dbg_kms (&dev_priv->drm,"active links %d\n" , + intel_dp->active_mst_links);if (intel_de_wait_for_set (dev_priv, intel_dp->regs.dp_tp_status,DP_TP_STATUS_ACT_SENT ,1 )) -DRM_ERROR ("Timed out waiting for ACT sent\n" ); +drm_err (&dev_priv->drm,"Timed out waiting for ACT sent\n" );drm_dp_check_act_status (&intel_dp->mst_mgr);
I'm wondering whether we should build a set of drm_connector/encoder/bla_to_i915() macros.
Anyway, this is Reviewed-by: Daniel Vetter <[email protected]>
Quoted 8 lines
Signature · 7 lines
-- 2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 06/13] drm/i915/hdmi: use struct drm_device based logging
In reply to Jani NikulaQuoted 650 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}@@
identifier fn, T;
@@fn(...) {
...
structdrm_i915_private*T = ...;
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_hdmi.c | 189 ++++++++++++++-------- 1 file changed, 121 insertions(+), 68 deletions(-)drivers/gpu/drm/i915/display/intel_hdmi.c +120
-67@@ -691,6 +691,7 @@ void intel_read_infoframe(struct intel_encoder *encoder, union hdmi_infoframe *frame) {struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);u8 buffer[VIDEO_DIP_DATA_SIZE ];int ret;@@ -707,13 +708,15 @@ void intel_read_infoframe(struct intel_encoder *encoder,/* see comment above for the reason for this offset */ ret =hdmi_infoframe_unpack (frame, buffer +1 ,sizeof (buffer) -1 );if (ret) { -DRM_DEBUG_KMS ("Failed to unpack infoframe type 0x%02x\n" , type); +drm_dbg_kms (&i915->drm, +"Failed to unpack infoframe type 0x%02x\n" , type);return ; }if (frame->any.type != type) -DRM_DEBUG_KMS ("Found the wrong infoframe type 0x%x (expected 0x%02x)\n" , - frame->any.type, type); +drm_dbg_kms (&i915->drm, +"Found the wrong infoframe type 0x%x (expected 0x%02x)\n" , + frame->any.type, type); } static bool@@ -853,7 +856,8 @@ intel_hdmi_compute_drm_infoframe(struct intel_encoder *encoder, ret =drm_hdmi_infoframe_set_hdr_metadata (frame, conn_state);if (ret <0 ) { -DRM_DEBUG_KMS ("couldn't set HDR metadata in infoframe\n" ); +drm_dbg_kms (&dev_priv->drm, +"couldn't set HDR metadata in infoframe\n" );return false; }@@ -893,8 +897,9 @@ static void g4x_set_infoframes(struct intel_encoder *encoder,if (!(val &VIDEO_DIP_ENABLE ))return ;if (port != (val &VIDEO_DIP_PORT_MASK )) { -DRM_DEBUG_KMS ("video DIP still enabled on port %c\n" , - (val &VIDEO_DIP_PORT_MASK ) >>29 ); +drm_dbg_kms (&dev_priv->drm, +"video DIP still enabled on port %c\n" , + (val &VIDEO_DIP_PORT_MASK ) >>29 );return ; } val &= ~(VIDEO_DIP_ENABLE | VIDEO_DIP_ENABLE_AVI |@@ -906,8 +911,9 @@ static void g4x_set_infoframes(struct intel_encoder *encoder,if (port != (val &VIDEO_DIP_PORT_MASK )) {if (val &VIDEO_DIP_ENABLE ) { -DRM_DEBUG_KMS ("video DIP already enabled on port %c\n" , - (val &VIDEO_DIP_PORT_MASK ) >>29 ); +drm_dbg_kms (&dev_priv->drm, +"video DIP already enabled on port %c\n" , + (val &VIDEO_DIP_PORT_MASK ) >>29 );return ; } val &= ~VIDEO_DIP_PORT_MASK ;@@ -1264,8 +1270,8 @@ void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable)if (hdmi->dp_dual_mode.type <DRM_DP_DUAL_MODE_TYPE2_DVI )return ; -DRM_DEBUG_KMS ("%s DP dual mode adaptor TMDS output\n" , - enable ?"Enabling" :"Disabling" ); +drm_dbg_kms (&dev_priv->drm,"%s DP dual mode adaptor TMDS output\n" , + enable ?"Enabling" :"Disabling" );drm_dp_dual_mode_set_tmds_output (hdmi->dp_dual_mode.type, adapter, enable);@@ -1346,13 +1352,14 @@ int intel_hdmi_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port, ret =intel_hdmi_hdcp_write (intel_dig_port,DRM_HDCP_DDC_AN , an,DRM_HDCP_AN_LEN );if (ret) { -DRM_DEBUG_KMS ("Write An over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Write An over DDC failed (%d)\n" , + ret);return ret; } ret =intel_gmbus_output_aksv (adapter);if (ret <0 ) { -DRM_DEBUG_KMS ("Failed to output aksv (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Failed to output aksv (%d)\n" , ret);return ret; }return 0 ;@@ -1361,11 +1368,14 @@ int intel_hdmi_hdcp_write_an_aksv(struct intel_digital_port *intel_dig_port,static int intel_hdmi_hdcp_read_bksv (struct intel_digital_port *intel_dig_port,u8 *bksv) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev); +int ret; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_BKSV , bksv,DRM_HDCP_KSV_LEN );if (ret) -DRM_DEBUG_KMS ("Read Bksv over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Read Bksv over DDC failed (%d)\n" , + ret);return ret; }@@ -1373,11 +1383,14 @@ staticint intel_hdmi_hdcp_read_bstatus (struct intel_digital_port *intel_dig_port,u8 *bstatus) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev); +int ret; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_BSTATUS , bstatus,DRM_HDCP_BSTATUS_LEN );if (ret) -DRM_DEBUG_KMS ("Read bstatus over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Read bstatus over DDC failed (%d)\n" , + ret);return ret; }@@ -1385,12 +1398,14 @@ staticint intel_hdmi_hdcp_repeater_present (struct intel_digital_port *intel_dig_port,bool *repeater_present) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);int ret;u8 val; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_BCAPS , &val,1 );if (ret) { -DRM_DEBUG_KMS ("Read bcaps over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Read bcaps over DDC failed (%d)\n" , + ret);return ret; } *repeater_present = val &DRM_HDCP_DDC_BCAPS_REPEATER_PRESENT ;@@ -1401,11 +1416,14 @@ staticint intel_hdmi_hdcp_read_ri_prime (struct intel_digital_port *intel_dig_port,u8 *ri_prime) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev); +int ret; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_RI_PRIME , ri_prime,DRM_HDCP_RI_LEN );if (ret) -DRM_DEBUG_KMS ("Read Ri' over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Read Ri' over DDC failed (%d)\n" , + ret);return ret; }@@ -1413,12 +1431,14 @@ staticint intel_hdmi_hdcp_read_ksv_ready (struct intel_digital_port *intel_dig_port,bool *ksv_ready) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);int ret;u8 val; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_BCAPS , &val,1 );if (ret) { -DRM_DEBUG_KMS ("Read bcaps over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm,"Read bcaps over DDC failed (%d)\n" , + ret);return ret; } *ksv_ready = val &DRM_HDCP_DDC_BCAPS_KSV_FIFO_READY ;@@ -1429,11 +1449,13 @@ staticint intel_hdmi_hdcp_read_ksv_fifo (struct intel_digital_port *intel_dig_port,int num_downstream,u8 *ksv_fifo) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);int ret; ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_KSV_FIFO , ksv_fifo, num_downstream *DRM_HDCP_KSV_LEN );if (ret) { -DRM_DEBUG_KMS ("Read ksv fifo over DDC failed (%d)\n" , ret); +drm_dbg_kms (&i915->drm, +"Read ksv fifo over DDC failed (%d)\n" , ret);return ret; }return 0 ;@@ -1443,6 +1465,7 @@ staticint intel_hdmi_hdcp_read_v_prime_part (struct intel_digital_port *intel_dig_port,int i,u32 *part) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);int ret;if (i >=DRM_HDCP_V_PRIME_NUM_PARTS )@@ -1451,7 +1474,8 @@ int intel_hdmi_hdcp_read_v_prime_part(struct intel_digital_port *intel_dig_port, ret =intel_hdmi_hdcp_read (intel_dig_port,DRM_HDCP_DDC_V_PRIME (i), part,DRM_HDCP_V_PRIME_PART_LEN );if (ret) -DRM_DEBUG_KMS ("Read V'[%d] over DDC failed (%d)\n" , i, ret); +drm_dbg_kms (&i915->drm,"Read V'[%d] over DDC failed (%d)\n" , + i, ret);return ret; }@@ -1474,12 +1498,14 @@ static int kbl_repositioning_enc_en_signal(struct intel_connector *connector) ret =intel_ddi_toggle_hdcp_signalling (&intel_dig_port->base, false);if (ret) { -DRM_ERROR ("Disable HDCP signalling failed (%d)\n" , ret); +drm_err (&dev_priv->drm, +"Disable HDCP signalling failed (%d)\n" , ret);return ret; } ret =intel_ddi_toggle_hdcp_signalling (&intel_dig_port->base, true);if (ret) { -DRM_ERROR ("Enable HDCP signalling failed (%d)\n" , ret); +drm_err (&dev_priv->drm, +"Enable HDCP signalling failed (%d)\n" , ret);return ret; }@@ -1500,8 +1526,8 @@ int intel_hdmi_hdcp_toggle_signalling(struct intel_digital_port *intel_dig_port, ret =intel_ddi_toggle_hdcp_signalling (&intel_dig_port->base, enable);if (ret) { -DRM_ERROR ("%s HDCP signalling failed (%d)\n" , - enable ?"Enable" :"Disable" , ret); +drm_err (&dev_priv->drm,"%s HDCP signalling failed (%d)\n" , + enable ?"Enable" :"Disable" , ret);return ret; }@@ -1538,8 +1564,10 @@ bool intel_hdmi_hdcp_check_link(struct intel_digital_port *intel_dig_port)/* Wait for Ri prime match */ if (wait_for (intel_de_read (i915,HDCP_STATUS (i915, cpu_transcoder, port)) & (HDCP_STATUS_RI_MATCH |HDCP_STATUS_ENC ),1 )) { -DRM_ERROR ("Ri' mismatch detected, link check failed (%x)\n" , -intel_de_read (i915,HDCP_STATUS (i915, cpu_transcoder, port))); +drm_err (&i915->drm, +"Ri' mismatch detected, link check failed (%x)\n" , +intel_de_read (i915,HDCP_STATUS (i915, cpu_transcoder, + port)));return false; }return true;@@ -1588,16 +1616,18 @@ static int get_hdcp2_msg_timeout(u8 msg_id, bool is_paired) }static inline -int hdcp2_detect_msg_availability (struct intel_digital_port *intel_digital_port, +int hdcp2_detect_msg_availability (struct intel_digital_port *intel_dig_port,u8 msg_id,bool *msg_ready,ssize_t *msg_sz) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);u8 rx_status[HDCP_2_2_HDMI_RXSTATUS_LEN ];int ret; - ret =intel_hdmi_hdcp2_read_rx_status (intel_digital_port, rx_status); + ret =intel_hdmi_hdcp2_read_rx_status (intel_dig_port, rx_status);if (ret <0 ) { -DRM_DEBUG_KMS ("rx_status read failed. Err %d\n" , ret); +drm_dbg_kms (&i915->drm,"rx_status read failed. Err %d\n" , + ret);return ret; }@@ -1617,6 +1647,7 @@ static ssize_t intel_hdmi_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, u8 msg_id, bool paired) { + struct drm_i915_private *i915 = to_i915(intel_dig_port->base.base.dev);bool msg_ready = false;int timeout, ret;ssize_t msg_sz =0 ;@@ -1631,8 +1662,8 @@ intel_hdmi_hdcp2_wait_for_msg(struct intel_digital_port *intel_dig_port, !ret && msg_ready && msg_sz, timeout *1000 , 1000, 5 * 1000);if (ret) -DRM_DEBUG_KMS ("msg_id: %d, ret: %d, timeout: %d\n" , - msg_id, ret, timeout); +drm_dbg_kms (&i915->drm,"msg_id: %d, ret: %d, timeout: %d\n" , + msg_id, ret, timeout);return ret ? ret : msg_sz; }@@ -1651,6 +1682,7 @@ staticint intel_hdmi_hdcp2_read_msg (struct intel_digital_port *intel_dig_port,u8 msg_id,void *buf,size_t size) { +struct drm_i915_private *i915 =to_i915 (intel_dig_port->base.base.dev);struct intel_hdmi *hdmi = &intel_dig_port->hdmi;struct intel_hdcp *hdcp = &hdmi->attached_connector->hdcp;unsigned int offset;@@ -1666,15 +1698,17 @@ int intel_hdmi_hdcp2_read_msg(struct intel_digital_port *intel_dig_port,* available buffer. */ if (ret > size) { -DRM_DEBUG_KMS ("msg_sz(%zd) is more than exp size(%zu)\n" , - ret, size); +drm_dbg_kms (&i915->drm, +"msg_sz(%zd) is more than exp size(%zu)\n" , + ret, size);return -1 ; } offset =HDCP_2_2_HDMI_REG_RD_MSG_OFFSET ; ret =intel_hdmi_hdcp_read (intel_dig_port, offset, buf, ret);if (ret) -DRM_DEBUG_KMS ("Failed to read msg_id: %d(%zd)\n" , msg_id, ret); +drm_dbg_kms (&i915->drm,"Failed to read msg_id: %d(%zd)\n" , + msg_id, ret);return ret; }@@ -1870,11 +1904,12 @@ static void intel_enable_hdmi_audio(struct intel_encoder *encoder,const struct intel_crtc_state *pipe_config, const struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev);struct intel_crtc *crtc =to_intel_crtc (pipe_config->uapi.crtc); -drm_WARN_ON (encoder->base.dev, !pipe_config->has_hdmi_sink); -DRM_DEBUG_DRIVER ("Enabling HDMI audio on pipe %c\n" , -pipe_name (crtc->pipe)); +drm_WARN_ON (&i915->drm, !pipe_config->has_hdmi_sink); +drm_dbg_kms (&i915->drm,"Enabling HDMI audio on pipe %c\n" , +pipe_name (crtc->pipe));intel_audio_codec_enable (encoder, pipe_config, conn_state); }@@ -2289,10 +2324,12 @@ static bool intel_hdmi_ycbcr420_config(struct drm_connector *connector, struct intel_crtc_state *config) { + struct drm_i915_private *i915 = to_i915(connector->dev);struct intel_crtc *intel_crtc =to_intel_crtc (config->uapi.crtc);if (!connector->ycbcr_420_allowed) { -DRM_ERROR ("Platform doesn't support YCBCR420 output\n" ); +drm_err (&i915->drm, +"Platform doesn't support YCBCR420 output\n" );return false; }@@ -2300,7 +2337,8 @@ intel_hdmi_ycbcr420_config(struct drm_connector *connector,/* YCBCR 420 output conversion needs a scaler */ if (skl_update_scaler_crtc (config)) { -DRM_DEBUG_KMS ("Scaler allocation for output failed\n" ); +drm_dbg_kms (&i915->drm, +"Scaler allocation for output failed\n" );return false; }@@ -2341,6 +2379,7 @@ static int intel_hdmi_compute_bpc(struct intel_encoder *encoder,static int intel_hdmi_compute_clock (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) { +struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_hdmi *intel_hdmi =enc_to_intel_hdmi (encoder);const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode;@@ -2365,13 +2404,15 @@ static int intel_hdmi_compute_clock(struct intel_encoder *encoder,if (crtc_state->pipe_bpp > bpc *3 ) crtc_state->pipe_bpp = bpc *3 ; -DRM_DEBUG_KMS ("picking %d bpc for HDMI output (pipe bpp: %d)\n" , - bpc, crtc_state->pipe_bpp); +drm_dbg_kms (&i915->drm, +"picking %d bpc for HDMI output (pipe bpp: %d)\n" , + bpc, crtc_state->pipe_bpp);if (hdmi_port_clock_valid (intel_hdmi, crtc_state->port_clock, false, crtc_state->has_hdmi_sink) !=MODE_OK ) { -DRM_DEBUG_KMS ("unsupported HDMI clock (%d kHz), rejecting mode\n" , - crtc_state->port_clock); +drm_dbg_kms (&i915->drm, +"unsupported HDMI clock (%d kHz), rejecting mode\n" , + crtc_state->port_clock);return -EINVAL ; }@@ -2434,7 +2475,8 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,if (drm_mode_is_420_only (&connector->display_info, adjusted_mode)) {if (!intel_hdmi_ycbcr420_config (connector, pipe_config)) { -DRM_ERROR ("Can't support YCBCR420 output\n" ); +drm_err (&dev_priv->drm, +"Can't support YCBCR420 output\n" );return -EINVAL ; } }@@ -2477,22 +2519,22 @@ int intel_hdmi_compute_config(struct intel_encoder *encoder,intel_hdmi_compute_gcp_infoframe (encoder, pipe_config, conn_state);if (!intel_hdmi_compute_avi_infoframe (encoder, pipe_config, conn_state)) { -DRM_DEBUG_KMS ("bad AVI infoframe\n" ); +drm_dbg_kms (&dev_priv->drm,"bad AVI infoframe\n" );return -EINVAL ; }if (!intel_hdmi_compute_spd_infoframe (encoder, pipe_config, conn_state)) { -DRM_DEBUG_KMS ("bad SPD infoframe\n" ); +drm_dbg_kms (&dev_priv->drm,"bad SPD infoframe\n" );return -EINVAL ; }if (!intel_hdmi_compute_hdmi_infoframe (encoder, pipe_config, conn_state)) { -DRM_DEBUG_KMS ("bad HDMI infoframe\n" ); +drm_dbg_kms (&dev_priv->drm,"bad HDMI infoframe\n" );return -EINVAL ; }if (!intel_hdmi_compute_drm_infoframe (encoder, pipe_config, conn_state)) { -DRM_DEBUG_KMS ("bad DRM infoframe\n" ); +drm_dbg_kms (&dev_priv->drm,"bad DRM infoframe\n" );return -EINVAL ; }@@ -2542,7 +2584,8 @@ intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid)*/ if (has_edid && !connector->override_edid &&intel_bios_is_port_dp_dual_mode (dev_priv, port)) { -DRM_DEBUG_KMS ("Assuming DP dual mode adaptor presence based on VBT\n" ); +drm_dbg_kms (&dev_priv->drm, +"Assuming DP dual mode adaptor presence based on VBT\n" ); type =DRM_DP_DUAL_MODE_TYPE1_DVI ; }else { type =DRM_DP_DUAL_MODE_NONE ;@@ -2556,9 +2599,10 @@ intel_hdmi_dp_dual_mode_detect(struct drm_connector *connector, bool has_edid) hdmi->dp_dual_mode.max_tmds_clock =drm_dp_dual_mode_max_tmds_clock (type, adapter); -DRM_DEBUG_KMS ("DP dual mode adaptor (%s) detected (max TMDS clock: %d kHz)\n" , -drm_dp_get_dual_mode_type_name (type), - hdmi->dp_dual_mode.max_tmds_clock); +drm_dbg_kms (&dev_priv->drm, +"DP dual mode adaptor (%s) detected (max TMDS clock: %d kHz)\n" , +drm_dp_get_dual_mode_type_name (type), + hdmi->dp_dual_mode.max_tmds_clock); } static bool@@ -2578,7 +2622,8 @@ intel_hdmi_set_edid(struct drm_connector *connector) edid =drm_get_edid (connector, i2c);if (!edid && !intel_gmbus_is_forced_bit (i2c)) { -DRM_DEBUG_KMS ("HDMI GMBUS EDID read failed, retry using GPIO bit-banging\n" ); +drm_dbg_kms (&dev_priv->drm, +"HDMI GMBUS EDID read failed, retry using GPIO bit-banging\n" );intel_gmbus_force_bit (i2c, true); edid =drm_get_edid (connector, i2c);intel_gmbus_force_bit (i2c, false);@@ -2610,8 +2655,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)struct intel_encoder *encoder = &hdmi_to_dig_port (intel_hdmi)->base;intel_wakeref_t wakeref; -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s]\n" , - connector->base.id, connector->name); +drm_dbg_kms (&dev_priv->drm,"[CONNECTOR:%d:%s]\n" , + connector->base.id, connector->name); wakeref =intel_display_power_get (dev_priv,POWER_DOMAIN_GMBUS );@@ -2642,8 +2687,10 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)static void intel_hdmi_force (struct drm_connector *connector) { -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s]\n" , - connector->base.id, connector->name); +struct drm_i915_private *i915 =to_i915 (connector->dev); + +drm_dbg_kms (&i915->drm,"[CONNECTOR:%d:%s]\n" , + connector->base.id, connector->name);intel_hdmi_unset_edid (connector);@@ -2785,6 +2832,7 @@ intel_hdmi_get_i2c_adapter(struct drm_connector *connector)static void intel_hdmi_create_i2c_symlink (struct drm_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->dev);struct i2c_adapter *adapter =intel_hdmi_get_i2c_adapter (connector);struct kobject *i2c_kobj = &adapter->dev.kobj;struct kobject *connector_kobj = &connector->kdev->kobj;@@ -2792,7 +2840,7 @@ static void intel_hdmi_create_i2c_symlink(struct drm_connector *connector) ret =sysfs_create_link (connector_kobj, i2c_kobj, i2c_kobj->name);if (ret) -DRM_ERROR ("Failed to create i2c symlink (%d)\n" , ret); +drm_err (&i915->drm,"Failed to create i2c symlink (%d)\n" , ret); }static void intel_hdmi_remove_i2c_symlink (struct drm_connector *connector)@@ -2921,9 +2969,10 @@ bool intel_hdmi_handle_sink_scrambling(struct intel_encoder *encoder,if (!sink_scrambling->supported)return true; -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] scrambling=%s, TMDS bit clock ratio=1/%d\n" , - connector->base.id, connector->name, -yesno (scrambling), high_tmds_clock_ratio ?40 :10 ); +drm_dbg_kms (&dev_priv->drm, +"[CONNECTOR:%d:%s] scrambling=%s, TMDS bit clock ratio=1/%d\n" , + connector->base.id, connector->name, +yesno (scrambling), high_tmds_clock_ratio ?40 :10 );/* Set TMDS bit clock ratio to 1/40 or 1/10, and enable/disable scrambling */ return drm_scdc_set_high_tmds_clock_ratio(adapter,@@ -3065,8 +3114,9 @@ static u8 intel_hdmi_ddc_pin(struct intel_encoder *encoder) ddc_pin =intel_bios_alternate_ddc_pin (encoder);if (ddc_pin) { -DRM_DEBUG_KMS ("Using DDC pin 0x%x for port %c (VBT)\n" , - ddc_pin,port_name (port)); +drm_dbg_kms (&dev_priv->drm, +"Using DDC pin 0x%x for port %c (VBT)\n" , + ddc_pin,port_name (port));return ddc_pin; }@@ -3083,8 +3133,9 @@ static u8 intel_hdmi_ddc_pin(struct intel_encoder *encoder)else ddc_pin =g4x_port_to_ddc_pin (dev_priv, port); -DRM_DEBUG_KMS ("Using DDC pin 0x%x for port %c (platform default)\n" , - ddc_pin,port_name (port)); +drm_dbg_kms (&dev_priv->drm, +"Using DDC pin 0x%x for port %c (platform default)\n" , + ddc_pin,port_name (port));return ddc_pin; }@@ -3141,8 +3192,9 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,enum port port = intel_encoder->port;struct cec_connector_info conn_info; -DRM_DEBUG_KMS ("Adding HDMI connector on [ENCODER:%d:%s]\n" , - intel_encoder->base.base.id, intel_encoder->base.name); +drm_dbg_kms (&dev_priv->drm, +"Adding HDMI connector on [ENCODER:%d:%s]\n" , + intel_encoder->base.base.id, intel_encoder->base.name);if (INTEL_GEN (dev_priv) <12 &&drm_WARN_ON (dev, port ==PORT_A ))return ;@@ -3186,7 +3238,8 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,int ret =intel_hdcp_init (intel_connector, &intel_hdmi_hdcp_shim);if (ret) -DRM_DEBUG_KMS ("HDCP init failed, skipping.\n" ); +drm_dbg_kms (&dev_priv->drm, +"HDCP init failed, skipping.\n" ); }/* For G4X desktop chip, PEG_BAND_GAP_DATA 3:0 must first be written
drivers/gpu/drm/i915/display/intel_hdmi.c void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, · line 3264
Quoted 8 lines
drivers/gpu/drm/i915/display/intel_hdmi.c +1
-1@@ -3205,7 +3258,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,cec_notifier_conn_register (dev->dev,port_identifier (port), &conn_info);if (!intel_hdmi->cec_notifier) -DRM_DEBUG_KMS ("CEC notifier get failed\n" ); +drm_dbg_kms (&dev_priv->drm,"CEC notifier get failed\n" ); } static enum intel_hotplug_state
Hm I guess the foo_to_i915 idea doesn't scale, we'd need C++ and add ->to_i915 to all of them somehow (but not even sure C++ is that powerful with it's abstraction, definitely last time around I looked at it and that was 20 years ago :-)
Quoted 7 lines
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 05/13] drm/i915/dsi: use struct drm_device based logging
In reply to Jani NikulaQuoted 122 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}@@
identifier fn, T;
@@fn(...) {
...
structdrm_i915_private*T = ...;
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_dsi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_dsi.c +4
-3@@ -31,20 +31,21 @@ int intel_dsi_tlpx_ns(const struct intel_dsi *intel_dsi)int intel_dsi_get_modes (struct drm_connector *connector) { +struct drm_i915_private *i915 =to_i915 (connector->dev);struct intel_connector *intel_connector =to_intel_connector (connector);struct drm_display_mode *mode; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );if (!intel_connector->panel.fixed_mode) { -DRM_DEBUG_KMS ("no fixed mode\n" ); +drm_dbg_kms (&i915->drm,"no fixed mode\n" );return 0 ; } mode =drm_mode_duplicate (connector->dev, intel_connector->panel.fixed_mode);if (!mode) { -DRM_DEBUG_KMS ("drm_mode_duplicate failed\n" ); +drm_dbg_kms (&i915->drm,"drm_mode_duplicate failed\n" );return 0 ; }
drivers/gpu/drm/i915/display/intel_dsi.c enum drm_mode_status intel_dsi_mode_valid(struct drm_connector *connector, · line 64
Quoted 5 lines
drivers/gpu/drm/i915/display/intel_dsi.c +1
-1@@ -60,7 +61,7 @@ enum drm_mode_status intel_dsi_mode_valid(struct drm_connector *connector,const struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;int max_dotclk =to_i915 (connector->dev)->max_dotclk_freq; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&dev_priv->drm,"\n" );
Real old school drm printing, just to trace the function call :-)
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dsi.c +0
-0if (mode->flags &DRM_MODE_FLAG_DBLSCAN )return MODE_NO_DBLESCAN ;Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 07/13] drm/i915/dsi: use struct drm_device based logging
In reply to Jani NikulaQuoted 4 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Not done with the cocci from Wambui? Please add usual blurb if done with cocci's help.
Quoted 75 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 10 +++++++--- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 11 +++++------ drivers/gpu/drm/i915/display/vlv_dsi.c | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +7
-3@@ -186,16 +186,19 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host,static int dsi_send_pkt_payld (struct intel_dsi_host *host,struct mipi_dsi_packet pkt) { +struct intel_dsi *intel_dsi = host->intel_dsi; +struct drm_i915_private *i915 =to_i915 (intel_dsi->base.base.dev); +/* payload queue can accept *256 bytes*, check limit */ if (pkt.payload_length >MAX_PLOAD_CREDIT *4 ) { -DRM_ERROR ("payload size exceeds max queue limit\n" ); +drm_err (&i915->drm,"payload size exceeds max queue limit\n" );return -1 ; }/* load data into command payload queue */ if (!add_payld_to_queue (host, pkt.payload, pkt.payload_length)) { -DRM_ERROR ("adding payload to queue failed\n" ); +drm_err (&i915->drm,"adding payload to queue failed\n" );return -1 ; }@@ -1417,6 +1420,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, base);struct intel_connector *intel_connector = intel_dsi->attached_connector;@@ -1446,7 +1450,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, pipe_config->clock_set = true;if (gen11_dsi_dsc_compute_config (encoder, pipe_config)) -DRM_DEBUG_KMS ("Attempting to use DSC failed\n" ); +drm_dbg_kms (&i915->drm,"Attempting to use DSC failed\n" ); pipe_config->port_clock =afe_clk (encoder, pipe_config) /5 ;drivers/gpu/drm/i915/display/intel_dsi_vbt.c +2
-3@@ -453,8 +453,7 @@ static inline void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi,static const u8 *mipi_exec_i2c (struct intel_dsi *intel_dsi,const u8 *data) { -struct drm_device *drm_dev = intel_dsi->base.base.dev; -struct device *dev = &drm_dev->pdev->dev; +struct drm_i915_private *i915 =to_i915 (intel_dsi->base.base.dev);struct i2c_adapter *adapter;struct i2c_msg msg;int ret;@@ -471,7 +470,7 @@ static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data) adapter =i2c_get_adapter (intel_dsi->i2c_bus_num);if (!adapter) { -DRM_DEV_ERROR (dev,"Cannot find a valid i2c bus for xfer\n" ); +drm_err (&i915->drm,"Cannot find a valid i2c bus for xfer\n" ); goto err_bus; }
drivers/gpu/drm/i915/display/intel_dsi_vbt.c static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data) · line 494
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dsi_vbt.c +0
-3@@ -489,9 +488,9 @@ static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data) ret =i2c_transfer (adapter, &msg,1 );if (ret <0 ) -DRM_DEV_ERROR (dev, -"Failed to xfer payload of size (%u) to reg (%u)\n" , - payload_size, reg_offset);
One left to fix in i915 per my count, unfortunately tons more of DRM_DEV_ERROR all over drm :-/
Quoted 13 lines
drivers/gpu/drm/i915/display/intel_dsi_vbt.c +3
-0+drm_err (&i915->drm, +"Failed to xfer payload of size (%u) to reg (%u)\n" , + payload_size, reg_offset);kfree (payload_data); err_alloc:drivers/gpu/drm/i915/display/vlv_dsi.c +0
-0@@ -875,10 +875,11 @@ static void intel_dsi_disable(struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state)
drivers/gpu/drm/i915/display/vlv_dsi.c static void intel_dsi_disable(struct intel_encoder *encoder, · line 885
Quoted 10 lines
drivers/gpu/drm/i915/display/vlv_dsi.c +2
-1{ +struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );intel_dsi_vbt_exec_sequence (intel_dsi,MIPI_SEQ_BACKLIGHT_OFF );intel_panel_disable_backlight (old_conn_state);
Quoted 7 lines
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 08/13] drm/i915/connector: use MISSING_CASE instead of logging
In reply to Jani NikulaQuoted 1 line · Jani Nikula
Signed-off-by Jani Nikula <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/i915/display/intel_connector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_connector.c +1
-1@@ -290,7 +290,7 @@ intel_attach_colorspace_property(struct drm_connector *connector)return ;break ;default : -DRM_DEBUG_KMS ("Colorspace property not supported\n" ); +MISSING_CASE (connector->connector_type);return ; }Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 09/13] drm/i915/tv: use struct drm_device based logging
In reply to Jani NikulaQuoted 86 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}@@
identifier fn, T;
@@fn(...) {
...
structdrm_i915_private*T = ...;
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}
Quoted 2 lines
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 32 lines
--- drivers/gpu/drm/i915/display/intel_tv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/display/intel_tv.c +3
-3@@ -1698,13 +1698,13 @@ intel_tv_detect(struct drm_connector *connector, struct drm_modeset_acquire_ctx *ctx, bool force) { +struct drm_i915_private *i915 =to_i915 (connector->dev);struct intel_tv *intel_tv =intel_attached_tv (to_intel_connector (connector));enum drm_connector_status status;int type; -DRM_DEBUG_KMS ("[CONNECTOR:%d:%s] force=%d\n" , - connector->base.id, connector->name, - force); +drm_dbg_kms (&i915->drm,"[CONNECTOR:%d:%s] force=%d\n" , + connector->base.id, connector->name, force);if (force) {struct intel_load_detect_pipe tmp;Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 10/13] drm/i915/display: clean up intel_PLL_is_valid()
In reply to Jani NikulaQuoted 4 lines · Jani Nikula
Drop useless macro hiding the return. Fix superfluous whitespace. Rename function to all lowercase.
Signed-off-by Jani Nikula <[email protected]>
We do lose the debug output, but then I don't think we'll do much bug hunting in here anytime soon, it's all fairly old gmch-style display stuff. Also just realized I'm still pining for an intel_gmch_pll.c ...
Quoted 120 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 40 ++++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +19
-21@@ -620,45 +620,43 @@ int chv_calc_dpll_params(int refclk, struct dpll *clock)return clock->dot /5 ; } -#define INTELPllInvalid (s) do {/* DRM_DEBUG(s); */ return false; }while (0 ) -/* * Returns whether the given set of divisors are valid for a given refclk with * the given connectors. */ -static bool intel_PLL_is_valid(struct drm_i915_private *dev_priv, +static bool intel_pll_is_valid (struct drm_i915_private *dev_priv,const struct intel_limit *limit,const struct dpll *clock) { -if (clock->n < limit->n.min || limit->n.max < clock->n) -INTELPllInvalid ("n out of range\n" ); -if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1) -INTELPllInvalid ("p1 out of range\n" ); -if (clock->m2 < limit->m2.min || limit->m2.max < clock->m2) -INTELPllInvalid ("m2 out of range\n" ); -if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1) -INTELPllInvalid ("m1 out of range\n" ); +if (clock->n < limit->n.min || limit->n.max < clock->n) +return false; +if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1) +return false; +if (clock->m2 < limit->m2.min || limit->m2.max < clock->m2) +return false; +if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1) +return false;if (!IS_PINEVIEW (dev_priv) && !IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv) && !IS_GEN9_LP (dev_priv))if (clock->m1 <= clock->m2) -INTELPllInvalid ("m1 <= m2\n" ); +return false;if (!IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv) && !IS_GEN9_LP (dev_priv)) {if (clock->p < limit->p.min || limit->p.max < clock->p) -INTELPllInvalid ("p out of range\n" ); +return false;if (clock->m < limit->m.min || limit->m.max < clock->m) -INTELPllInvalid ("m out of range\n" ); +return false; }if (clock->vco < limit->vco.min || limit->vco.max < clock->vco) -INTELPllInvalid ("vco out of range\n" ); +return false;/* XXX: We may need to be checking "Dot clock" depending on the multiplier, * connector, etc., rather than just a single range. */ if (clock->dot < limit->dot.min || limit->dot.max < clock->dot) -INTELPllInvalid ("dot out of range\n" ); +return false;return true; }@@ -725,7 +723,7 @@ i9xx_find_best_dpll(const struct intel_limit *limit,int this_err;i9xx_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;@@ -781,7 +779,7 @@ pnv_find_best_dpll(const struct intel_limit *limit,int this_err;pnv_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;@@ -842,7 +840,7 @@ g4x_find_best_dpll(const struct intel_limit *limit,int this_err;i9xx_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;@@ -939,7 +937,7 @@ vlv_find_best_dpll(const struct intel_limit *limit,vlv_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;@@ -1008,7 +1006,7 @@ chv_find_best_dpll(const struct intel_limit *limit,chv_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), limit, &clock)) +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ; if (!vlv_PLL_is_optimal(dev, target, &clock, best_clock,Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 11/13] drm/i915/display: use struct drm_device based logging
In reply to Jani NikulaQuoted 86 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}@@
identifier fn, T;
@@fn(...) {
...
structdrm_i915_private*T = ...;
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}
Quoted 2 lines
Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 69 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 25 +++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +14
-11@@ -2908,6 +2908,7 @@ intel_fb_plane_get_subsampling(int *hsub, int *vsub,static int intel_fb_check_ccs_xy (struct drm_framebuffer *fb,int ccs_plane,int x,int y) { +struct drm_i915_private *i915 =to_i915 (fb->dev);struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb);int main_plane;int hsub, vsub;@@ -2936,7 +2937,8 @@ intel_fb_check_ccs_xy(struct drm_framebuffer *fb, int ccs_plane, int x, int y)* x/y offsets must match between CCS and the main surface. */ if (main_x != ccs_x || main_y != ccs_y) { - DRM_DEBUG_KMS("Bad CCS x/y (main %d,%d ccs %d,%d) full (main %d,%d ccs %d,%d)\n", + drm_dbg_kms(&i915->drm, + "Bad CCS x/y (main %d,%d ccs %d,%d) full (main %d,%d ccs %d,%d)\n", main_x, main_y, ccs_x, ccs_y, intel_fb->normal[main_plane].x,@@ -12882,16 +12884,17 @@ compute_baseline_pipe_bpp(struct intel_crtc *crtc,return 0 ; } -static void intel_dump_crtc_timings (const struct drm_display_mode *mode) +static void intel_dump_crtc_timings (struct drm_i915_private *i915, +const struct drm_display_mode *mode) { -DRM_DEBUG_KMS ("crtc timings: %d %d %d %d %d %d %d %d %d, " -"type: 0x%x flags: 0x%x\n" , - mode->crtc_clock, - mode->crtc_hdisplay, mode->crtc_hsync_start, - mode->crtc_hsync_end, mode->crtc_htotal, - mode->crtc_vdisplay, mode->crtc_vsync_start, - mode->crtc_vsync_end, mode->crtc_vtotal, - mode->type, mode->flags); +drm_dbg_kms (&i915->drm,"crtc timings: %d %d %d %d %d %d %d %d %d, " +"type: 0x%x flags: 0x%x\n" , + mode->crtc_clock, + mode->crtc_hdisplay, mode->crtc_hsync_start, + mode->crtc_hsync_end, mode->crtc_htotal, + mode->crtc_vdisplay, mode->crtc_vsync_start, + mode->crtc_vsync_end, mode->crtc_vtotal, + mode->type, mode->flags); } static inline void@@ -13075,7 +13078,7 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config,drm_mode_debug_printmodeline (&pipe_config->hw.mode);drm_dbg_kms (&dev_priv->drm,"adjusted mode:\n" );drm_mode_debug_printmodeline (&pipe_config->hw.adjusted_mode); -intel_dump_crtc_timings (&pipe_config->hw.adjusted_mode); +intel_dump_crtc_timings (dev_priv, &pipe_config->hw.adjusted_mode); drm_dbg_kms(&dev_priv->drm, "port clock: %d, pipe src size: %dx%d, pixel rate %d\n", pipe_config->port_clock,Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 12/13] drm/i915/psr: use struct drm_device based logging
In reply to Jani NikulaQuoted 190 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Generated using the following semantic patch, originally written by Wambui Karuga <[email protected]>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...){
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}@@
identifier fn, T;
@@fn(...) {
...
structdrm_i915_private*T = ...;
<+...
((quoted diff) +1
-1-DRM_INFO( +drm_info(&T->drm,...)
|(quoted diff) +1
-1-DRM_NOTE( +drm_notice(&T->drm,...)
|(quoted diff) +1
-1-DRM_ERROR( +drm_err(&T->drm,...)
|(quoted diff) +1
-1-DRM_WARN( +drm_warn(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_DRIVER( +drm_dbg(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_KMS( +drm_dbg_kms(&T->drm,...)
|(quoted diff) +1
-1-DRM_DEBUG_ATOMIC( +drm_dbg_atomic(&T->drm,...)
)
...+>
}Cc Wambui Karuga <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_psr.c | 47 +++++++++++++----------- 1 file changed, 26 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/display/intel_psr.c +24
-20@@ -137,41 +137,42 @@ static void psr_irq_control(struct drm_i915_private *dev_priv)intel_de_write (dev_priv, imr_reg, val); } -static void psr_event_print (u32 val,bool psr2_enabled) +static void psr_event_print (struct drm_i915_private *i915, +u32 val,bool psr2_enabled) { -DRM_DEBUG_KMS ("PSR exit events: 0x%x\n" , val); +drm_dbg_kms (&i915->drm,"PSR exit events: 0x%x\n" , val);if (val &PSR_EVENT_PSR2_WD_TIMER_EXPIRE ) -DRM_DEBUG_KMS ("\tPSR2 watchdog timer expired\n" ); +drm_dbg_kms (&i915->drm,"\tPSR2 watchdog timer expired\n" );if ((val &PSR_EVENT_PSR2_DISABLED ) && psr2_enabled) -DRM_DEBUG_KMS ("\tPSR2 disabled\n" ); +drm_dbg_kms (&i915->drm,"\tPSR2 disabled\n" );if (val &PSR_EVENT_SU_DIRTY_FIFO_UNDERRUN ) -DRM_DEBUG_KMS ("\tSU dirty FIFO underrun\n" ); +drm_dbg_kms (&i915->drm,"\tSU dirty FIFO underrun\n" );if (val &PSR_EVENT_SU_CRC_FIFO_UNDERRUN ) -DRM_DEBUG_KMS ("\tSU CRC FIFO underrun\n" ); +drm_dbg_kms (&i915->drm,"\tSU CRC FIFO underrun\n" );if (val &PSR_EVENT_GRAPHICS_RESET ) -DRM_DEBUG_KMS ("\tGraphics reset\n" ); +drm_dbg_kms (&i915->drm,"\tGraphics reset\n" );if (val &PSR_EVENT_PCH_INTERRUPT ) -DRM_DEBUG_KMS ("\tPCH interrupt\n" ); +drm_dbg_kms (&i915->drm,"\tPCH interrupt\n" );if (val &PSR_EVENT_MEMORY_UP ) -DRM_DEBUG_KMS ("\tMemory up\n" ); +drm_dbg_kms (&i915->drm,"\tMemory up\n" );if (val &PSR_EVENT_FRONT_BUFFER_MODIFY ) -DRM_DEBUG_KMS ("\tFront buffer modification\n" ); +drm_dbg_kms (&i915->drm,"\tFront buffer modification\n" );if (val &PSR_EVENT_WD_TIMER_EXPIRE ) -DRM_DEBUG_KMS ("\tPSR watchdog timer expired\n" ); +drm_dbg_kms (&i915->drm,"\tPSR watchdog timer expired\n" );if (val &PSR_EVENT_PIPE_REGISTERS_UPDATE ) -DRM_DEBUG_KMS ("\tPIPE registers updated\n" ); +drm_dbg_kms (&i915->drm,"\tPIPE registers updated\n" );if (val &PSR_EVENT_REGISTER_UPDATE ) -DRM_DEBUG_KMS ("\tRegister updated\n" ); +drm_dbg_kms (&i915->drm,"\tRegister updated\n" );if (val &PSR_EVENT_HDCP_ENABLE ) -DRM_DEBUG_KMS ("\tHDCP enabled\n" ); +drm_dbg_kms (&i915->drm,"\tHDCP enabled\n" );if (val &PSR_EVENT_KVMR_SESSION_ENABLE ) -DRM_DEBUG_KMS ("\tKVMR session enabled\n" ); +drm_dbg_kms (&i915->drm,"\tKVMR session enabled\n" );if (val &PSR_EVENT_VBI_ENABLE ) -DRM_DEBUG_KMS ("\tVBI enabled\n" ); +drm_dbg_kms (&i915->drm,"\tVBI enabled\n" );if (val &PSR_EVENT_LPSP_MODE_EXIT ) -DRM_DEBUG_KMS ("\tLPSP mode exited\n" ); +drm_dbg_kms (&i915->drm,"\tLPSP mode exited\n" );if ((val &PSR_EVENT_PSR_DISABLE ) && !psr2_enabled) -DRM_DEBUG_KMS ("\tPSR disabled\n" ); +drm_dbg_kms (&i915->drm,"\tPSR disabled\n" ); }void intel_psr_irq_handler (struct drm_i915_private *dev_priv,u32 psr_iir)@@ -209,7 +210,7 @@ void intel_psr_irq_handler(struct drm_i915_private *dev_priv, u32 psr_iir)intel_de_write (dev_priv,PSR_EVENT (cpu_transcoder), val); -psr_event_print (val, psr2_enabled); +psr_event_print (dev_priv, val, psr2_enabled); } }@@ -249,18 +250,21 @@ static bool intel_dp_get_alpm_status(struct intel_dp *intel_dp)static u8 intel_dp_get_sink_sync_latency (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u8 val =8 ;/* assume the worst if we can't read the value */ if (drm_dp_dpcd_readb (&intel_dp->aux,DP_SYNCHRONIZATION_LATENCY_IN_SINK , &val) ==1 ) val &=DP_MAX_RESYNC_FRAME_COUNT_MASK ;else -DRM_DEBUG_KMS ("Unable to get sink synchronization latency, assuming 8 frames\n" ); +drm_dbg_kms (&i915->drm, +"Unable to get sink synchronization latency, assuming 8 frames\n" );return val; }static u16 intel_dp_get_su_x_granulartiy (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);u16 val;ssize_t r;
drivers/gpu/drm/i915/display/intel_psr.c static u16 intel_dp_get_su_x_granulartiy(struct intel_dp *intel_dp) · line 284
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_psr.c +2
-1@@ -273,7 +277,8 @@ static u16 intel_dp_get_su_x_granulartiy(struct intel_dp *intel_dp) r =drm_dp_dpcd_read (&intel_dp->aux,DP_PSR2_SU_X_GRANULARITY , &val,2 );if (r !=2 ) -DRM_DEBUG_KMS ("Unable to read DP_PSR2_SU_X_GRANULARITY\n" ); +drm_dbg_kms (&i915->drm, +"Unable to read DP_PSR2_SU_X_GRANULARITY\n" );/* * Spec says that if the value read is 0 the default granularity should
Quoted 7 lines
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 13/13] drm/i915/wopcm: convert to drm device based logging
In reply to Jani NikulaQuoted 92 lines · Jani Nikula
Prefer
drm_dbg()overDRM_DEV_DEBUG_DRIVER()anddrm_err()overdev_err().Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/intel_wopcm.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)drivers/gpu/drm/i915/intel_wopcm.c +10
-12@@ -86,7 +86,7 @@ void intel_wopcm_init_early(struct intel_wopcm *wopcm)else wopcm->size =GEN9_WOPCM_SIZE ; -DRM_DEV_DEBUG_DRIVER (i915->drm.dev,"WOPCM: %uK\n" , wopcm->size /1024 ); +drm_dbg (&i915->drm,"WOPCM: %uK\n" , wopcm->size /1024 ); }static inline u32 context_reserved_size (struct drm_i915_private *i915)@@ -112,7 +112,7 @@ static inline bool gen9_check_dword_gap(struct drm_i915_private *i915, offset = guc_wopcm_base +GEN9_GUC_WOPCM_OFFSET ;if (offset > guc_wopcm_size || (guc_wopcm_size - offset) <sizeof (u32)) { -dev_err (i915->drm.dev, +drm_err (&i915->drm,"WOPCM: invalid GuC region size: %uK < %uK\n" , guc_wopcm_size /SZ_1K , (u32)(offset +sizeof (u32)) /SZ_1K );@@ -131,7 +131,7 @@ static inline bool gen9_check_huc_fw_fits(struct drm_i915_private *i915,* firmware uploading would fail. */ if (huc_fw_size > guc_wopcm_size -GUC_WOPCM_RESERVED ) { -dev_err (i915->drm.dev,"WOPCM: no space for %s: %uK < %uK\n" , +drm_err (&i915->drm,"WOPCM: no space for %s: %uK < %uK\n" ,intel_uc_fw_type_repr (INTEL_UC_FW_TYPE_HUC ), (guc_wopcm_size -GUC_WOPCM_RESERVED ) /SZ_1K , huc_fw_size /1024 );@@ -166,7 +166,7 @@ static inline bool __check_layout(struct drm_i915_private *i915, u32 wopcm_size, size = wopcm_size - ctx_rsvd;if (unlikely (range_overflows (guc_wopcm_base, guc_wopcm_size, size))) { -dev_err (i915->drm.dev, +drm_err (&i915->drm,"WOPCM: invalid GuC region layout: %uK + %uK > %uK\n" , guc_wopcm_base /SZ_1K , guc_wopcm_size /SZ_1K , size /SZ_1K );@@ -175,7 +175,7 @@ static inline bool __check_layout(struct drm_i915_private *i915, u32 wopcm_size, size = guc_fw_size +GUC_WOPCM_RESERVED +GUC_WOPCM_STACK_RESERVED ;if (unlikely (guc_wopcm_size < size)) { -dev_err (i915->drm.dev,"WOPCM: no space for %s: %uK < %uK\n" , +drm_err (&i915->drm,"WOPCM: no space for %s: %uK < %uK\n" ,intel_uc_fw_type_repr (INTEL_UC_FW_TYPE_GUC ), guc_wopcm_size /SZ_1K , size /SZ_1K );return false;@@ -183,7 +183,7 @@ static inline bool __check_layout(struct drm_i915_private *i915, u32 wopcm_size, size = huc_fw_size +WOPCM_RESERVED_SIZE ;if (unlikely (guc_wopcm_base < size)) { -dev_err (i915->drm.dev,"WOPCM: no space for %s: %uK < %uK\n" , +drm_err (&i915->drm,"WOPCM: no space for %s: %uK < %uK\n" ,intel_uc_fw_type_repr (INTEL_UC_FW_TYPE_HUC ), guc_wopcm_base /SZ_1K , size /SZ_1K );return false;@@ -242,10 +242,8 @@ void intel_wopcm_init(struct intel_wopcm *wopcm)return ;if (__wopcm_regs_locked (gt->uncore, &guc_wopcm_base, &guc_wopcm_size)) { -DRM_DEV_DEBUG_DRIVER (i915->drm.dev, -"GuC WOPCM is already locked [%uK, %uK)\n" , - guc_wopcm_base /SZ_1K , - guc_wopcm_size /SZ_1K ); +drm_dbg (&i915->drm,"GuC WOPCM is already locked [%uK, %uK)\n" , + guc_wopcm_base /SZ_1K , guc_wopcm_size /SZ_1K ); goto check; }@@ -266,8 +264,8 @@ void intel_wopcm_init(struct intel_wopcm *wopcm) guc_wopcm_size = wopcm->size - ctx_rsvd - guc_wopcm_base; guc_wopcm_size &=GUC_WOPCM_SIZE_MASK ; -DRM_DEV_DEBUG_DRIVER (i915->drm.dev,"Calculated GuC WOPCM [%uK, %uK)\n" , - guc_wopcm_base /SZ_1K , guc_wopcm_size /SZ_1K ); +drm_dbg (&i915->drm,"Calculated GuC WOPCM [%uK, %uK)\n" , + guc_wopcm_base /SZ_1K , guc_wopcm_size /SZ_1K ); check: if (__check_layout(i915, wopcm->size, guc_wopcm_base, guc_wopcm_size,Signature · 1 line
2.20.1
Quoted 5 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 07/13] drm/i915/dsi: use struct drm_device based logging
In reply to Daniel VetterQuoted 8 lines · Daniel Vetter
Quoted 4 lines · Jani Nikula
Convert all the DRM_* logging macros to the struct
drm_devicebased macros to provide device specific logging.No functional changes.
Not done with the cocci from Wambui? Please add usual blurb if done with cocci's help.
Hmm, I wonder what crack the cocci part fell into. Added while applying.
Pushed the entire pile, thanks a lot for the reviews.
BR,
Jani.
Quoted 119 lines
Quoted 76 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/icl_dsi.c | 10 +++++++--- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 11 +++++------ drivers/gpu/drm/i915/display/vlv_dsi.c | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-)drivers/gpu/drm/i915/display/icl_dsi.c +7
-3@@ -186,16 +186,19 @@ static int dsi_send_pkt_hdr(struct intel_dsi_host *host,static int dsi_send_pkt_payld (struct intel_dsi_host *host,struct mipi_dsi_packet pkt) { +struct intel_dsi *intel_dsi = host->intel_dsi; +struct drm_i915_private *i915 =to_i915 (intel_dsi->base.base.dev); +/* payload queue can accept *256 bytes*, check limit */ if (pkt.payload_length >MAX_PLOAD_CREDIT *4 ) { -DRM_ERROR ("payload size exceeds max queue limit\n" ); +drm_err (&i915->drm,"payload size exceeds max queue limit\n" );return -1 ; }/* load data into command payload queue */ if (!add_payld_to_queue (host, pkt.payload, pkt.payload_length)) { -DRM_ERROR ("adding payload to queue failed\n" ); +drm_err (&i915->drm,"adding payload to queue failed\n" );return -1 ; }@@ -1417,6 +1420,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder,struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { + struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi, base);struct intel_connector *intel_connector = intel_dsi->attached_connector;@@ -1446,7 +1450,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, pipe_config->clock_set = true;if (gen11_dsi_dsc_compute_config (encoder, pipe_config)) -DRM_DEBUG_KMS ("Attempting to use DSC failed\n" ); +drm_dbg_kms (&i915->drm,"Attempting to use DSC failed\n" ); pipe_config->port_clock =afe_clk (encoder, pipe_config) /5 ;drivers/gpu/drm/i915/display/intel_dsi_vbt.c +2
-3@@ -453,8 +453,7 @@ static inline void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi,static const u8 *mipi_exec_i2c (struct intel_dsi *intel_dsi,const u8 *data) { -struct drm_device *drm_dev = intel_dsi->base.base.dev; -struct device *dev = &drm_dev->pdev->dev; +struct drm_i915_private *i915 =to_i915 (intel_dsi->base.base.dev);struct i2c_adapter *adapter;struct i2c_msg msg;int ret;@@ -471,7 +470,7 @@ static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data) adapter =i2c_get_adapter (intel_dsi->i2c_bus_num);if (!adapter) { -DRM_DEV_ERROR (dev,"Cannot find a valid i2c bus for xfer\n" ); +drm_err (&i915->drm,"Cannot find a valid i2c bus for xfer\n" ); goto err_bus; }drivers/gpu/drm/i915/display/intel_dsi_vbt.c static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data) · line 494
Quoted 6 lines
drivers/gpu/drm/i915/display/intel_dsi_vbt.c +0
-3@@ -489,9 +488,9 @@ static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const u8 *data) ret =i2c_transfer (adapter, &msg,1 );if (ret <0 ) -DRM_DEV_ERROR (dev, -"Failed to xfer payload of size (%u) to reg (%u)\n" , - payload_size, reg_offset);One left to fix in i915 per my count, unfortunately tons more of
DRM_DEV_ERRORall over drm :-/Quoted 13 lines
drivers/gpu/drm/i915/display/intel_dsi_vbt.c +3
-0+drm_err (&i915->drm, +"Failed to xfer payload of size (%u) to reg (%u)\n" , + payload_size, reg_offset);kfree (payload_data); err_alloc:drivers/gpu/drm/i915/display/vlv_dsi.c +0
-0@@ -875,10 +875,11 @@ static void intel_dsi_disable(struct intel_encoder *encoder,const struct intel_crtc_state *old_crtc_state, const struct drm_connector_state *old_conn_state)drivers/gpu/drm/i915/display/vlv_dsi.c static void intel_dsi_disable(struct intel_encoder *encoder, · line 885
Quoted 10 lines
drivers/gpu/drm/i915/display/vlv_dsi.c +2
-1{ +struct drm_i915_private *i915 =to_i915 (encoder->base.dev);struct intel_dsi *intel_dsi =enc_to_intel_dsi (encoder);enum port port; -DRM_DEBUG_KMS ("\n" ); +drm_dbg_kms (&i915->drm,"\n" );intel_dsi_vbt_exec_sequence (intel_dsi,MIPI_SEQ_BACKLIGHT_OFF );intel_panel_disable_backlight (old_conn_state);Reviewed-by Daniel Vetter <[email protected]>Quoted 7 lines
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH 06/13] drm/i915/hdmi: use struct drm_device based logging
In reply to Daniel VetterQuoted 4 lines · Daniel Vetter
Hm I guess the
foo_to_i915idea doesn't scale, we'd need C++ and add ->to_i915 to all of them somehow (but not even sure C++ is that powerful with it's abstraction, definitely last time around I looked at it and that was 20 years ago :-)
This was pretty much my conclusion as well, and decided not to pursue it. I did consider documenting the easiest/recommended ways to get at i915 from various types. TODO...
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
Re: [Intel-gfx] [PATCH 10/13] drm/i915/display: clean up intel_PLL_is_valid()
In reply to Daniel VetterQuoted 9 lines · Daniel Vetter
Quoted 4 lines · Jani Nikula
Drop useless macro hiding the return. Fix superfluous whitespace. Rename function to all lowercase.
Signed-off-by Jani Nikula <[email protected]>We do lose the debug output, but then I don't think we'll do much bug hunting in here anytime soon, it's all fairly old gmch-style display stuff. Also just realized I'm still pining for an
intel_gmch_pll.c...
We don't lose the output, because the DRM_DEBUG(s) is wrapped in comments... I didn't see the value in having these, as it's part of the normal flow.
BR,
Jani.
Quoted 123 lines
Reviewed-by Daniel Vetter <[email protected]>Quoted 120 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 40 ++++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +19
-21@@ -620,45 +620,43 @@ int chv_calc_dpll_params(int refclk, struct dpll *clock)return clock->dot /5 ; } -#define INTELPllInvalid (s) do {/* DRM_DEBUG(s); */ return false; }while (0 ) -/* * Returns whether the given set of divisors are valid for a given refclk with * the given connectors. */ -static bool intel_PLL_is_valid(struct drm_i915_private *dev_priv, +static bool intel_pll_is_valid (struct drm_i915_private *dev_priv,const struct intel_limit *limit,const struct dpll *clock) { -if (clock->n < limit->n.min || limit->n.max < clock->n) -INTELPllInvalid ("n out of range\n" ); -if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1) -INTELPllInvalid ("p1 out of range\n" ); -if (clock->m2 < limit->m2.min || limit->m2.max < clock->m2) -INTELPllInvalid ("m2 out of range\n" ); -if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1) -INTELPllInvalid ("m1 out of range\n" ); +if (clock->n < limit->n.min || limit->n.max < clock->n) +return false; +if (clock->p1 < limit->p1.min || limit->p1.max < clock->p1) +return false; +if (clock->m2 < limit->m2.min || limit->m2.max < clock->m2) +return false; +if (clock->m1 < limit->m1.min || limit->m1.max < clock->m1) +return false;if (!IS_PINEVIEW (dev_priv) && !IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv) && !IS_GEN9_LP (dev_priv))if (clock->m1 <= clock->m2) -INTELPllInvalid ("m1 <= m2\n" ); +return false;if (!IS_VALLEYVIEW (dev_priv) && !IS_CHERRYVIEW (dev_priv) && !IS_GEN9_LP (dev_priv)) {if (clock->p < limit->p.min || limit->p.max < clock->p) -INTELPllInvalid ("p out of range\n" ); +return false;if (clock->m < limit->m.min || limit->m.max < clock->m) -INTELPllInvalid ("m out of range\n" ); +return false; }if (clock->vco < limit->vco.min || limit->vco.max < clock->vco) -INTELPllInvalid ("vco out of range\n" ); +return false;/* XXX: We may need to be checking "Dot clock" depending on the multiplier, * connector, etc., rather than just a single range. */ if (clock->dot < limit->dot.min || limit->dot.max < clock->dot) -INTELPllInvalid ("dot out of range\n" ); +return false;return true; }@@ -725,7 +723,7 @@ i9xx_find_best_dpll(const struct intel_limit *limit,int this_err;i9xx_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;@@ -781,7 +779,7 @@ pnv_find_best_dpll(const struct intel_limit *limit,int this_err;pnv_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;@@ -842,7 +840,7 @@ g4x_find_best_dpll(const struct intel_limit *limit,int this_err;i9xx_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;@@ -939,7 +937,7 @@ vlv_find_best_dpll(const struct intel_limit *limit,vlv_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ;@@ -1008,7 +1006,7 @@ chv_find_best_dpll(const struct intel_limit *limit,chv_calc_dpll_params (refclk, &clock); -if (!intel_PLL_is_valid (to_i915 (dev), limit, &clock)) +if (!intel_pll_is_valid (to_i915 (dev), limit, &clock))continue ; if (!vlv_PLL_is_optimal(dev, target, &clock, best_clock,Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx