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

Commit 897e986e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fbdev: msm: Fix systrace markers"

parents e54c9e45 5fd7bfc4

drivers/video/fbdev/msm/mdss_debug.h

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ struct vbif_debug_bus { 
#define MDSS_XLOG_IOMMU(...) mdss_xlog(__func__, __LINE__, MDSS_XLOG_IOMMU, \

		##__VA_ARGS__, DATA_LIMITER)



#define ATRACE_END(name) trace_mdss_mark_write(current->tgid, name, 0)

#define ATRACE_BEGIN(name) trace_mdss_mark_write(current->tgid, name, 1)

#define ATRACE_END(name) trace_tracing_mark_write(current->tgid, name, 0)

#define ATRACE_BEGIN(name) trace_tracing_mark_write(current->tgid, name, 1)

#define ATRACE_FUNC() ATRACE_BEGIN(__func__)



#define ATRACE_INT(name, value) \

drivers/video/fbdev/msm/mdss_mdp_trace.h

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ TRACE_EVENT(mdp_cmd_wait_pingpong, 
			__entry->kickoff_cnt)

);



TRACE_EVENT(mdss_mark_write,

TRACE_EVENT(tracing_mark_write,

	TP_PROTO(int pid, const char *name, bool trace_begin),

	TP_ARGS(pid, name, trace_begin),

	TP_STRUCT__entry(