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

gpu: nvgpu: support allocating CBC in vidmem

Browse Source 
Update nvgpu_ltc_alloc_cbc() API to accept a flag for vidmem allocation
and allocate CBC memory into vidmem if flag is set

Bug 2180284
Jira NVGPUT-12

Change-Id: Ia6b9bb670c9fab6b5787de15526fcc753d702a73
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1805468
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Deepak Nibade
2018-08-23 16:46:15 +05:30
committed by mobile promotions
parent 8e66c5816d
commit c3e18d9474
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/common/ltc/ltc_gm20b.c
View File

@@ -93,7 +93,7 @@ int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
nvgpu_log_info(g, "max comptag lines : %d", nvgpu_log_info(g, "max comptag lines : %d",
max_comptag_lines); max_comptag_lines);
err = nvgpu_ltc_alloc_cbc(g, compbit_backing_size); err = nvgpu_ltc_alloc_cbc(g, compbit_backing_size, false);
if (err) { if (err) {
return err; return err;
} }

2
drivers/gpu/nvgpu/common/ltc/ltc_gp10b.c
View File

@@ -117,7 +117,7 @@ int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
nvgpu_log_info(g, "gobs_per_comptagline_per_slice: %d", nvgpu_log_info(g, "gobs_per_comptagline_per_slice: %d",
gobs_per_comptagline_per_slice); gobs_per_comptagline_per_slice);
err = nvgpu_ltc_alloc_cbc(g, compbit_backing_size); err = nvgpu_ltc_alloc_cbc(g, compbit_backing_size, false);
if (err) { if (err) {
return err; return err;
} }

3
drivers/gpu/nvgpu/include/nvgpu/ltc.h
View File

@@ -29,6 +29,7 @@ struct gk20a;
int nvgpu_init_ltc_support(struct gk20a *g); int nvgpu_init_ltc_support(struct gk20a *g);
void nvgpu_ltc_sync_enabled(struct gk20a *g); void nvgpu_ltc_sync_enabled(struct gk20a *g);
int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size); int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size,
bool vidmem_alloc);
#endif #endif

17
drivers/gpu/nvgpu/os/linux/ltc.c
View File

@@ -27,7 +27,8 @@
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/gr_gk20a.h" #include "gk20a/gr_gk20a.h"
int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size) int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size,
bool vidmem_alloc)
{ {
struct gr_gk20a *gr = &g->gr; struct gr_gk20a *gr = &g->gr;
unsigned long flags = 0; unsigned long flags = 0;
@@ -35,6 +36,19 @@ int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size)
if (nvgpu_mem_is_valid(&gr->compbit_store.mem)) if (nvgpu_mem_is_valid(&gr->compbit_store.mem))
return 0; return 0;
if (vidmem_alloc) {
/*
* Backing store MUST be physically contiguous and allocated in
* one chunk
* Vidmem allocation API does not support FORCE_CONTIGUOUS like
* flag to allocate contiguous memory
* But this allocation will happen in vidmem bootstrap allocator
* which always allocates contiguous memory
*/
return nvgpu_dma_alloc_vid(g,
compbit_backing_size,
&gr->compbit_store.mem);
} else {
if (!nvgpu_iommuable(g)) if (!nvgpu_iommuable(g))
flags = NVGPU_DMA_FORCE_CONTIGUOUS; flags = NVGPU_DMA_FORCE_CONTIGUOUS;
@@ -43,3 +57,4 @@ int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size)
compbit_backing_size, compbit_backing_size,
&gr->compbit_store.mem); &gr->compbit_store.mem);
} }
}

3
drivers/gpu/nvgpu/os/posix/stubs.c
View File

@@ -43,7 +43,8 @@ void nvgpu_ecc_sysfs_remove(struct gk20a *g)
{ {
} }
int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size) int nvgpu_ltc_alloc_cbc(struct gk20a *g, size_t compbit_backing_size,
bool vidmem_alloc)
{ {
return 0; return 0;
} }