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

Commit 9d47d557 authored by Tatenda Chipeperekwa's avatar Tatenda Chipeperekwa
Browse files

disp: msm: dp: add more state and event based logging 



Add more state and event based logging in order to enhance
state transition and use case based debugging.

Change-Id: I00dee6fcff832c104d3f8b651635a41d9cfc6921
Signed-off-by: default avatarTatenda Chipeperekwa <tatendac@codeaurora.org>
parent 62c99029

msm/dp/dp_display.c

+91 −15
Original line number Diff line number Diff line
@@ -28,16 +28,27 @@ 
#include "dp_display.h"

#include "sde_hdcp.h"

#include "dp_debug.h"

#include "sde_dbg.h"



#define DP_MST_DEBUG(fmt, ...) DP_DEBUG(fmt, ##__VA_ARGS__)



#define dp_display_state_show(x) { \

	DP_ERR("%s: state (0x%x): %s\n", x, dp->state, \

		dp_display_state_name(dp->state)); }

		dp_display_state_name(dp->state)); \

	SDE_EVT32_EXTERNAL(dp->state); }



#define dp_display_state_log(x) { \

	DP_DEBUG("%s: state (0x%x): %s\n", x, dp->state, \

		dp_display_state_name(dp->state)); \

	SDE_EVT32_EXTERNAL(dp->state); }



#define dp_display_state_is(x) (dp->state & (x))

#define dp_display_state_add(x) (dp->state |= (x))

#define dp_display_state_remove(x) (dp->state &= ~(x))

#define dp_display_state_add(x) { \

	(dp->state |= (x)); \

	dp_display_state_log("add "#x); }

#define dp_display_state_remove(x) { \

	(dp->state &= ~(x)); \

	dp_display_state_log("remove "#x); }



enum dp_display_states {

	DP_STATE_DISCONNECTED           = 0,
@@ -678,6 +689,7 @@ static int dp_display_send_hpd_notification(struct dp_display_private *dp) 
	int ret = 0;

	bool hpd = !!dp_display_state_is(DP_STATE_CONNECTED);



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state, hpd);

	dp->aux->state |= DP_STATE_NOTIFICATION_SENT;



	if (!dp->mst.mst_active)
@@ -700,8 +712,10 @@ static int dp_display_send_hpd_notification(struct dp_display_private *dp) 
		DP_WARN("%s timeout\n", hpd ? "connect" : "disconnect");

		ret = -EINVAL;

	}

	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state, hpd, ret);

	return ret;

skip_wait:

	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state, hpd, ret);

	return 0;

}
@@ -775,8 +789,10 @@ static void dp_display_host_init(struct dp_display_private *dp) 
	bool flip = false;

	bool reset;



	if (dp_display_state_is(DP_STATE_INITIALIZED))

	if (dp_display_state_is(DP_STATE_INITIALIZED)) {

		dp_display_state_log("[already initialized]");

		return;

	}



	if (dp->hpd->orientation == ORIENTATION_CC2)

		flip = true;
@@ -797,39 +813,54 @@ static void dp_display_host_init(struct dp_display_private *dp) 


static void dp_display_host_ready(struct dp_display_private *dp)

{

	if (!dp_display_state_is(DP_STATE_INITIALIZED))

	if (!dp_display_state_is(DP_STATE_INITIALIZED)) {

		dp_display_state_show("[not initialized]");

		return;

	}



	if (dp_display_state_is(DP_STATE_READY))

	if (dp_display_state_is(DP_STATE_READY)) {

		dp_display_state_log("[already ready]");

		return;

	}



	dp->aux->init(dp->aux, dp->parser->aux_cfg);

	dp->panel->init(dp->panel);



	dp_display_state_add(DP_STATE_READY);

	/* log this as it results from user action of cable connection */

	DP_INFO("[OK]\n");

}



static void dp_display_host_unready(struct dp_display_private *dp)

{

	if (!dp_display_state_is(DP_STATE_INITIALIZED))

	if (!dp_display_state_is(DP_STATE_INITIALIZED)) {

		dp_display_state_show("[not initialized]");

		return;

	}



	if (!dp_display_state_is(DP_STATE_READY))

	if (!dp_display_state_is(DP_STATE_READY)) {

		dp_display_state_show("[not ready]");

		return;

	}



	dp_display_state_remove(DP_STATE_READY);

	dp->aux->deinit(dp->aux);

	/* log this as it results from user action of cable connection */

	DP_INFO("[OK]\n");

}



static void dp_display_host_deinit(struct dp_display_private *dp)

