summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2012-05-24 15:06:58 +0300
committerSimone Willett <swillett@nvidia.com>2012-05-25 14:49:06 -0700
commit73f65f7f6898bd88fe457f96d4dc702f746058bc (patch)
tree4e1f89079d451da1d084630e97b08cba05cb13fe /include
parent97b5fcb955784c5245debc020473318dd45e5683 (diff)
video: tegra: host: Replace nvmap structs with own
Replace usage of nvmap_pinarray_elem with own nvhost_reloc and nvhost_reloc_shift structs. Bug 965206 Change-Id: I90618d8a34d79156d8880d9925dadbf416353811 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/104450 Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Diffstat (limited to 'include')
-rw-r--r--include/trace/events/nvhost.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/include/trace/events/nvhost.h b/include/trace/events/nvhost.h
index 6358fedf4482..b4818f55844c 100644
--- a/include/trace/events/nvhost.h
+++ b/include/trace/events/nvhost.h
@@ -482,27 +482,30 @@ TRACE_EVENT(nvhost_syncpt_update_min,
);
TRACE_EVENT(nvhost_syncpt_wait_check,
- TP_PROTO(u32 mem_id, u32 offset, u32 syncpt_id, u32 val),
+ TP_PROTO(u32 mem_id, u32 offset, u32 syncpt_id, u32 thresh, u32 min),
- TP_ARGS(mem_id, offset, syncpt_id, val),
+ TP_ARGS(mem_id, offset, syncpt_id, thresh, min),
TP_STRUCT__entry(
__field(u32, mem_id)
__field(u32, offset)
__field(u32, syncpt_id)
- __field(u32, val)
+ __field(u32, thresh)
+ __field(u32, min)
),
TP_fast_assign(
__entry->mem_id = mem_id;
__entry->offset = offset;
__entry->syncpt_id = syncpt_id;
- __entry->val = val;
+ __entry->thresh = thresh;
+ __entry->min = min;
),
- TP_printk("mem_id=%08x, offset=%05x, id=%d, val=%d",
+ TP_printk("mem_id=%08x, offset=%05x, id=%d, thresh=%d, current=%d",
__entry->mem_id, __entry->offset,
- __entry->syncpt_id, __entry->val)
+ __entry->syncpt_id, __entry->thresh,
+ __entry->min)
);
#endif /* _TRACE_NVHOST_H */