summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c3
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c5
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index f70c4bb7..a73a314c 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -2081,7 +2081,6 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c,
2081 } 2081 }
2082 2082
2083 if (err) { 2083 if (err) {
2084 gk20a_err(d, "timeout waiting for gpfifo space");
2085 err = -ENOSPC; 2084 err = -ENOSPC;
2086 goto clean_up; 2085 goto clean_up;
2087 } 2086 }
@@ -2279,7 +2278,7 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c,
2279 return err; 2278 return err;
2280 2279
2281clean_up: 2280clean_up:
2282 gk20a_err(d, "fail"); 2281 gk20a_dbg_fn("fail");
2283 free_priv_cmdbuf(c, wait_cmd); 2282 free_priv_cmdbuf(c, wait_cmd);
2284 free_priv_cmdbuf(c, incr_cmd); 2283 free_priv_cmdbuf(c, incr_cmd);
2285 gk20a_fence_put(pre_fence); 2284 gk20a_fence_put(pre_fence);
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
index 011c980e..10f1213b 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
@@ -204,11 +204,8 @@ static int __gk20a_channel_syncpt_incr(struct gk20a_channel_sync *s,
204 incr_cmd_size += 2; 204 incr_cmd_size += 2;
205 205
206 err = gk20a_channel_alloc_priv_cmdbuf(c, incr_cmd_size, &incr_cmd); 206 err = gk20a_channel_alloc_priv_cmdbuf(c, incr_cmd_size, &incr_cmd);
207 if (err) { 207 if (err)
208 gk20a_err(dev_from_gk20a(c->g),
209 "not enough priv cmd buffer space");
210 return err; 208 return err;
211 }
212 209
213 off = incr_cmd->off; 210 off = incr_cmd->off;
214 211