From 61efaf843c22b85424036ec98015121c08f5f16c Mon Sep 17 00:00:00 2001 From: Lauri Peltonen Date: Mon, 24 Feb 2014 16:50:11 +0200 Subject: video: tegra: host: Abstract gk20a channel synchronization Move all channel synchronization code to new channel_sync_gk20a.c/h files, and access all synchronization functions through function pointers. This is groundwork for supporting semaphore based channel synchronization. Bug 1434573 Bug 1450122 Change-Id: Ic21709c1ee8cf85d018616787988e7eebb399fbe Signed-off-by: Lauri Peltonen Reviewed-on: http://git-master/r/374841 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- include/trace/events/gk20a.h | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'include/trace/events') diff --git a/include/trace/events/gk20a.h b/include/trace/events/gk20a.h index c2cf5f81..51cf3612 100644 --- a/include/trace/events/gk20a.h +++ b/include/trace/events/gk20a.h @@ -76,11 +76,9 @@ TRACE_EVENT(gk20a_push_cmdbuf, TRACE_EVENT(gk20a_channel_submit_gpfifo, TP_PROTO(const char *name, u32 hw_chid, u32 num_entries, - u32 flags, u32 wait_id, u32 wait_value, - u32 incr_id), + u32 flags, u32 wait_id, u32 wait_value), - TP_ARGS(name, hw_chid, num_entries, flags, wait_id, wait_value, - incr_id), + TP_ARGS(name, hw_chid, num_entries, flags, wait_id, wait_value), TP_STRUCT__entry( __field(const char *, name) @@ -89,7 +87,6 @@ TRACE_EVENT(gk20a_channel_submit_gpfifo, __field(u32, flags) __field(u32, wait_id) __field(u32, wait_value) - __field(u32, incr_id) ), TP_fast_assign( @@ -99,22 +96,19 @@ TRACE_EVENT(gk20a_channel_submit_gpfifo, __entry->flags = flags; __entry->wait_id = wait_id; __entry->wait_value = wait_value; - __entry->incr_id = incr_id; ), TP_printk("name=%s, hw_chid=%d, num_entries=%u, flags=%u, wait_id=%d," - " wait_value=%u, incr_id=%u", + " wait_value=%u", __entry->name, __entry->hw_chid, __entry->num_entries, - __entry->flags, __entry->wait_id, __entry->wait_value, - __entry->incr_id) + __entry->flags, __entry->wait_id, __entry->wait_value) ); TRACE_EVENT(gk20a_channel_submitted_gpfifo, TP_PROTO(const char *name, u32 hw_chid, u32 num_entries, - u32 flags, u32 wait_id, u32 wait_value, - u32 incr_id, u32 incr_value), + u32 flags, u32 incr_id, u32 incr_value), - TP_ARGS(name, hw_chid, num_entries, flags, wait_id, wait_value, + TP_ARGS(name, hw_chid, num_entries, flags, incr_id, incr_value), TP_STRUCT__entry( @@ -122,8 +116,6 @@ TRACE_EVENT(gk20a_channel_submitted_gpfifo, __field(u32, hw_chid) __field(u32, num_entries) __field(u32, flags) - __field(u32, wait_id) - __field(u32, wait_value) __field(u32, incr_id) __field(u32, incr_value) ), @@ -133,17 +125,14 @@ TRACE_EVENT(gk20a_channel_submitted_gpfifo, __entry->hw_chid = hw_chid; __entry->num_entries = num_entries; __entry->flags = flags; - __entry->wait_id = wait_id; - __entry->wait_value = wait_value; __entry->incr_id = incr_id; __entry->incr_value = incr_value; ), - TP_printk("name=%s, hw_chid=%d, num_entries=%u, flags=%u, wait_id=%d," - " wait_value=%u, incr_id=%u, incr_value=%u", + TP_printk("name=%s, hw_chid=%d, num_entries=%u, flags=%u," + " incr_id=%u, incr_value=%u", __entry->name, __entry->hw_chid, __entry->num_entries, - __entry->flags, __entry->wait_id, __entry->wait_value, - __entry->incr_id, __entry->incr_value) + __entry->flags, __entry->incr_id, __entry->incr_value) ); -- cgit v1.2.2