nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 18:16:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: move userd slab init to common function

Browse Source 
gk20a_init_fifo_setup_sw_common() is both called by vsrv and native
driver, so move the userd slab init to it.

Bug 2422486
Bug 200474793

Change-Id: Ic008bb16b3e9f36799c2c20e0c2cb449c236b469
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1973532
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Richard Zhao
2018-12-14 13:57:49 -08:00
committed by mobile promotions
parent 57c392b0d2
commit 54e02c01f8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
View File

@@ -918,6 +918,12 @@ int gk20a_init_fifo_setup_sw_common(struct gk20a *g)
goto clean_up; goto clean_up;
} }
err = gk20a_fifo_init_userd_slabs(g);
if (err != 0) {
nvgpu_err(g, "userd slabs init fail, err=%d", err);
goto clean_up;
}
nvgpu_log_fn(g, "done"); nvgpu_log_fn(g, "done");
return 0; return 0;
@@ -1039,12 +1045,6 @@ int gk20a_init_fifo_setup_sw(struct gk20a *g)
return err; return err;
} }
err = gk20a_fifo_init_userd_slabs(g);
if (err != 0) {
nvgpu_err(g, "userd slabs init fail, err=%d", err);
return err;
}
size = f->num_channels * f->userd_entry_size; size = f->num_channels * f->userd_entry_size;
num_pages = DIV_ROUND_UP(size, PAGE_SIZE); num_pages = DIV_ROUND_UP(size, PAGE_SIZE);
err = nvgpu_vm_area_alloc(g->mm.bar1.vm, err = nvgpu_vm_area_alloc(g->mm.bar1.vm,