Commit 601f0479 authored by Maitreyee Rao's avatar Maitreyee Rao Committed by Rob Clark
Browse files

drm/msm/dp: add logs across DP driver for ease of debugging 



Add trace points across the MSM DP driver to help debug
interop issues.

Changes in v2:
 - Got rid of redundant log messages.
 - Added %#x instead of 0x%x wherever required.
 - Got rid of __func__ calls in debug messages.
 - Added newline wherever missing.

Changes in v3:
 - Got rid of redundant log messages.
 - Unstuck colon from printf specifier in various places.

Changes in v4:
 - Changed goto statement and used if else-if

Changes in v5:
 - Changed if else if statement,
   to not overwrite the ret variable multiple times.
Changes in v6:
 - Changed a wrong log message.
Signed-off-by: default avatarMaitreyee Rao <maitreye@codeaurora.org>

Link: https://lore.kernel.org/r/1627346298-11528-1-git-send-email-maitreye@codeaurora.org


Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent b9007a03

drivers/gpu/drm/msm/dp/dp_catalog.c

+6 −2
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ void dp_catalog_ctrl_mainlink_ctrl(struct dp_catalog *dp_catalog, 
	struct dp_catalog_private *catalog = container_of(dp_catalog,

				struct dp_catalog_private, dp_catalog);



	DRM_DEBUG_DP("enable=%d\n", enable);

	if (enable) {

		/*

		 * To make sure link reg writes happens before other operation,
@@ -580,6 +581,7 @@ void dp_catalog_hpd_config_intr(struct dp_catalog *dp_catalog, 


	config = (en ? config | intr_mask : config & ~intr_mask);



	DRM_DEBUG_DP("intr_mask=%#x config=%#x\n", intr_mask, config);

	dp_write_aux(catalog, REG_DP_DP_HPD_INT_MASK,

				config & DP_DP_HPD_INT_MASK);

}
@@ -610,6 +612,7 @@ u32 dp_catalog_link_is_connected(struct dp_catalog *dp_catalog) 
	u32 status;



	status = dp_read_aux(catalog, REG_DP_DP_HPD_INT_STATUS);

	DRM_DEBUG_DP("aux status: %#x\n", status);

	status >>= DP_DP_HPD_STATE_STATUS_BITS_SHIFT;

	status &= DP_DP_HPD_STATE_STATUS_BITS_MASK;
@@ -685,6 +688,7 @@ void dp_catalog_ctrl_send_phy_pattern(struct dp_catalog *dp_catalog, 
	/* Make sure to clear the current pattern before starting a new one */

	dp_write_link(catalog, REG_DP_STATE_CTRL, 0x0);



	DRM_DEBUG_DP("pattern: %#x\n", pattern);

	switch (pattern) {

	case DP_PHY_TEST_PATTERN_D10_2:

		dp_write_link(catalog, REG_DP_STATE_CTRL,
@@ -745,7 +749,7 @@ void dp_catalog_ctrl_send_phy_pattern(struct dp_catalog *dp_catalog, 
				DP_STATE_CTRL_LINK_TRAINING_PATTERN4);

		break;

	default:

		DRM_DEBUG_DP("No valid test pattern requested:0x%x\n", pattern);

		DRM_DEBUG_DP("No valid test pattern requested: %#x\n", pattern);

		break;

	}

}
@@ -928,7 +932,7 @@ void dp_catalog_audio_config_acr(struct dp_catalog *dp_catalog) 
	select = dp_catalog->audio_data;

	acr_ctrl = select << 4 | BIT(31) | BIT(8) | BIT(14);



	DRM_DEBUG_DP("select = 0x%x, acr_ctrl = 0x%x\n", select, acr_ctrl);

	DRM_DEBUG_DP("select: %#x, acr_ctrl: %#x\n", select, acr_ctrl);



	dp_write_link(catalog, MMSS_DP_AUDIO_ACR_CTRL, acr_ctrl);

}

drivers/gpu/drm/msm/dp/dp_ctrl.c

+4 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ void dp_ctrl_push_idle(struct dp_ctrl *dp_ctrl) 
			IDLE_PATTERN_COMPLETION_TIMEOUT_JIFFIES))

		pr_warn("PUSH_IDLE pattern timedout\n");



	pr_debug("mainlink off done\n");

	DRM_DEBUG_DP("mainlink off done\n");

}



