1 files changed, 23 insertions, 12 deletions

diff --git a/drivers/gpu/nvgpu/common/sim.c b/drivers/gpu/nvgpu/common/sim.c
index 6094d063..81146cd9 100644
--- a/drivers/gpu/nvgpu/common/sim.c
+++ b/drivers/gpu/nvgpu/common/sim.c
@@ -33,8 +33,7 @@ int nvgpu_alloc_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem)
 {
         int err;
 
-        err = nvgpu_dma_alloc(g, PAGE_SIZE, mem);
-
+        err = nvgpu_dma_alloc_sys(g, PAGE_SIZE, mem);
         if (err)
                 return err;
         /*
@@ -251,21 +250,14 @@ static int nvgpu_sim_esc_readl(struct gk20a *g,
         return err;
 }
 
-int nvgpu_init_sim_support(struct gk20a *g)
+static void nvgpu_sim_init_late(struct gk20a *g)
 {
-        int err = -ENOMEM;
         u64 phys;
 
         if (!g->sim)
-                return 0;
-
-        /* allocate sim event/msg buffers */
-        err = nvgpu_alloc_sim_buffer(g, &g->sim->send_bfr);
-        err = err || nvgpu_alloc_sim_buffer(g, &g->sim->recv_bfr);
-        err = err || nvgpu_alloc_sim_buffer(g, &g->sim->msg_bfr);
+                return;
 
-        if (err)
-                goto fail;
+        nvgpu_info(g, "sim init late");
         /*mark send ring invalid*/
         sim_writel(g->sim, sim_send_ring_r(), sim_send_ring_status_invalid_f());
 
@@ -300,6 +292,25 @@ int nvgpu_init_sim_support(struct gk20a *g)
                    sim_recv_ring_size_4kb_f() |
                    sim_recv_ring_addr_lo_f(phys >> PAGE_SHIFT));
 
+        return;
+}
+
+int nvgpu_init_sim_support(struct gk20a *g)
+{
+        int err = -ENOMEM;
+
+        if (!g->sim)
+                return 0;
+
+        /* allocate sim event/msg buffers */
+        err = nvgpu_alloc_sim_buffer(g, &g->sim->send_bfr);
+        err = err || nvgpu_alloc_sim_buffer(g, &g->sim->recv_bfr);
+        err = err || nvgpu_alloc_sim_buffer(g, &g->sim->msg_bfr);
+
+        if (err)
+                goto fail;
+
+        g->sim->sim_init_late = nvgpu_sim_init_late;
         g->sim->remove_support = nvgpu_remove_sim_support;
         g->sim->esc_readl = nvgpu_sim_esc_readl;
         return 0;