summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c2
-rw-r--r--include/trace/events/gk20a.h10
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index b8f769a4..ab0333d6 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -1572,9 +1572,11 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c,
1572 /* Make sure we have enough space for gpfifo entries. If not, 1572 /* Make sure we have enough space for gpfifo entries. If not,
1573 * wait for signals from completed submits */ 1573 * wait for signals from completed submits */
1574 if (gp_free_count(c) < num_entries + extra_entries) { 1574 if (gp_free_count(c) < num_entries + extra_entries) {
1575 trace_gk20a_gpfifo_submit_wait_for_space(c->g->dev->name);
1575 err = wait_event_interruptible(c->submit_wq, 1576 err = wait_event_interruptible(c->submit_wq,
1576 get_gp_free_count(c) >= num_entries + extra_entries || 1577 get_gp_free_count(c) >= num_entries + extra_entries ||
1577 c->has_timedout); 1578 c->has_timedout);
1579 trace_gk20a_gpfifo_submit_wait_for_space_done(c->g->dev->name);
1578 } 1580 }
1579 1581
1580 if (c->has_timedout) { 1582 if (c->has_timedout) {
diff --git a/include/trace/events/gk20a.h b/include/trace/events/gk20a.h
index 8fa8cb94..32e3100a 100644
--- a/include/trace/events/gk20a.h
+++ b/include/trace/events/gk20a.h
@@ -55,6 +55,16 @@ DEFINE_EVENT(gk20a, gk20a_finalize_poweron_done,
55 TP_ARGS(name) 55 TP_ARGS(name)
56); 56);
57 57
58DEFINE_EVENT(gk20a, gk20a_gpfifo_submit_wait_for_space,
59 TP_PROTO(const char *name),
60 TP_ARGS(name)
61);
62
63DEFINE_EVENT(gk20a, gk20a_gpfifo_submit_wait_for_space_done,
64 TP_PROTO(const char *name),
65 TP_ARGS(name)
66);
67
58TRACE_EVENT(gk20a_channel_update, 68TRACE_EVENT(gk20a_channel_update,
59 TP_PROTO(const void *channel), 69 TP_PROTO(const void *channel),
60 TP_ARGS(channel), 70 TP_ARGS(channel),