diff options
author | Pandiyan, Dhinakaran <dhinakaran.pandiyan@intel.com> | 2017-09-18 18:21:38 -0400 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2017-09-25 08:21:22 -0400 |
commit | 9b1c581885c985b84d36a9ffa519a9b2e68708e1 (patch) | |
tree | 9c05056479b2a42806875c89b8a04a74ad806504 /drivers/gpu/drm/i915/intel_dp_mst.c | |
parent | dd59a9ba952752abecf4eb95287fb8c64fdb4499 (diff) |
drm/i915/mst: Print active mst links after update
Both mst_disable_dp and mst_post_disable_dp print number of active links
before the variable has been updated. Move the print statement in
mst_disable_dp after the decrement so that the printed values indicate
the disabing of a mst connector. Also, add some text to clarify what we
are printing.
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: James Ausmus <james.ausmus@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170918222141.4674-2-dhinakaran.pandiyan@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp_mst.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp_mst.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c index 88d1d2b9ac56..9a396f483f8b 100644 --- a/drivers/gpu/drm/i915/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/intel_dp_mst.c | |||
@@ -133,7 +133,7 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder, | |||
133 | to_intel_connector(old_conn_state->connector); | 133 | to_intel_connector(old_conn_state->connector); |
134 | int ret; | 134 | int ret; |
135 | 135 | ||
136 | DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); | 136 | DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links); |
137 | 137 | ||
138 | drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, connector->port); | 138 | drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, connector->port); |
139 | 139 | ||
@@ -155,8 +155,6 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, | |||
155 | struct intel_connector *connector = | 155 | struct intel_connector *connector = |
156 | to_intel_connector(old_conn_state->connector); | 156 | to_intel_connector(old_conn_state->connector); |
157 | 157 | ||
158 | DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); | ||
159 | |||
160 | /* this can fail */ | 158 | /* this can fail */ |
161 | drm_dp_check_act_status(&intel_dp->mst_mgr); | 159 | drm_dp_check_act_status(&intel_dp->mst_mgr); |
162 | /* and this can also fail */ | 160 | /* and this can also fail */ |
@@ -173,6 +171,7 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, | |||
173 | 171 | ||
174 | intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF); | 172 | intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF); |
175 | } | 173 | } |
174 | DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links); | ||
176 | } | 175 | } |
177 | 176 | ||
178 | static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, | 177 | static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, |
@@ -195,7 +194,7 @@ static void intel_mst_pre_enable_dp(struct intel_encoder *encoder, | |||
195 | connector->encoder = encoder; | 194 | connector->encoder = encoder; |
196 | intel_mst->connector = connector; | 195 | intel_mst->connector = connector; |
197 | 196 | ||
198 | DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); | 197 | DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links); |
199 | 198 | ||
200 | if (intel_dp->active_mst_links == 0) | 199 | if (intel_dp->active_mst_links == 0) |
201 | intel_dig_port->base.pre_enable(&intel_dig_port->base, | 200 | intel_dig_port->base.pre_enable(&intel_dig_port->base, |
@@ -229,7 +228,7 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder, | |||
229 | enum port port = intel_dig_port->port; | 228 | enum port port = intel_dig_port->port; |
230 | int ret; | 229 | int ret; |
231 | 230 | ||
232 | DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links); | 231 | DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links); |
233 | 232 | ||
234 | if (intel_wait_for_register(dev_priv, | 233 | if (intel_wait_for_register(dev_priv, |
235 | DP_TP_STATUS(port), | 234 | DP_TP_STATUS(port), |