{

	if (dp->active_stream_cnt) {

		SDE_EVT32_EXTERNAL(dp->state, dp->active_stream_cnt);

		DP_DEBUG("active stream present\n");

		return;

	}



	if (!dp_display_state_is(DP_STATE_INITIALIZED))

	if (!dp_display_state_is(DP_STATE_INITIALIZED)) {

		dp_display_state_show("[not initialized]");

		return;

	}



	dp->ctrl->deinit(dp->ctrl);

	dp->hpd->host_deinit(dp->hpd, &dp->catalog->hpd);
@@ -847,6 +878,7 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp) 
{

	int rc = -EINVAL;



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state);

	mutex_lock(&dp->session_lock);



	if (dp_display_state_is(DP_STATE_CONNECTED)) {
@@ -900,6 +932,7 @@ static int dp_display_process_hpd_high(struct dp_display_private *dp) 
	if (!rc && !dp_display_state_is(DP_STATE_ABORTED))

		dp_display_send_hpd_notification(dp);



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state, rc);

	return rc;

}
@@ -1041,6 +1074,8 @@ static void dp_display_clean(struct dp_display_private *dp) 
	struct dp_panel *dp_panel;

	struct dp_link_hdcp_status *status = &dp->link->hdcp_status;



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state);



	if (dp_display_is_hdcp_enabled(dp) &&

			status->hdcp_state != HDCP_STATE_INACTIVE) {

		cancel_delayed_work_sync(&dp->hdcp_cb_work);
@@ -1066,12 +1101,14 @@ static void dp_display_clean(struct dp_display_private *dp) 
	dp_display_state_remove(DP_STATE_ENABLED | DP_STATE_CONNECTED);



	dp->ctrl->off(dp->ctrl);

	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);

}



static int dp_display_handle_disconnect(struct dp_display_private *dp)

{

	int rc;



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state);

	rc = dp_display_process_hpd_low(dp);

	if (rc) {

		/* cancel any pending request */
@@ -1088,6 +1125,7 @@ static int dp_display_handle_disconnect(struct dp_display_private *dp) 


	mutex_unlock(&dp->session_lock);



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);

	return rc;

}
@@ -1125,6 +1163,8 @@ static int dp_display_usbpd_disconnect_cb(struct device *dev) 
		goto end;

	}



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state,

			dp->debug->psm_enabled);

	dp_display_state_remove(DP_STATE_CONFIGURED);



	if (dp->debug->psm_enabled && dp_display_state_is(DP_STATE_READY))
@@ -1136,6 +1176,7 @@ static int dp_display_usbpd_disconnect_cb(struct device *dev) 
	    && !dp->parser->gpio_aux_switch)

		dp->aux->aux_switch(dp->aux, false, ORIENTATION_NONE);

end:

	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);

	return rc;

}
@@ -1183,7 +1224,9 @@ static void dp_display_attention_work(struct work_struct *work) 
	struct dp_display_private *dp = container_of(work,

			struct dp_display_private, attention_work);



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state);

	mutex_lock(&dp->session_lock);

	SDE_EVT32_EXTERNAL(dp->state);



	if (dp->debug->mst_hpd_sim || !dp_display_state_is(DP_STATE_READY)) {

		mutex_unlock(&dp->session_lock);
@@ -1196,8 +1239,10 @@ static void dp_display_attention_work(struct work_struct *work) 
	}



	mutex_unlock(&dp->session_lock);

	SDE_EVT32_EXTERNAL(dp->state, dp->link->sink_request);



	if (dp->link->sink_request & DS_PORT_STATUS_CHANGED) {

		SDE_EVT32_EXTERNAL(dp->state, DS_PORT_STATUS_CHANGED);

		if (dp_display_is_sink_count_zero(dp)) {

			dp_display_handle_disconnect(dp);

		} else {
@@ -1209,6 +1254,7 @@ static void dp_display_attention_work(struct work_struct *work) 
	}



	if (dp->link->sink_request & DP_TEST_LINK_VIDEO_PATTERN) {

		SDE_EVT32_EXTERNAL(dp->state, DP_TEST_LINK_VIDEO_PATTERN);

		dp_display_handle_disconnect(dp);



		dp->panel->video_test = true;
@@ -1224,16 +1270,22 @@ static void dp_display_attention_work(struct work_struct *work) 
		dp_audio_enable(dp, false);

		mutex_unlock(&dp->session_lock);



		if (dp->link->sink_request & DP_TEST_LINK_PHY_TEST_PATTERN)

		if (dp->link->sink_request & DP_TEST_LINK_PHY_TEST_PATTERN) {

			SDE_EVT32_EXTERNAL(dp->state,

					DP_TEST_LINK_PHY_TEST_PATTERN);

			dp->ctrl->process_phy_test_request(dp->ctrl);

		}



		if (dp->link->sink_request & DP_TEST_LINK_TRAINING) {

			SDE_EVT32_EXTERNAL(dp->state, DP_TEST_LINK_TRAINING);

			dp->link->send_test_response(dp->link);

			dp->ctrl->link_maintenance(dp->ctrl);

		}



		if (dp->link->sink_request & DP_LINK_STATUS_UPDATED)

		if (dp->link->sink_request & DP_LINK_STATUS_UPDATED) {

			SDE_EVT32_EXTERNAL(dp->state, DP_LINK_STATUS_UPDATED);

			dp->ctrl->link_maintenance(dp->ctrl);

		}



		mutex_lock(&dp->session_lock);

		dp_audio_enable(dp, true);
@@ -1249,6 +1301,7 @@ static void dp_display_attention_work(struct work_struct *work) 
		dp->hdcp.ops->cp_irq(dp->hdcp.data);

mst_attention:

	dp_display_mst_attention(dp);

	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);

}



