diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c index ce06e78b..97de7138 100644 --- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |||
@@ -90,8 +90,9 @@ void gk20a_dbg_gpu_post_events(struct channel_gk20a *ch) | |||
90 | { | 90 | { |
91 | struct dbg_session_data *session_data; | 91 | struct dbg_session_data *session_data; |
92 | struct dbg_session_gk20a *dbg_s; | 92 | struct dbg_session_gk20a *dbg_s; |
93 | struct gk20a *g = ch->g; | ||
93 | 94 | ||
94 | gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg, ""); | 95 | nvgpu_log(g, gpu_dbg_fn | gpu_dbg_gpu_dbg, " "); |
95 | 96 | ||
96 | /* guard against the session list being modified */ | 97 | /* guard against the session list being modified */ |
97 | nvgpu_mutex_acquire(&ch->dbg_s_lock); | 98 | nvgpu_mutex_acquire(&ch->dbg_s_lock); |
@@ -100,9 +101,9 @@ void gk20a_dbg_gpu_post_events(struct channel_gk20a *ch) | |||
100 | dbg_session_data, dbg_s_entry) { | 101 | dbg_session_data, dbg_s_entry) { |
101 | dbg_s = session_data->dbg_s; | 102 | dbg_s = session_data->dbg_s; |
102 | if (dbg_s->dbg_events.events_enabled) { | 103 | if (dbg_s->dbg_events.events_enabled) { |
103 | gk20a_dbg(gpu_dbg_gpu_dbg, "posting event on session id %d", | 104 | nvgpu_log(g, gpu_dbg_gpu_dbg, "posting event on session id %d", |
104 | dbg_s->id); | 105 | dbg_s->id); |
105 | gk20a_dbg(gpu_dbg_gpu_dbg, "%d events pending", | 106 | nvgpu_log(g, gpu_dbg_gpu_dbg, "%d events pending", |
106 | dbg_s->dbg_events.num_pending_events); | 107 | dbg_s->dbg_events.num_pending_events); |
107 | 108 | ||
108 | dbg_s->dbg_events.num_pending_events++; | 109 | dbg_s->dbg_events.num_pending_events++; |
@@ -119,8 +120,9 @@ bool gk20a_dbg_gpu_broadcast_stop_trigger(struct channel_gk20a *ch) | |||
119 | struct dbg_session_data *session_data; | 120 | struct dbg_session_data *session_data; |
120 | struct dbg_session_gk20a *dbg_s; | 121 | struct dbg_session_gk20a *dbg_s; |
121 | bool broadcast = false; | 122 | bool broadcast = false; |
123 | struct gk20a *g = ch->g; | ||
122 | 124 | ||
123 | gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg | gpu_dbg_intr, ""); | 125 | nvgpu_log(g, gpu_dbg_fn | gpu_dbg_gpu_dbg | gpu_dbg_intr, " "); |
124 | 126 | ||
125 | /* guard against the session list being modified */ | 127 | /* guard against the session list being modified */ |
126 | nvgpu_mutex_acquire(&ch->dbg_s_lock); | 128 | nvgpu_mutex_acquire(&ch->dbg_s_lock); |
@@ -129,7 +131,7 @@ bool gk20a_dbg_gpu_broadcast_stop_trigger(struct channel_gk20a *ch) | |||
129 | dbg_session_data, dbg_s_entry) { | 131 | dbg_session_data, dbg_s_entry) { |
130 | dbg_s = session_data->dbg_s; | 132 | dbg_s = session_data->dbg_s; |
131 | if (dbg_s->broadcast_stop_trigger) { | 133 | if (dbg_s->broadcast_stop_trigger) { |
132 | gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn | gpu_dbg_intr, | 134 | nvgpu_log(g, gpu_dbg_gpu_dbg | gpu_dbg_fn | gpu_dbg_intr, |
133 | "stop trigger broadcast enabled"); | 135 | "stop trigger broadcast enabled"); |
134 | broadcast = true; | 136 | broadcast = true; |
135 | break; | 137 | break; |
@@ -145,8 +147,9 @@ int gk20a_dbg_gpu_clear_broadcast_stop_trigger(struct channel_gk20a *ch) | |||
145 | { | 147 | { |
146 | struct dbg_session_data *session_data; | 148 | struct dbg_session_data *session_data; |
147 | struct dbg_session_gk20a *dbg_s; | 149 | struct dbg_session_gk20a *dbg_s; |
150 | struct gk20a *g = ch->g; | ||
148 | 151 | ||
149 | gk20a_dbg(gpu_dbg_fn | gpu_dbg_gpu_dbg | gpu_dbg_intr, ""); | 152 | nvgpu_log(g, gpu_dbg_fn | gpu_dbg_gpu_dbg | gpu_dbg_intr, " "); |
150 | 153 | ||
151 | /* guard against the session list being modified */ | 154 | /* guard against the session list being modified */ |
152 | nvgpu_mutex_acquire(&ch->dbg_s_lock); | 155 | nvgpu_mutex_acquire(&ch->dbg_s_lock); |
@@ -155,7 +158,7 @@ int gk20a_dbg_gpu_clear_broadcast_stop_trigger(struct channel_gk20a *ch) | |||
155 | dbg_session_data, dbg_s_entry) { | 158 | dbg_session_data, dbg_s_entry) { |
156 | dbg_s = session_data->dbg_s; | 159 | dbg_s = session_data->dbg_s; |
157 | if (dbg_s->broadcast_stop_trigger) { | 160 | if (dbg_s->broadcast_stop_trigger) { |
158 | gk20a_dbg(gpu_dbg_gpu_dbg | gpu_dbg_fn | gpu_dbg_intr, | 161 | nvgpu_log(g, gpu_dbg_gpu_dbg | gpu_dbg_fn | gpu_dbg_intr, |
159 | "stop trigger broadcast disabled"); | 162 | "stop trigger broadcast disabled"); |
160 | dbg_s->broadcast_stop_trigger = false; | 163 | dbg_s->broadcast_stop_trigger = false; |
161 | } | 164 | } |