From 54e02c01f8c09f14c93fc9809507b7c70a35dcc9 Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Fri, 14 Dec 2018 13:57:49 -0800 Subject: [PATCH] gpu: nvgpu: move userd slab init to common function 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 Reviewed-on: https://git-master.nvidia.com/r/1973532 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 678020161..23ce32118 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c @@ -918,6 +918,12 @@ int gk20a_init_fifo_setup_sw_common(struct gk20a *g) 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"); return 0; @@ -1039,12 +1045,6 @@ int gk20a_init_fifo_setup_sw(struct gk20a *g) 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; num_pages = DIV_ROUND_UP(size, PAGE_SIZE); err = nvgpu_vm_area_alloc(g->mm.bar1.vm,