static int dp_display_usbpd_attention_cb(struct device *dev)
@@ -1270,6 +1323,9 @@ static int dp_display_usbpd_attention_cb(struct device *dev) 
			dp->hpd->hpd_irq, dp->hpd->hpd_high,

			!!dp_display_state_is(DP_STATE_ENABLED),

			!!dp_display_state_is(DP_STATE_CONNECTED));

	SDE_EVT32_EXTERNAL(dp->state, dp->hpd->hpd_irq, dp->hpd->hpd_high,

			!!dp_display_state_is(DP_STATE_ENABLED),

			!!dp_display_state_is(DP_STATE_CONNECTED));



	if (!dp->hpd->hpd_high) {

		dp_display_disconnect_sync(dp);
@@ -1634,13 +1690,18 @@ static int dp_display_prepare(struct dp_display *dp_display, void *panel) 


	dp = container_of(dp_display, struct dp_display_private, dp_display);



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state);

	mutex_lock(&dp->session_lock);



	if (dp_display_state_is(DP_STATE_ABORTED | DP_STATE_ENABLED))

	if (dp_display_state_is(DP_STATE_ABORTED | DP_STATE_ENABLED)) {

		dp_display_state_show("[not initialized]");

		goto end;

	}



	if (!dp_display_is_ready(dp))

	if (!dp_display_is_ready(dp)) {

		dp_display_state_show("[not ready]");

		goto end;

	}



	/* For supporting DP_PANEL_SRC_INITIATED_POWER_DOWN case */

	dp_display_host_init(dp);
@@ -1669,6 +1730,7 @@ static int dp_display_prepare(struct dp_display *dp_display, void *panel) 
end:

	mutex_unlock(&dp->session_lock);



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);

	return 0;

}
@@ -1750,6 +1812,7 @@ static int dp_display_enable(struct dp_display *dp_display, void *panel) 


	dp = container_of(dp_display, struct dp_display_private, dp_display);



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state);

	mutex_lock(&dp->session_lock);



	if (!dp_display_state_is(DP_STATE_READY)) {
@@ -1757,8 +1820,10 @@ static int dp_display_enable(struct dp_display *dp_display, void *panel) 
		goto end;

	}



	if (dp_display_state_is(DP_STATE_ABORTED))

	if (dp_display_state_is(DP_STATE_ABORTED)) {

		dp_display_state_show("[aborted]");

		goto end;

	}



	rc = dp_display_stream_enable(dp, panel);

	if (rc)
@@ -1768,6 +1833,7 @@ static int dp_display_enable(struct dp_display *dp_display, void *panel) 
	dp_display_state_add(DP_STATE_ENABLED);

