diff options
author | Sunny He <suhe@nvidia.com> | 2017-08-11 17:40:58 -0400 |
---|---|---|
committer | Shu Zhong <shuz@nvidia.com> | 2017-08-11 17:57:08 -0400 |
commit | a4e095aa37ec5a6c09a8cc6477da9fa49a73cd77 (patch) | |
tree | fc8cffa187e14649b474a73ff23e3bb801319e61 /drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |
parent | 96615351ad11a186f5869e56acb3c1948ab7b7cc (diff) |
Revert "gpu: nvgpu: gv11b: Reorg mm HAL init"
This reverts commit 96615351ad11a186f5869e56acb3c1948ab7b7cc, which
conflicts with gv100 changes.
Change-Id: I08797bb23dd9226f0228ce3235fce6feef8d82f3
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1537667
Reviewed-by: Shu Zhong <shuz@nvidia.com>
Tested-by: Shu Zhong <shuz@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/hal_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index afc90aa7..9f6c67c1 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "gk20a/fecs_trace_gk20a.h" | 25 | #include "gk20a/fecs_trace_gk20a.h" |
26 | #include "gk20a/css_gr_gk20a.h" | 26 | #include "gk20a/css_gr_gk20a.h" |
27 | #include "gk20a/mc_gk20a.h" | 27 | #include "gk20a/mc_gk20a.h" |
28 | #include "gk20a/mm_gk20a.h" | ||
29 | #include "gk20a/dbg_gpu_gk20a.h" | 28 | #include "gk20a/dbg_gpu_gk20a.h" |
30 | #include "gk20a/bus_gk20a.h" | 29 | #include "gk20a/bus_gk20a.h" |
31 | #include "gk20a/flcn_gk20a.h" | 30 | #include "gk20a/flcn_gk20a.h" |
@@ -36,7 +35,6 @@ | |||
36 | #include "gm20b/gr_gm20b.h" | 35 | #include "gm20b/gr_gm20b.h" |
37 | #include "gm20b/fb_gm20b.h" | 36 | #include "gm20b/fb_gm20b.h" |
38 | #include "gm20b/fifo_gm20b.h" | 37 | #include "gm20b/fifo_gm20b.h" |
39 | #include "gm20b/mm_gm20b.h" | ||
40 | 38 | ||
41 | #include "gp10b/ltc_gp10b.h" | 39 | #include "gp10b/ltc_gp10b.h" |
42 | #include "gp10b/therm_gp10b.h" | 40 | #include "gp10b/therm_gp10b.h" |
@@ -46,7 +44,6 @@ | |||
46 | #include "gp10b/fifo_gp10b.h" | 44 | #include "gp10b/fifo_gp10b.h" |
47 | #include "gp10b/fecs_trace_gp10b.h" | 45 | #include "gp10b/fecs_trace_gp10b.h" |
48 | #include "gp10b/fb_gp10b.h" | 46 | #include "gp10b/fb_gp10b.h" |
49 | #include "gp10b/mm_gp10b.h" | ||
50 | 47 | ||
51 | #include "hal_gv11b.h" | 48 | #include "hal_gv11b.h" |
52 | #include "gr_gv11b.h" | 49 | #include "gr_gv11b.h" |
@@ -63,8 +60,6 @@ | |||
63 | #include "regops_gv11b.h" | 60 | #include "regops_gv11b.h" |
64 | #include "subctx_gv11b.h" | 61 | #include "subctx_gv11b.h" |
65 | 62 | ||
66 | #include "common/linux/platform_gk20a_tegra.h" | ||
67 | |||
68 | #include <nvgpu/debug.h> | 63 | #include <nvgpu/debug.h> |
69 | #include <nvgpu/enabled.h> | 64 | #include <nvgpu/enabled.h> |
70 | 65 | ||
@@ -338,31 +333,6 @@ static const struct gpu_ops gv11b_ops = { | |||
338 | .max_entries = gk20a_gr_max_entries, | 333 | .max_entries = gk20a_gr_max_entries, |
339 | }, | 334 | }, |
340 | #endif /* CONFIG_GK20A_CTXSW_TRACE */ | 335 | #endif /* CONFIG_GK20A_CTXSW_TRACE */ |
341 | .mm = { | ||
342 | .support_sparse = gm20b_mm_support_sparse, | ||
343 | .gmmu_map = gk20a_locked_gmmu_map, | ||
344 | .gmmu_unmap = gk20a_locked_gmmu_unmap, | ||
345 | .vm_bind_channel = gk20a_vm_bind_channel, | ||
346 | .fb_flush = gk20a_mm_fb_flush, | ||
347 | .l2_invalidate = gk20a_mm_l2_invalidate, | ||
348 | .l2_flush = gv11b_mm_l2_flush, | ||
349 | .cbc_clean = gk20a_mm_cbc_clean, | ||
350 | .set_big_page_size = gm20b_mm_set_big_page_size, | ||
351 | .get_big_page_sizes = gm20b_mm_get_big_page_sizes, | ||
352 | .get_default_big_page_size = gp10b_mm_get_default_big_page_size, | ||
353 | .gpu_phys_addr = gv11b_gpu_phys_addr, | ||
354 | .get_physical_addr_bits = gp10b_mm_get_physical_addr_bits, | ||
355 | .get_mmu_levels = gp10b_mm_get_mmu_levels, | ||
356 | .init_pdb = gp10b_mm_init_pdb, | ||
357 | .init_mm_setup_hw = gv11b_init_mm_setup_hw, | ||
358 | .is_bar1_supported = gv11b_mm_is_bar1_supported, | ||
359 | .init_inst_block = gv11b_init_inst_block, | ||
360 | .mmu_fault_pending = gv11b_mm_mmu_fault_pending, | ||
361 | .init_bar2_vm = gb10b_init_bar2_vm, | ||
362 | .init_bar2_mm_hw_setup = gv11b_init_bar2_mm_hw_setup, | ||
363 | .remove_bar2_vm = gv11b_mm_remove_bar2_vm, | ||
364 | .fault_info_mem_destroy = gv11b_mm_fault_info_mem_destroy, | ||
365 | }, | ||
366 | .therm = { | 336 | .therm = { |
367 | .init_therm_setup_hw = gp10b_init_therm_setup_hw, | 337 | .init_therm_setup_hw = gp10b_init_therm_setup_hw, |
368 | .elcg_init_idle_filters = gp10b_elcg_init_idle_filters, | 338 | .elcg_init_idle_filters = gp10b_elcg_init_idle_filters, |
@@ -459,7 +429,6 @@ int gv11b_init_hal(struct gk20a *g) | |||
459 | gops->clock_gating = gv11b_ops.clock_gating; | 429 | gops->clock_gating = gv11b_ops.clock_gating; |
460 | gops->fifo = gv11b_ops.fifo; | 430 | gops->fifo = gv11b_ops.fifo; |
461 | gops->gr_ctx = gv11b_ops.gr_ctx; | 431 | gops->gr_ctx = gv11b_ops.gr_ctx; |
462 | gops->mm = gv11b_ops.mm; | ||
463 | gops->fecs_trace = gv11b_ops.fecs_trace; | 432 | gops->fecs_trace = gv11b_ops.fecs_trace; |
464 | gops->therm = gv11b_ops.therm; | 433 | gops->therm = gv11b_ops.therm; |
465 | gops->regops = gv11b_ops.regops; | 434 | gops->regops = gv11b_ops.regops; |
@@ -484,6 +453,7 @@ int gv11b_init_hal(struct gk20a *g) | |||
484 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); | 453 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); |
485 | 454 | ||
486 | gv11b_init_gr(g); | 455 | gv11b_init_gr(g); |
456 | gv11b_init_mm(gops); | ||
487 | gv11b_init_pmu_ops(g); | 457 | gv11b_init_pmu_ops(g); |
488 | 458 | ||
489 | gv11b_init_uncompressed_kind_map(); | 459 | gv11b_init_uncompressed_kind_map(); |