diff options
Diffstat (limited to 'drivers/gpu/nvgpu/os/linux/cde.c')
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/cde.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/os/linux/cde.c b/drivers/gpu/nvgpu/os/linux/cde.c index 7b2cba7d..715513c9 100644 --- a/drivers/gpu/nvgpu/os/linux/cde.c +++ b/drivers/gpu/nvgpu/os/linux/cde.c | |||
@@ -1312,7 +1312,7 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx) | |||
1312 | struct channel_gk20a *ch; | 1312 | struct channel_gk20a *ch; |
1313 | struct tsg_gk20a *tsg; | 1313 | struct tsg_gk20a *tsg; |
1314 | struct gr_gk20a *gr = &g->gr; | 1314 | struct gr_gk20a *gr = &g->gr; |
1315 | struct nvgpu_gpfifo_args gpfifo_args; | 1315 | struct nvgpu_setup_bind_args setup_bind_args; |
1316 | int err = 0; | 1316 | int err = 0; |
1317 | u64 vaddr; | 1317 | u64 vaddr; |
1318 | 1318 | ||
@@ -1351,17 +1351,16 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx) | |||
1351 | err = gk20a_tsg_bind_channel(tsg, ch); | 1351 | err = gk20a_tsg_bind_channel(tsg, ch); |
1352 | if (err) { | 1352 | if (err) { |
1353 | nvgpu_err(g, "cde: unable to bind to tsg"); | 1353 | nvgpu_err(g, "cde: unable to bind to tsg"); |
1354 | goto err_alloc_gpfifo; | 1354 | goto err_setup_bind; |
1355 | } | 1355 | } |
1356 | 1356 | ||
1357 | gpfifo_args.num_entries = 1024; | 1357 | setup_bind_args.num_gpfifo_entries = 1024; |
1358 | gpfifo_args.num_inflight_jobs = 0; | 1358 | setup_bind_args.num_inflight_jobs = 0; |
1359 | gpfifo_args.flags = 0; | 1359 | setup_bind_args.flags = 0; |
1360 | /* allocate gpfifo (1024 should be more than enough) */ | 1360 | err = nvgpu_channel_setup_bind(ch, &setup_bind_args); |
1361 | err = gk20a_channel_alloc_gpfifo(ch, &gpfifo_args); | ||
1362 | if (err) { | 1361 | if (err) { |
1363 | nvgpu_warn(g, "cde: unable to allocate gpfifo"); | 1362 | nvgpu_warn(g, "cde: unable to setup channel"); |
1364 | goto err_alloc_gpfifo; | 1363 | goto err_setup_bind; |
1365 | } | 1364 | } |
1366 | 1365 | ||
1367 | /* map backing store to gpu virtual space */ | 1366 | /* map backing store to gpu virtual space */ |
@@ -1399,7 +1398,7 @@ static int gk20a_cde_load(struct gk20a_cde_ctx *cde_ctx) | |||
1399 | err_init_cde_img: | 1398 | err_init_cde_img: |
1400 | nvgpu_gmmu_unmap(ch->vm, &g->gr.compbit_store.mem, vaddr); | 1399 | nvgpu_gmmu_unmap(ch->vm, &g->gr.compbit_store.mem, vaddr); |
1401 | err_map_backingstore: | 1400 | err_map_backingstore: |
1402 | err_alloc_gpfifo: | 1401 | err_setup_bind: |
1403 | nvgpu_vm_put(ch->vm); | 1402 | nvgpu_vm_put(ch->vm); |
1404 | err_commit_va: | 1403 | err_commit_va: |
1405 | err_get_gk20a_channel: | 1404 | err_get_gk20a_channel: |