static void dp_ctrl_config_ctrl(struct dp_ctrl_private *ctrl)
@@ -1011,6 +1011,8 @@ static int dp_ctrl_update_vx_px(struct dp_ctrl_private *ctrl) 
	u32 voltage_swing_level = link->phy_params.v_level;

	u32 pre_emphasis_level = link->phy_params.p_level;



	DRM_DEBUG_DP("voltage level: %d emphasis level: %d\n", voltage_swing_level,

			pre_emphasis_level);

	ret = dp_catalog_ctrl_update_vx_px(ctrl->catalog,

		voltage_swing_level, pre_emphasis_level);
@@ -1382,6 +1384,7 @@ int dp_ctrl_host_init(struct dp_ctrl *dp_ctrl, bool flip, bool reset) 
	if (reset)

		dp_catalog_ctrl_reset(ctrl->catalog);



	DRM_DEBUG_DP("flip=%d\n", flip);

	dp_catalog_ctrl_phy_reset(ctrl->catalog);

	phy_init(phy);

	dp_catalog_ctrl_enable_irq(ctrl->catalog, true);

drivers/gpu/drm/msm/dp/dp_display.c

+13 −0
Original line number Diff line number Diff line
@@ -265,6 +265,8 @@ static bool dp_display_is_ds_bridge(struct dp_panel *panel) 


static bool dp_display_is_sink_count_zero(struct dp_display_private *dp)