end:

	mutex_unlock(&dp->session_lock);

	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);

	return rc;

}
@@ -1791,6 +1857,7 @@ static int dp_display_post_enable(struct dp_display *dp_display, void *panel) 
	dp = container_of(dp_display, struct dp_display_private, dp_display);

	dp_panel = panel;



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state);

	mutex_lock(&dp->session_lock);



	if (!dp_display_state_is(DP_STATE_ENABLED)) {
@@ -1798,8 +1865,10 @@ static int dp_display_post_enable(struct dp_display *dp_display, void *panel) 
		goto end;

	}



	if (dp_display_state_is(DP_STATE_ABORTED))

	if (dp_display_state_is(DP_STATE_ABORTED)) {

		dp_display_state_show("[aborted]");

		goto end;

	}



	if (!dp_display_is_ready(dp) || !dp_display_state_is(DP_STATE_READY)) {

		dp_display_state_show("[not ready]");
@@ -1821,6 +1890,7 @@ static int dp_display_post_enable(struct dp_display *dp_display, void *panel) 


	complete_all(&dp->notification_comp);

	mutex_unlock(&dp->session_lock);

	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);

	return 0;

}
@@ -1847,6 +1917,7 @@ static int dp_display_pre_disable(struct dp_display *dp_display, void *panel) 


	dp = container_of(dp_display, struct dp_display_private, dp_display);



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state);

	mutex_lock(&dp->session_lock);



	status = &dp->link->hdcp_status;
@@ -1898,6 +1969,7 @@ static int dp_display_pre_disable(struct dp_display *dp_display, void *panel) 


end:

	mutex_unlock(&dp->session_lock);

	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);

	return 0;

}
@@ -1917,6 +1989,7 @@ static int dp_display_disable(struct dp_display *dp_display, void *panel) 
	dp_panel = panel;

	status = &dp->link->hdcp_status;



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state);

	mutex_lock(&dp->session_lock);



	if (!dp_display_state_is(DP_STATE_ENABLED)) {
@@ -1943,6 +2016,7 @@ static int dp_display_disable(struct dp_display *dp_display, void *panel) 
	}

end:

	mutex_unlock(&dp->session_lock);

	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);

	return 0;

}
@@ -2004,6 +2078,7 @@ static int dp_display_unprepare(struct dp_display *dp_display, void *panel) 


	dp = container_of(dp_display, struct dp_display_private, dp_display);



	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_ENTRY, dp->state);

	mutex_lock(&dp->session_lock);



	/*
@@ -2037,6 +2112,7 @@ static int dp_display_unprepare(struct dp_display *dp_display, void *panel) 
end:

	dp_panel->deinit(dp_panel, flags);

	mutex_unlock(&dp->session_lock);

	SDE_EVT32_EXTERNAL(SDE_EVTLOG_FUNC_EXIT, dp->state);



	return 0;

}

msm/sde_dbg.h

+12 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ enum sde_dbg_evtlog_flag { 
	SDE_EVTLOG_CRITICAL = BIT(0),

	SDE_EVTLOG_IRQ = BIT(1),

	SDE_EVTLOG_VERBOSE = BIT(2),

	SDE_EVTLOG_EXTERNAL = BIT(3),

	SDE_EVTLOG_ALWAYS = -1

};
@@ -48,7 +49,8 @@ enum sde_dbg_dump_context { 
	SDE_DBG_DUMP_CLK_ENABLED_CTX,

};



#define SDE_EVTLOG_DEFAULT_ENABLE (SDE_EVTLOG_CRITICAL | SDE_EVTLOG_IRQ)

#define SDE_EVTLOG_DEFAULT_ENABLE (SDE_EVTLOG_CRITICAL | SDE_EVTLOG_IRQ | \

		SDE_EVTLOG_EXTERNAL)



/*

 * evtlog will print this number of entries when it is called through
@@ -62,7 +64,7 @@ enum sde_dbg_dump_context { 
 * number must be greater than print entry to prevent out of bound evtlog

 * entry array access.

 */

#define SDE_EVTLOG_ENTRY	(SDE_EVTLOG_PRINT_ENTRY * 8)

#define SDE_EVTLOG_ENTRY	(SDE_EVTLOG_PRINT_ENTRY * 32)

#define SDE_EVTLOG_MAX_DATA 15

#define SDE_EVTLOG_BUF_MAX 512

#define SDE_EVTLOG_BUF_ALIGN 32
@@ -125,6 +127,14 @@ extern struct sde_dbg_evtlog *sde_dbg_base_evtlog; 
		__LINE__, SDE_EVTLOG_IRQ, ##__VA_ARGS__, \

		SDE_EVTLOG_DATA_LIMITER)



/**

 * SDE_EVT32_EXTERNAL - Write a list of 32bit values for external display events

 * ... - variable arguments

 */

#define SDE_EVT32_EXTERNAL(...) sde_evtlog_log(sde_dbg_base_evtlog, __func__, \

		__LINE__, SDE_EVTLOG_EXTERNAL, ##__VA_ARGS__, \

		SDE_EVTLOG_DATA_LIMITER)



/**

 * SDE_DBG_DUMP - trigger dumping of all sde_dbg facilities

 * @va_args:	list of named register dump ranges and regions to dump, as