nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-25 02:52:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: sim: defer sim buffers allocation

Browse Source 
Allocate sim buffers only after chip specific
memory properties are enabled.

JIRA NVGPU-5281

Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Change-Id: I7b64b3a51b8cd66dbefd22a09216b2caaeccacbf
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2324083
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Seshendra Gadagottu
2020-04-05 08:32:37 -07:00
committed by Alex Waterman
parent c37c1b5474
commit 62c06723dd
4 changed files with 51 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/gpu/nvgpu/common/sim/sim.c
View File

@@ -213,15 +213,26 @@ static void nvgpu_sim_esc_readl(struct gk20a *g,
}
}
static void nvgpu_sim_init_late(struct gk20a *g)
static int nvgpu_sim_init_late(struct gk20a *g)
{
u64 phys;
int err = -ENOMEM;
if (!g->sim) {
return;
return 0;
}
nvgpu_info(g, "sim init late");
/* 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 != 0) {
goto fail;
}
/*mark send ring invalid*/
sim_writel(g->sim, sim_send_ring_r(), sim_send_ring_status_invalid_f());
@@ -256,37 +267,21 @@ static void nvgpu_sim_init_late(struct gk20a *g)
sim_recv_ring_size_4kb_f() |
sim_recv_ring_addr_lo_f(phys >> sim_recv_ring_addr_lo_b()));
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 != 0) {
goto fail;
}
g->sim->sim_init_late = nvgpu_sim_init_late;
/*
* Found issues with removing sim support for igpu.
* Remove sim->remove_support until JIRA NVGPU-5281 is fixed.
* g->sim->remove_support = nvgpu_remove_sim_support;
*/
g->sim->remove_support = NULL;
g->sim->esc_readl = nvgpu_sim_esc_readl;
return 0;
fail:
nvgpu_free_sim_support(g);
return err;
}
int nvgpu_init_sim_support(struct gk20a *g)
{
if (!g->sim) {
return 0;
}
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;
}