diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index ab6b8ec1..6e80a109 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -315,7 +315,7 @@ int gk20a_wait_channel_idle(struct channel_gk20a *ch) | |||
315 | } while (!nvgpu_timeout_expired(&timeout)); | 315 | } while (!nvgpu_timeout_expired(&timeout)); |
316 | 316 | ||
317 | if (!channel_idle) { | 317 | if (!channel_idle) { |
318 | nvgpu_err(ch->g, "jobs not freed for channel %d\n", | 318 | nvgpu_err(ch->g, "jobs not freed for channel %d", |
319 | ch->hw_chid); | 319 | ch->hw_chid); |
320 | return -EBUSY; | 320 | return -EBUSY; |
321 | } | 321 | } |
@@ -336,7 +336,7 @@ int gk20a_channel_set_runlist_interleave(struct channel_gk20a *ch, | |||
336 | int ret; | 336 | int ret; |
337 | 337 | ||
338 | if (gk20a_is_channel_marked_as_tsg(ch)) { | 338 | if (gk20a_is_channel_marked_as_tsg(ch)) { |
339 | nvgpu_err(g, "invalid operation for TSG!\n"); | 339 | nvgpu_err(g, "invalid operation for TSG!"); |
340 | return -EINVAL; | 340 | return -EINVAL; |
341 | } | 341 | } |
342 | 342 | ||
@@ -916,7 +916,7 @@ static int channel_gk20a_alloc_priv_cmdbuf(struct channel_gk20a *c) | |||
916 | 916 | ||
917 | err = nvgpu_dma_alloc_map_sys(ch_vm, size, &q->mem); | 917 | err = nvgpu_dma_alloc_map_sys(ch_vm, size, &q->mem); |
918 | if (err) { | 918 | if (err) { |
919 | nvgpu_err(g, "%s: memory allocation failed\n", __func__); | 919 | nvgpu_err(g, "%s: memory allocation failed", __func__); |
920 | goto clean_up; | 920 | goto clean_up; |
921 | } | 921 | } |
922 | 922 | ||
@@ -1032,7 +1032,7 @@ static int channel_gk20a_alloc_job(struct channel_gk20a *c, | |||
1032 | *job_out = &c->joblist.pre_alloc.jobs[put]; | 1032 | *job_out = &c->joblist.pre_alloc.jobs[put]; |
1033 | else { | 1033 | else { |
1034 | nvgpu_warn(c->g, | 1034 | nvgpu_warn(c->g, |
1035 | "out of job ringbuffer space\n"); | 1035 | "out of job ringbuffer space"); |
1036 | err = -EAGAIN; | 1036 | err = -EAGAIN; |
1037 | } | 1037 | } |
1038 | } else { | 1038 | } else { |
@@ -1261,7 +1261,7 @@ int gk20a_channel_alloc_gpfifo(struct channel_gk20a *c, | |||
1261 | gpfifo_size * sizeof(struct nvgpu_gpfifo), | 1261 | gpfifo_size * sizeof(struct nvgpu_gpfifo), |
1262 | &c->gpfifo.mem); | 1262 | &c->gpfifo.mem); |
1263 | if (err) { | 1263 | if (err) { |
1264 | nvgpu_err(g, "%s: memory allocation failed\n", __func__); | 1264 | nvgpu_err(g, "%s: memory allocation failed", __func__); |
1265 | goto clean_up; | 1265 | goto clean_up; |
1266 | } | 1266 | } |
1267 | 1267 | ||
@@ -1906,7 +1906,7 @@ int gk20a_free_priv_cmdbuf(struct channel_gk20a *c, struct priv_cmd_entry *e) | |||
1906 | /* read the entry's valid flag before reading its contents */ | 1906 | /* read the entry's valid flag before reading its contents */ |
1907 | rmb(); | 1907 | rmb(); |
1908 | if ((q->get != e->off) && e->off != 0) | 1908 | if ((q->get != e->off) && e->off != 0) |
1909 | nvgpu_err(g, "requests out-of-order, ch=%d\n", | 1909 | nvgpu_err(g, "requests out-of-order, ch=%d", |
1910 | c->hw_chid); | 1910 | c->hw_chid); |
1911 | q->get = e->off + e->size; | 1911 | q->get = e->off + e->size; |
1912 | } | 1912 | } |