diff options
author | Richard Zhao <rizhao@nvidia.com> | 2017-06-27 14:20:58 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-30 01:34:35 -0400 |
commit | 7d584bf868e53638f5c05b588dcd307e71cf9c82 (patch) | |
tree | ebd3eafd0f71a018f51ac34ec10f55e8669c013d /include | |
parent | d32bd6605d37f576e186d05e0853120cd9782fd3 (diff) |
gpu: nvgpu: rename hw_chid to chid
hw_chid is a relative id for vgpu. For native it's same as hw id.
Renaming it to chid to avoid confusing.
Jira VFND-3796
Change-Id: I1c7924da1757330ace715a7c52ac61ec9dc7065c
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master/r/1509530
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/trace/events/gk20a.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/include/trace/events/gk20a.h b/include/trace/events/gk20a.h index 3a8c8d23..9600b201 100644 --- a/include/trace/events/gk20a.h +++ b/include/trace/events/gk20a.h | |||
@@ -284,14 +284,14 @@ TRACE_EVENT(gk20a_push_cmdbuf, | |||
284 | ); | 284 | ); |
285 | 285 | ||
286 | TRACE_EVENT(gk20a_channel_submit_gpfifo, | 286 | TRACE_EVENT(gk20a_channel_submit_gpfifo, |
287 | TP_PROTO(const char *name, u32 hw_chid, u32 num_entries, | 287 | TP_PROTO(const char *name, u32 chid, u32 num_entries, |
288 | u32 flags, u32 wait_id, u32 wait_value), | 288 | u32 flags, u32 wait_id, u32 wait_value), |
289 | 289 | ||
290 | TP_ARGS(name, hw_chid, num_entries, flags, wait_id, wait_value), | 290 | TP_ARGS(name, chid, num_entries, flags, wait_id, wait_value), |
291 | 291 | ||
292 | TP_STRUCT__entry( | 292 | TP_STRUCT__entry( |
293 | __field(const char *, name) | 293 | __field(const char *, name) |
294 | __field(u32, hw_chid) | 294 | __field(u32, chid) |
295 | __field(u32, num_entries) | 295 | __field(u32, num_entries) |
296 | __field(u32, flags) | 296 | __field(u32, flags) |
297 | __field(u32, wait_id) | 297 | __field(u32, wait_id) |
@@ -300,29 +300,29 @@ TRACE_EVENT(gk20a_channel_submit_gpfifo, | |||
300 | 300 | ||
301 | TP_fast_assign( | 301 | TP_fast_assign( |
302 | __entry->name = name; | 302 | __entry->name = name; |
303 | __entry->hw_chid = hw_chid; | 303 | __entry->chid = chid; |
304 | __entry->num_entries = num_entries; | 304 | __entry->num_entries = num_entries; |
305 | __entry->flags = flags; | 305 | __entry->flags = flags; |
306 | __entry->wait_id = wait_id; | 306 | __entry->wait_id = wait_id; |
307 | __entry->wait_value = wait_value; | 307 | __entry->wait_value = wait_value; |
308 | ), | 308 | ), |
309 | 309 | ||
310 | TP_printk("name=%s, hw_chid=%d, num_entries=%u, flags=%u, wait_id=%d," | 310 | TP_printk("name=%s, chid=%d, num_entries=%u, flags=%u, wait_id=%d," |
311 | " wait_value=%u", | 311 | " wait_value=%u", |
312 | __entry->name, __entry->hw_chid, __entry->num_entries, | 312 | __entry->name, __entry->chid, __entry->num_entries, |
313 | __entry->flags, __entry->wait_id, __entry->wait_value) | 313 | __entry->flags, __entry->wait_id, __entry->wait_value) |
314 | ); | 314 | ); |
315 | 315 | ||
316 | TRACE_EVENT(gk20a_channel_submitted_gpfifo, | 316 | TRACE_EVENT(gk20a_channel_submitted_gpfifo, |
317 | TP_PROTO(const char *name, u32 hw_chid, u32 num_entries, | 317 | TP_PROTO(const char *name, u32 chid, u32 num_entries, |
318 | u32 flags, u32 incr_id, u32 incr_value), | 318 | u32 flags, u32 incr_id, u32 incr_value), |
319 | 319 | ||
320 | TP_ARGS(name, hw_chid, num_entries, flags, | 320 | TP_ARGS(name, chid, num_entries, flags, |
321 | incr_id, incr_value), | 321 | incr_id, incr_value), |
322 | 322 | ||
323 | TP_STRUCT__entry( | 323 | TP_STRUCT__entry( |
324 | __field(const char *, name) | 324 | __field(const char *, name) |
325 | __field(u32, hw_chid) | 325 | __field(u32, chid) |
326 | __field(u32, num_entries) | 326 | __field(u32, num_entries) |
327 | __field(u32, flags) | 327 | __field(u32, flags) |
328 | __field(u32, incr_id) | 328 | __field(u32, incr_id) |
@@ -331,36 +331,36 @@ TRACE_EVENT(gk20a_channel_submitted_gpfifo, | |||
331 | 331 | ||
332 | TP_fast_assign( | 332 | TP_fast_assign( |
333 | __entry->name = name; | 333 | __entry->name = name; |
334 | __entry->hw_chid = hw_chid; | 334 | __entry->chid = chid; |
335 | __entry->num_entries = num_entries; | 335 | __entry->num_entries = num_entries; |
336 | __entry->flags = flags; | 336 | __entry->flags = flags; |
337 | __entry->incr_id = incr_id; | 337 | __entry->incr_id = incr_id; |
338 | __entry->incr_value = incr_value; | 338 | __entry->incr_value = incr_value; |
339 | ), | 339 | ), |
340 | 340 | ||
341 | TP_printk("name=%s, hw_chid=%d, num_entries=%u, flags=%u," | 341 | TP_printk("name=%s, chid=%d, num_entries=%u, flags=%u," |
342 | " incr_id=%u, incr_value=%u", | 342 | " incr_id=%u, incr_value=%u", |
343 | __entry->name, __entry->hw_chid, __entry->num_entries, | 343 | __entry->name, __entry->chid, __entry->num_entries, |
344 | __entry->flags, __entry->incr_id, __entry->incr_value) | 344 | __entry->flags, __entry->incr_id, __entry->incr_value) |
345 | ); | 345 | ); |
346 | 346 | ||
347 | TRACE_EVENT(gk20a_channel_reset, | 347 | TRACE_EVENT(gk20a_channel_reset, |
348 | TP_PROTO(u32 hw_chid, u32 tsgid), | 348 | TP_PROTO(u32 chid, u32 tsgid), |
349 | 349 | ||
350 | TP_ARGS(hw_chid, tsgid), | 350 | TP_ARGS(chid, tsgid), |
351 | 351 | ||
352 | TP_STRUCT__entry( | 352 | TP_STRUCT__entry( |
353 | __field(u32, hw_chid) | 353 | __field(u32, chid) |
354 | __field(u32, tsgid) | 354 | __field(u32, tsgid) |
355 | ), | 355 | ), |
356 | 356 | ||
357 | TP_fast_assign( | 357 | TP_fast_assign( |
358 | __entry->hw_chid = hw_chid; | 358 | __entry->chid = chid; |
359 | __entry->tsgid = tsgid; | 359 | __entry->tsgid = tsgid; |
360 | ), | 360 | ), |
361 | 361 | ||
362 | TP_printk("hw_chid=%d, tsgid=%d", | 362 | TP_printk("chid=%d, tsgid=%d", |
363 | __entry->hw_chid, __entry->tsgid) | 363 | __entry->chid, __entry->tsgid) |
364 | ); | 364 | ); |
365 | 365 | ||
366 | 366 | ||