{

	DRM_DEBUG_DP("present=%#x sink_count=%d\n", dp->panel->dpcd[DP_DOWNSTREAMPORT_PRESENT],

		dp->link->sink_count);

	return dp_display_is_ds_bridge(dp->panel) &&

		(dp->link->sink_count == 0);

}
@@ -296,6 +298,7 @@ static int dp_display_send_hpd_notification(struct dp_display_private *dp, 


	dp->dp_display.is_connected = hpd;



	DRM_DEBUG_DP("hpd=%d\n", hpd);

	dp_display_send_hpd_event(&dp->dp_display);



	return 0;
@@ -345,6 +348,7 @@ static void dp_display_host_init(struct dp_display_private *dp, int reset) 
{

	bool flip = false;



	DRM_DEBUG_DP("core_initialized=%d\n", dp->core_initialized);

	if (dp->core_initialized) {

		DRM_DEBUG_DP("DP core already initialized\n");

		return;
@@ -447,8 +451,10 @@ static int dp_display_handle_irq_hpd(struct dp_display_private *dp) 
{

	u32 sink_request = dp->link->sink_request;



	DRM_DEBUG_DP("%d\n", sink_request);

	if (dp->hpd_state == ST_DISCONNECTED) {

		if (sink_request & DP_LINK_STATUS_UPDATED) {

			DRM_DEBUG_DP("Disconnected sink_request: %d\n", sink_request);

			DRM_ERROR("Disconnected, no DP_LINK_STATUS_UPDATED\n");

			return -EINVAL;

		}
@@ -480,6 +486,7 @@ static int dp_display_usbpd_attention_cb(struct device *dev) 
	rc = dp_link_process_request(dp->link);

	if (!rc) {

		sink_request = dp->link->sink_request;

		DRM_DEBUG_DP("hpd_state=%d sink_request=%d\n", dp->hpd_state, sink_request);

		if (sink_request & DS_PORT_STATUS_CHANGED)

			rc = dp_display_handle_port_ststus_changed(dp);

		else
@@ -502,6 +509,7 @@ static int dp_hpd_plug_handle(struct dp_display_private *dp, u32 data) 
	mutex_lock(&dp->event_mutex);



	state =  dp->hpd_state;

	DRM_DEBUG_DP("hpd_state=%d\n", state);

	if (state == ST_DISPLAY_OFF || state == ST_SUSPENDED) {

		mutex_unlock(&dp->event_mutex);

		return 0;
@@ -637,6 +645,7 @@ static int dp_hpd_unplug_handle(struct dp_display_private *dp, u32 data) 
	/* start sentinel checking in case of missing uevent */

	dp_add_event(dp, EV_DISCONNECT_PENDING_TIMEOUT, 0, DP_TIMEOUT_5_SECOND);



	DRM_DEBUG_DP("hpd_state=%d\n", state);

	/* signal the disconnect event early to ensure proper teardown */

	dp_display_handle_plugged_change(g_dp_display, false);
@@ -695,6 +704,7 @@ static int dp_irq_hpd_handle(struct dp_display_private *dp, u32 data) 
	if (ret == -ECONNRESET) { /* cable unplugged */

		dp->core_initialized = false;

	}

	DRM_DEBUG_DP("hpd_state=%d\n", state);



	mutex_unlock(&dp->event_mutex);
@@ -836,6 +846,7 @@ static int dp_display_enable(struct dp_display_private *dp, u32 data) 


	dp_display = g_dp_display;



	DRM_DEBUG_DP("sink_count=%d\n", dp->link->sink_count);

	if (dp_display->power_on) {

		DRM_DEBUG_DP("Link already setup, return\n");

		return 0;
@@ -897,6 +908,7 @@ static int dp_display_disable(struct dp_display_private *dp, u32 data) 


	dp_display->power_on = false;



	DRM_DEBUG_DP("sink count: %d\n", dp->link->sink_count);

	return 0;

}
@@ -1144,6 +1156,7 @@ static irqreturn_t dp_display_irq_handler(int irq, void *dev_id) 


	hpd_isr_status = dp_catalog_hpd_get_intr_status(dp->catalog);



	DRM_DEBUG_DP("hpd isr status=%#x\n", hpd_isr_status);

	if (hpd_isr_status & 0x0F) {

		/* hpd related interrupts */

		if (hpd_isr_status & DP_DP_HPD_PLUG_INT_MASK ||

drivers/gpu/drm/msm/dp/dp_link.c

+18 −32
Original line number Diff line number Diff line
@@ -1027,43 +1027,29 @@ int dp_link_process_request(struct dp_link *dp_link) 


	if (link->request.test_requested == DP_TEST_LINK_EDID_READ) {

		dp_link->sink_request |= DP_TEST_LINK_EDID_READ;

		return ret;

	}



	ret = dp_link_process_ds_port_status_change(link);

	if (!ret) {

	} else if (!dp_link_process_ds_port_status_change(link)) {

		dp_link->sink_request |= DS_PORT_STATUS_CHANGED;

		return ret;

	}



	ret = dp_link_process_link_training_request(link);

	if (!ret) {

	} else if (!dp_link_process_link_training_request(link)) {

		dp_link->sink_request |= DP_TEST_LINK_TRAINING;

		return ret;

	}



	ret = dp_link_process_phy_test_pattern_request(link);

	if (!ret) {

	} else if (!dp_link_process_phy_test_pattern_request(link)) {

		dp_link->sink_request |= DP_TEST_LINK_PHY_TEST_PATTERN;

		return ret;

	}



	} else {

		ret = dp_link_process_link_status_update(link);

		if (!ret) {

			dp_link->sink_request |= DP_LINK_STATUS_UPDATED;

		return ret;

	}



		} else {

			if (dp_link_is_video_pattern_requested(link)) {

				ret = 0;

				dp_link->sink_request |= DP_TEST_LINK_VIDEO_PATTERN;

			}



			if (dp_link_is_audio_pattern_requested(link)) {

				dp_link->sink_request |= DP_TEST_LINK_AUDIO_PATTERN;

		return -EINVAL;

				ret = -EINVAL;

			}

		}

	}



	DRM_DEBUG_DP("sink request=%#x", dp_link->sink_request);

	return ret;

}

drivers/gpu/drm/msm/dp/dp_power.c

+3 −0
Original line number Diff line number Diff line
@@ -208,6 +208,9 @@ static int dp_power_clk_set_rate(struct dp_power_private *power, 


int dp_power_clk_status(struct dp_power *dp_power, enum dp_pm_type pm_type)

{

	DRM_DEBUG_DP("core_clk_on=%d link_clk_on=%d stream_clk_on=%d\n",

		dp_power->core_clks_on, dp_power->link_clks_on, dp_power->stream_clks_on);



	if (pm_type == DP_CORE_PM)

		return dp_power->core_clks_on;