nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Remove alloc_inst_block from mm HAL

Browse Source 
The alloc_insty_block() function in the MM HAL is not a HAL. It does
not abstract any HW accesses; instead it just wraps a dma allocation.
As such remove it from the HAL and move the single gk20a implementation
to common/mm/mm.c as nvgpu_alloc_inst_block().

JIRA NVGPU-2042

Change-Id: I0a586800a11cd230ca43b85f94a35de107f5d1e1
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2109049
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Alex Waterman
2019-04-26 13:21:16 -07:00
committed by mobile promotions
parent a68f66d307
commit c71e764348
16 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/nvgpu/common/fifo/channel.c
View File

@@ -24,6 +24,7 @@
#include <trace/events/gk20a.h>
#include <nvgpu/mm.h>
#include <nvgpu/semaphore.h>
#include <nvgpu/timers.h>
#include <nvgpu/kmem.h>
@@ -2503,7 +2504,7 @@ int nvgpu_channel_alloc_inst(struct gk20a *g, struct channel_gk20a *ch)
nvgpu_log_fn(g, " ");
err = g->ops.mm.alloc_inst_block(g, &ch->inst_block);
err = nvgpu_alloc_inst_block(g, &ch->inst_block);
if (err != 0) {
return err;
}

2
drivers/gpu/nvgpu/common/gr/gr_falcon.c
View File

@@ -202,7 +202,7 @@ static int nvgpu_gr_falcon_init_ctxsw_ucode_vaspace(struct gk20a *g,
struct nvgpu_ctxsw_ucode_info *ucode_info = &falcon->ctxsw_ucode_info;
int err;
err = g->ops.mm.alloc_inst_block(g, &ucode_info->inst_blk_desc);
err = nvgpu_alloc_inst_block(g, &ucode_info->inst_blk_desc);
if (err != 0) {
return err;
}

24
drivers/gpu/nvgpu/common/mm/mm.c
View File

@@ -168,6 +168,22 @@ void nvgpu_free_inst_block(struct gk20a *g, struct nvgpu_mem *inst_block)
}
}
int nvgpu_alloc_inst_block(struct gk20a *g, struct nvgpu_mem *inst_block)
{
int err;
nvgpu_log_fn(g, " ");
err = nvgpu_dma_alloc(g, g->ops.ramin.alloc_size(), inst_block);
if (err != 0) {
nvgpu_err(g, "%s: memory allocation failed", __func__);
return err;
}
nvgpu_log_fn(g, "done");
return 0;
}
static int nvgpu_alloc_sysmem_flush(struct gk20a *g)
{
return nvgpu_dma_alloc_sys(g, SZ_4K, &g->mm.sysmem_flush);
@@ -269,7 +285,7 @@ static int nvgpu_init_system_vm(struct mm_gk20a *mm)
return -ENOMEM;
}
err = g->ops.mm.alloc_inst_block(g, inst_block);
err = nvgpu_alloc_inst_block(g, inst_block);
if (err != 0) {
goto clean_up_vm;
}
@@ -288,7 +304,7 @@ static int nvgpu_init_hwpm(struct mm_gk20a *mm)
struct gk20a *g = gk20a_from_mm(mm);
struct nvgpu_mem *inst_block = &mm->hwpm.inst_block;
err = g->ops.mm.alloc_inst_block(g, inst_block);
err = nvgpu_alloc_inst_block(g, inst_block);
if (err != 0) {
return err;
}
@@ -411,7 +427,7 @@ static int nvgpu_init_bar1_vm(struct mm_gk20a *mm)
return -ENOMEM;
}
err = g->ops.mm.alloc_inst_block(g, inst_block);
err = nvgpu_alloc_inst_block(g, inst_block);
if (err != 0) {
goto clean_up_vm;
}
@@ -444,7 +460,7 @@ static int nvgpu_init_engine_ucode_vm(struct gk20a *g,
}
/* allocate instance mem for engine ucode */
err = g->ops.mm.alloc_inst_block(g, inst_block);
err = nvgpu_alloc_inst_block(g, inst_block);
if (err != 0) {
goto clean_up_va;
}

3
drivers/gpu/nvgpu/common/perf/perfbuf.c
View File

@@ -20,6 +20,7 @@
* DEALINGS IN THE SOFTWARE.
*/
#include <nvgpu/mm.h>
#include <nvgpu/sizes.h>
#include <nvgpu/perfbuf.h>
#include <nvgpu/gk20a.h>
@@ -35,7 +36,7 @@ int nvgpu_perfbuf_enable_locked(struct gk20a *g, u64 offset, u32 size)
return err;
}
err = g->ops.mm.alloc_inst_block(g, &mm->perfbuf.inst_block);
err = nvgpu_alloc_inst_block(g, &mm->perfbuf.inst_block);
if (err != 0) {
return err;
}