summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-05-09 21:34:54 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-06-06 20:09:16 -0400
commitc21f5bca9ae81804130e30ea3e6f7a18d51203dc (patch)
treefb1a2d67532df19d70468610ad2a62c3464876c1 /drivers/gpu/nvgpu/gk20a/gk20a.c
parentc2b63150cd947557b8d17637258b988459b8e0ec (diff)
gpu: nvgpu: Remove extraneous VM init/deinit APIs
Support only VM pointers and ref-counting for maintaining VMs. This dramatically reduces the complexity of the APIs, avoids the API abuse that has existed, and ensures that future VM usage is consistent with current usage. Also remove the combined VM free/instance block deletion. Any place where this was done is now replaced with an explict free of the instance block and a nvgpu_vm_put(). JIRA NVGPU-12 JIRA NVGPU-30 Change-Id: Ib73e8d574ecc9abf6dad0b40a2c5795d6396cc8c Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/1480227 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 31b0a771..e4d454fe 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -436,10 +436,10 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
436 436
437 gpu->bus_type = NVGPU_GPU_BUS_TYPE_AXI; /* always AXI for now */ 437 gpu->bus_type = NVGPU_GPU_BUS_TYPE_AXI; /* always AXI for now */
438 438
439 gpu->big_page_size = g->mm.pmu.vm.big_page_size;
440 gpu->compression_page_size = g->ops.fb.compression_page_size(g); 439 gpu->compression_page_size = g->ops.fb.compression_page_size(g);
440 gpu->big_page_size = platform->default_big_page_size;
441 gpu->pde_coverage_bit_count = 441 gpu->pde_coverage_bit_count =
442 gk20a_mm_pde_coverage_bit_count(&g->mm.pmu.vm); 442 g->ops.mm.get_mmu_levels(g, gpu->big_page_size)[0].lo_bit[0];
443 443
444 if (g->mm.disable_bigpage) { 444 if (g->mm.disable_bigpage) {
445 gpu->big_page_size = 0; 445 gpu->big_page_size = 0;