Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b1c5818 authored by Pandiyan, Dhinakaran's avatar Pandiyan, Dhinakaran Committed by Jani Nikula
Browse files

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: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: default avatarJames Ausmus <james.ausmus@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170918222141.4674-2-dhinakaran.pandiyan@intel.com
parent dd59a9ba

drivers/gpu/drm/i915/intel_dp_mst.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -133,7 +133,7 @@ static void intel_mst_disable_dp(struct intel_encoder *encoder, 
		to_intel_connector(old_conn_state->connector);

		to_intel_connector(old_conn_state->connector);

	int ret;

	int ret;





	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);

	DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);





	drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, connector->port);

	drm_dp_mst_reset_vcpi_slots(&intel_dp->mst_mgr, connector->port);
@@ -155,8 +155,6 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, 
	struct intel_connector *connector =

	struct intel_connector *connector =

		to_intel_connector(old_conn_state->connector);

		to_intel_connector(old_conn_state->connector);





	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);



	/* this can fail */

	/* this can fail */

	drm_dp_check_act_status(&intel_dp->mst_mgr);

	drm_dp_check_act_status(&intel_dp->mst_mgr);

	/* and this can also fail */

	/* and this can also fail */
@@ -173,6 +171,7 @@ static void intel_mst_post_disable_dp(struct intel_encoder *encoder, 




		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);

		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);

	}

	}

	DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);

}

}





static void intel_mst_pre_enable_dp(struct intel_encoder *encoder,

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, 
	connector->encoder = encoder;

	connector->encoder = encoder;

	intel_mst->connector = connector;

	intel_mst->connector = connector;





	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);

	DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);





	if (intel_dp->active_mst_links == 0)

	if (intel_dp->active_mst_links == 0)

		intel_dig_port->base.pre_enable(&intel_dig_port->base,

		intel_dig_port->base.pre_enable(&intel_dig_port->base,
@@ -229,7 +228,7 @@ static void intel_mst_enable_dp(struct intel_encoder *encoder, 
	enum port port = intel_dig_port->port;

	enum port port = intel_dig_port->port;

	int ret;

	int ret;





	DRM_DEBUG_KMS("%d\n", intel_dp->active_mst_links);

	DRM_DEBUG_KMS("active links %d\n", intel_dp->active_mst_links);





	if (intel_wait_for_register(dev_priv,

	if (intel_wait_for_register(dev_priv,

				    DP_TP_STATUS(port),

				    DP_TP_STATUS(port),