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: Add a bootstrap vidmem allocator

Browse Source 
Add an allocator for allocating vidmem before the CE has had a
chance to be initialized (and clear the rest of vidmem).

Jira DNVGPU-84

Change-Id: I5166607a712b3a6eb4c2906b8c7d002c68a6567b
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1197204
(cherry picked from commit b4e68e84eedd952637b2332d8dc73a9090d6d62e)
Reviewed-on: http://git-master/r/1210949
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Alex Waterman
2016-08-03 18:41:36 -07:00
committed by mobile promotions
parent c845b21012
commit aa7f4bf251
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/nvgpu/gk20a/mm_gk20a.c
View File

@@ -781,19 +781,38 @@ static int gk20a_init_vidmem(struct mm_gk20a *mm)
struct device *d = dev_from_gk20a(g);
size_t size = g->ops.mm.get_vidmem_size ?
g->ops.mm.get_vidmem_size(g) : 0;
u64 bootstrap_base, bootstrap_size, base;
int err;
if (!size)
return 0;
bootstrap_base = NVGPU_VIDMEM_BOOTSTRAP_ALLOCATOR_BASE;
bootstrap_size = SZ_16M;
base = SZ_4K;
/*
* Bootstrap allocator for use before the CE is initialized (CE
* initialization requires vidmem but we want to use the CE to zero
* out vidmem before allocating it...
*/
err = gk20a_page_allocator_init(&g->mm.vidmem.bootstrap_allocator,
"vidmem-bootstrap",
bootstrap_base, bootstrap_size,
SZ_4K, 0);
err = gk20a_page_allocator_init(&g->mm.vidmem.allocator, "vidmem",
SZ_4K, size - SZ_4K, SZ_4K, 0);
base, size - base, SZ_4K, 0);
if (err) {
gk20a_err(d, "Failed to register vidmem for size %zu: %d",
size, err);
return err;
}
/* Reserve bootstrap region in vidmem allocator */
gk20a_alloc_fixed(&g->mm.vidmem.allocator,
bootstrap_base, bootstrap_size);
mm->vidmem.size = size;
gk20a_dbg_info("registered vidmem: %zu MB", size / SZ_1M);
@@ -2741,6 +2760,9 @@ int gk20a_gmmu_alloc_attr_vid_at(struct gk20a *g, enum dma_attr attr,
#if defined(CONFIG_GK20A_VIDMEM)
u64 addr;
int err;
struct gk20a_allocator *vidmem_alloc = g->mm.vidmem.cleared ?
&g->mm.vidmem.allocator :
&g->mm.vidmem.bootstrap_allocator;
gk20a_dbg_fn("");
@@ -2752,13 +2774,13 @@ int gk20a_gmmu_alloc_attr_vid_at(struct gk20a *g, enum dma_attr attr,
WARN_ON(attr != 0 && attr != DMA_ATTR_NO_KERNEL_MAPPING);
if (at) {
addr = gk20a_alloc_fixed(&g->mm.vidmem.allocator, at, size);
addr = gk20a_alloc_fixed(vidmem_alloc, at, size);
if (!addr)
return -ENOMEM;
mem->fixed = true;
} else {
addr = gk20a_alloc(&g->mm.vidmem.allocator, size);
addr = gk20a_alloc(vidmem_alloc, size);
if (!addr)
return -ENOMEM;

4
drivers/gpu/nvgpu/gk20a/mm_gk20a.h
View File

@@ -51,6 +51,8 @@ enum gk20a_aperture {
APERTURE_VIDMEM
};
#define NVGPU_VIDMEM_BOOTSTRAP_ALLOCATOR_BASE 0x18000000
static inline const char *gk20a_aperture_str(enum gk20a_aperture aperture)
{
switch (aperture) {
@@ -404,7 +406,9 @@ struct mm_gk20a {
struct {
size_t size;
struct gk20a_allocator allocator;
struct gk20a_allocator bootstrap_allocator;
u32 ce_ctx_id;
bool cleared;
} vidmem;
};