| Message ID | 1477456649-2533-1-git-send-email-dhinakaran.pandiyan@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Jim, Please let me know if the R-B is still good. -DK On Tue, 2016-10-25 at 21:37 -0700, Dhinakaran Pandiyan wrote: > From: "Pandiyan, Dhinakaran" <dhinakaran.pandiyan@intel.com> > > No functional change. Just printing the number of active links without > stating what the number means is not very useful. So, add relevant text. > > v2: Included connector info (Chris) > Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> > Reviewed-by: Jim Bride <jim.bride@linux.intel.com> > --- > drivers/gpu/drm/i915/intel_dp_mst.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c > index 3ffbd69..8f2016b 100644 > --- a/drivers/gpu/drm/i915/intel_dp_mst.c > +++ b/drivers/gpu/drm/i915/intel_dp_mst.c > @@ -86,8 +86,6 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder, > to_intel_connector(old_conn_state->connector); > int ret; > > - DRM_DEBUG_KMS("%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); > @@ -106,8 +104,6 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, > struct intel_connector *connector = > to_intel_connector(old_conn_state->connector); > > - DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); > - > /* this can fail */ > drm_dp_check_act_status(&intel_dp->mst_mgr); > /* and this can also fail */ > @@ -124,6 +120,11 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, > > intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF); > } > + > + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] MST link deactivated, total active links: %d\n", > + old_conn_state->connector->base.id, > + old_conn_state->connector->name, > + intel_dp->active_mst_links); > } > > static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, > @@ -147,8 +148,6 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, > connector->encoder = encoder; > intel_mst->connector = connector; > > - DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); > - > if (intel_dp->active_mst_links == 0) { > intel_ddi_clk_select(&intel_dig_port->base, > pipe_config->shared_dpll); > @@ -175,7 +174,6 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, > return; > } > > - > intel_dp->active_mst_links++; > temp = I915_READ(DP_TP_STATUS(port)); > I915_WRITE(DP_TP_STATUS(port), temp); > @@ -194,8 +192,6 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder, > enum port port = intel_dig_port->port; > int ret; > > - DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); > - > if (intel_wait_for_register(dev_priv, > DP_TP_STATUS(port), > DP_TP_STATUS_ACT_SENT, > @@ -206,6 +202,11 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder, > ret = drm_dp_check_act_status(&intel_dp->mst_mgr); > > ret = drm_dp_update_payload_part2(&intel_dp->mst_mgr); > + > + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] MST link activated, total active links: %d\n", > + conn_state->connector->base.id, > + conn_state->connector->name, > + intel_dp->active_mst_links); > } > > static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 3ffbd69..8f2016b 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -86,8 +86,6 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder, to_intel_connector(old_conn_state->connector); int ret; - DRM_DEBUG_KMS("%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); @@ -106,8 +104,6 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, struct intel_connector *connector = to_intel_connector(old_conn_state->connector); - DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); - /* this can fail */ drm_dp_check_act_status(&intel_dp->mst_mgr); /* and this can also fail */ @@ -124,6 +120,11 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF); } + + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] MST link deactivated, total active links: %d\n", + old_conn_state->connector->base.id, + old_conn_state->connector->name, + intel_dp->active_mst_links); } static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, @@ -147,8 +148,6 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, connector->encoder = encoder; intel_mst->connector = connector; - DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); - if (intel_dp->active_mst_links == 0) { intel_ddi_clk_select(&intel_dig_port->base, pipe_config->shared_dpll); @@ -175,7 +174,6 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, return; } - intel_dp->active_mst_links++; temp = I915_READ(DP_TP_STATUS(port)); I915_WRITE(DP_TP_STATUS(port), temp); @@ -194,8 +192,6 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder, enum port port = intel_dig_port->port; int ret; - DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); - if (intel_wait_for_register(dev_priv, DP_TP_STATUS(port), DP_TP_STATUS_ACT_SENT, @@ -206,6 +202,11 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder, ret = drm_dp_check_act_status(&intel_dp->mst_mgr); ret = drm_dp_update_payload_part2(&intel_dp->mst_mgr); + + DRM_DEBUG_KMS("[CONNECTOR:%d:%s] MST link activated, total active links: %d\n", + conn_state->connector->base.id, + conn_state->connector->name, + intel_dp->active_mst_links); } static bool intel_dp_mst_enc_get_hw_state(struct intel_encoder *encoder,