diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv100/hal_gv100.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 4af237b0..d6ee0139 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -45,12 +45,15 @@ | |||
45 | #include "common/fuse/fuse_gp10b.h" | 45 | #include "common/fuse/fuse_gp10b.h" |
46 | #include "common/fuse/fuse_gp106.h" | 46 | #include "common/fuse/fuse_gp106.h" |
47 | #include "common/top/top_gv100.h" | 47 | #include "common/top/top_gv100.h" |
48 | #include "common/mc/mc_gm20b.h" | ||
49 | #include "common/mc/mc_gp10b.h" | ||
50 | #include "common/mc/mc_gv11b.h" | ||
51 | #include "common/mc/mc_gv100.h" | ||
48 | 52 | ||
49 | #include "gk20a/gk20a.h" | 53 | #include "gk20a/gk20a.h" |
50 | #include "gk20a/fifo_gk20a.h" | 54 | #include "gk20a/fifo_gk20a.h" |
51 | #include "gk20a/fecs_trace_gk20a.h" | 55 | #include "gk20a/fecs_trace_gk20a.h" |
52 | #include "gk20a/css_gr_gk20a.h" | 56 | #include "gk20a/css_gr_gk20a.h" |
53 | #include "gk20a/mc_gk20a.h" | ||
54 | #include "gk20a/dbg_gpu_gk20a.h" | 57 | #include "gk20a/dbg_gpu_gk20a.h" |
55 | #include "gk20a/flcn_gk20a.h" | 58 | #include "gk20a/flcn_gk20a.h" |
56 | #include "gk20a/regops_gk20a.h" | 59 | #include "gk20a/regops_gk20a.h" |
@@ -74,7 +77,6 @@ | |||
74 | #include "gp106/flcn_gp106.h" | 77 | #include "gp106/flcn_gp106.h" |
75 | 78 | ||
76 | #include "gp10b/gr_gp10b.h" | 79 | #include "gp10b/gr_gp10b.h" |
77 | #include "gp10b/mc_gp10b.h" | ||
78 | #include "gp10b/ce_gp10b.h" | 80 | #include "gp10b/ce_gp10b.h" |
79 | #include "gp10b/fifo_gp10b.h" | 81 | #include "gp10b/fifo_gp10b.h" |
80 | #include "gp10b/fecs_trace_gp10b.h" | 82 | #include "gp10b/fecs_trace_gp10b.h" |
@@ -85,7 +87,6 @@ | |||
85 | #include "gv11b/dbg_gpu_gv11b.h" | 87 | #include "gv11b/dbg_gpu_gv11b.h" |
86 | #include "gv11b/hal_gv11b.h" | 88 | #include "gv11b/hal_gv11b.h" |
87 | #include "gv11b/gr_gv11b.h" | 89 | #include "gv11b/gr_gv11b.h" |
88 | #include "gv11b/mc_gv11b.h" | ||
89 | #include "gv11b/gv11b.h" | 90 | #include "gv11b/gv11b.h" |
90 | #include "gv11b/ce_gv11b.h" | 91 | #include "gv11b/ce_gv11b.h" |
91 | #include "gv11b/mm_gv11b.h" | 92 | #include "gv11b/mm_gv11b.h" |
@@ -102,7 +103,6 @@ | |||
102 | #include "gv100/flcn_gv100.h" | 103 | #include "gv100/flcn_gv100.h" |
103 | #include "gv100/gr_ctx_gv100.h" | 104 | #include "gv100/gr_ctx_gv100.h" |
104 | #include "gv100/gr_gv100.h" | 105 | #include "gv100/gr_gv100.h" |
105 | #include "gv100/mc_gv100.h" | ||
106 | #include "gv100/mm_gv100.h" | 106 | #include "gv100/mm_gv100.h" |
107 | #include "gv100/pmu_gv100.h" | 107 | #include "gv100/pmu_gv100.h" |
108 | #include "gv100/nvlink_gv100.h" | 108 | #include "gv100/nvlink_gv100.h" |
@@ -805,11 +805,10 @@ static const struct gpu_ops gv100_ops = { | |||
805 | .intr_nonstall = mc_gp10b_intr_nonstall, | 805 | .intr_nonstall = mc_gp10b_intr_nonstall, |
806 | .intr_nonstall_pause = mc_gp10b_intr_nonstall_pause, | 806 | .intr_nonstall_pause = mc_gp10b_intr_nonstall_pause, |
807 | .intr_nonstall_resume = mc_gp10b_intr_nonstall_resume, | 807 | .intr_nonstall_resume = mc_gp10b_intr_nonstall_resume, |
808 | .isr_nonstall = mc_gk20a_isr_nonstall, | 808 | .isr_nonstall = gm20b_mc_isr_nonstall, |
809 | .enable = gk20a_mc_enable, | 809 | .enable = gm20b_mc_enable, |
810 | .disable = gk20a_mc_disable, | 810 | .disable = gm20b_mc_disable, |
811 | .reset = gk20a_mc_reset, | 811 | .reset = gm20b_mc_reset, |
812 | .boot_0 = gk20a_mc_boot_0, | ||
813 | .log_pending_intrs = mc_gp10b_log_pending_intrs, | 812 | .log_pending_intrs = mc_gp10b_log_pending_intrs, |
814 | .is_intr1_pending = mc_gp10b_is_intr1_pending, | 813 | .is_intr1_pending = mc_gp10b_is_intr1_pending, |
815 | .is_intr_hub_pending = gv11b_mc_is_intr_hub_pending, | 814 | .is_intr_hub_pending = gv11b_mc_is_intr_hub_pending, |