diff options
author | Lauri Peltonen <lpeltonen@nvidia.com> | 2014-02-24 09:50:11 -0500 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:08:22 -0400 |
commit | 61efaf843c22b85424036ec98015121c08f5f16c (patch) | |
tree | 0a8626db3d8492b2c662cb7f2457632f24bb8a9a /include/trace/events/gk20a.h | |
parent | dd5e0b3da009269fcd24645b47c7eb2f4ca22c5c (diff) |
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 <lpeltonen@nvidia.com>
Reviewed-on: http://git-master/r/374841
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'include/trace/events/gk20a.h')
-rw-r--r-- | include/trace/events/gk20a.h | 29 |
1 files changed, 9 insertions, 20 deletions
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, | |||
76 | 76 | ||
77 | TRACE_EVENT(gk20a_channel_submit_gpfifo, | 77 | TRACE_EVENT(gk20a_channel_submit_gpfifo, |
78 | TP_PROTO(const char *name, u32 hw_chid, u32 num_entries, | 78 | TP_PROTO(const char *name, u32 hw_chid, u32 num_entries, |
79 | u32 flags, u32 wait_id, u32 wait_value, | 79 | u32 flags, u32 wait_id, u32 wait_value), |
80 | u32 incr_id), | ||
81 | 80 | ||
82 | TP_ARGS(name, hw_chid, num_entries, flags, wait_id, wait_value, | 81 | TP_ARGS(name, hw_chid, num_entries, flags, wait_id, wait_value), |
83 | incr_id), | ||
84 | 82 | ||
85 | TP_STRUCT__entry( | 83 | TP_STRUCT__entry( |
86 | __field(const char *, name) | 84 | __field(const char *, name) |
@@ -89,7 +87,6 @@ TRACE_EVENT(gk20a_channel_submit_gpfifo, | |||
89 | __field(u32, flags) | 87 | __field(u32, flags) |
90 | __field(u32, wait_id) | 88 | __field(u32, wait_id) |
91 | __field(u32, wait_value) | 89 | __field(u32, wait_value) |
92 | __field(u32, incr_id) | ||
93 | ), | 90 | ), |
94 | 91 | ||
95 | TP_fast_assign( | 92 | TP_fast_assign( |
@@ -99,22 +96,19 @@ TRACE_EVENT(gk20a_channel_submit_gpfifo, | |||
99 | __entry->flags = flags; | 96 | __entry->flags = flags; |
100 | __entry->wait_id = wait_id; | 97 | __entry->wait_id = wait_id; |
101 | __entry->wait_value = wait_value; | 98 | __entry->wait_value = wait_value; |
102 | __entry->incr_id = incr_id; | ||
103 | ), | 99 | ), |
104 | 100 | ||
105 | TP_printk("name=%s, hw_chid=%d, num_entries=%u, flags=%u, wait_id=%d," | 101 | TP_printk("name=%s, hw_chid=%d, num_entries=%u, flags=%u, wait_id=%d," |
106 | " wait_value=%u, incr_id=%u", | 102 | " wait_value=%u", |
107 | __entry->name, __entry->hw_chid, __entry->num_entries, | 103 | __entry->name, __entry->hw_chid, __entry->num_entries, |
108 | __entry->flags, __entry->wait_id, __entry->wait_value, | 104 | __entry->flags, __entry->wait_id, __entry->wait_value) |
109 | __entry->incr_id) | ||
110 | ); | 105 | ); |
111 | 106 | ||
112 | TRACE_EVENT(gk20a_channel_submitted_gpfifo, | 107 | TRACE_EVENT(gk20a_channel_submitted_gpfifo, |
113 | TP_PROTO(const char *name, u32 hw_chid, u32 num_entries, | 108 | TP_PROTO(const char *name, u32 hw_chid, u32 num_entries, |
114 | u32 flags, u32 wait_id, u32 wait_value, | 109 | u32 flags, u32 incr_id, u32 incr_value), |
115 | u32 incr_id, u32 incr_value), | ||
116 | 110 | ||
117 | TP_ARGS(name, hw_chid, num_entries, flags, wait_id, wait_value, | 111 | TP_ARGS(name, hw_chid, num_entries, flags, |
118 | incr_id, incr_value), | 112 | incr_id, incr_value), |
119 | 113 | ||
120 | TP_STRUCT__entry( | 114 | TP_STRUCT__entry( |
@@ -122,8 +116,6 @@ TRACE_EVENT(gk20a_channel_submitted_gpfifo, | |||
122 | __field(u32, hw_chid) | 116 | __field(u32, hw_chid) |
123 | __field(u32, num_entries) | 117 | __field(u32, num_entries) |
124 | __field(u32, flags) | 118 | __field(u32, flags) |
125 | __field(u32, wait_id) | ||
126 | __field(u32, wait_value) | ||
127 | __field(u32, incr_id) | 119 | __field(u32, incr_id) |
128 | __field(u32, incr_value) | 120 | __field(u32, incr_value) |
129 | ), | 121 | ), |
@@ -133,17 +125,14 @@ TRACE_EVENT(gk20a_channel_submitted_gpfifo, | |||
133 | __entry->hw_chid = hw_chid; | 125 | __entry->hw_chid = hw_chid; |
134 | __entry->num_entries = num_entries; | 126 | __entry->num_entries = num_entries; |
135 | __entry->flags = flags; | 127 | __entry->flags = flags; |
136 | __entry->wait_id = wait_id; | ||
137 | __entry->wait_value = wait_value; | ||
138 | __entry->incr_id = incr_id; | 128 | __entry->incr_id = incr_id; |
139 | __entry->incr_value = incr_value; | 129 | __entry->incr_value = incr_value; |
140 | ), | 130 | ), |
141 | 131 | ||
142 | TP_printk("name=%s, hw_chid=%d, num_entries=%u, flags=%u, wait_id=%d," | 132 | TP_printk("name=%s, hw_chid=%d, num_entries=%u, flags=%u," |
143 | " wait_value=%u, incr_id=%u, incr_value=%u", | 133 | " incr_id=%u, incr_value=%u", |
144 | __entry->name, __entry->hw_chid, __entry->num_entries, | 134 | __entry->name, __entry->hw_chid, __entry->num_entries, |
145 | __entry->flags, __entry->wait_id, __entry->wait_value, | 135 | __entry->flags, __entry->incr_id, __entry->incr_value) |
146 | __entry->incr_id, __entry->incr_value) | ||
147 | ); | 136 | ); |
148 | 137 | ||
149 | 138 | ||