diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/hal_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 111a1ea2..3772649e 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -36,6 +36,9 @@ | |||
36 | #include "common/therm/therm_gm20b.h" | 36 | #include "common/therm/therm_gm20b.h" |
37 | #include "common/therm/therm_gp10b.h" | 37 | #include "common/therm/therm_gp10b.h" |
38 | #include "common/therm/therm_gv11b.h" | 38 | #include "common/therm/therm_gv11b.h" |
39 | #include "common/ltc/ltc_gm20b.h" | ||
40 | #include "common/ltc/ltc_gp10b.h" | ||
41 | #include "common/ltc/ltc_gv11b.h" | ||
39 | 42 | ||
40 | #include "gk20a/gk20a.h" | 43 | #include "gk20a/gk20a.h" |
41 | #include "gk20a/fifo_gk20a.h" | 44 | #include "gk20a/fifo_gk20a.h" |
@@ -49,14 +52,12 @@ | |||
49 | #include "gk20a/pmu_gk20a.h" | 52 | #include "gk20a/pmu_gk20a.h" |
50 | #include "gk20a/gr_gk20a.h" | 53 | #include "gk20a/gr_gk20a.h" |
51 | 54 | ||
52 | #include "gm20b/ltc_gm20b.h" | ||
53 | #include "gm20b/gr_gm20b.h" | 55 | #include "gm20b/gr_gm20b.h" |
54 | #include "gm20b/fifo_gm20b.h" | 56 | #include "gm20b/fifo_gm20b.h" |
55 | #include "gm20b/mm_gm20b.h" | 57 | #include "gm20b/mm_gm20b.h" |
56 | #include "gm20b/acr_gm20b.h" | 58 | #include "gm20b/acr_gm20b.h" |
57 | #include "gm20b/pmu_gm20b.h" | 59 | #include "gm20b/pmu_gm20b.h" |
58 | 60 | ||
59 | #include "gp10b/ltc_gp10b.h" | ||
60 | #include "gp10b/mc_gp10b.h" | 61 | #include "gp10b/mc_gp10b.h" |
61 | #include "gp10b/ce_gp10b.h" | 62 | #include "gp10b/ce_gp10b.h" |
62 | #include "gp10b/fifo_gp10b.h" | 63 | #include "gp10b/fifo_gp10b.h" |
@@ -76,7 +77,6 @@ | |||
76 | #include "css_gr_gv11b.h" | 77 | #include "css_gr_gv11b.h" |
77 | #include "gr_gv11b.h" | 78 | #include "gr_gv11b.h" |
78 | #include "mc_gv11b.h" | 79 | #include "mc_gv11b.h" |
79 | #include "ltc_gv11b.h" | ||
80 | #include "gv11b.h" | 80 | #include "gv11b.h" |
81 | #include "ce_gv11b.h" | 81 | #include "ce_gv11b.h" |
82 | #include "gr_ctx_gv11b.h" | 82 | #include "gr_ctx_gv11b.h" |
@@ -245,6 +245,11 @@ static const struct gpu_ops gv11b_ops = { | |||
245 | .flush = gm20b_flush_ltc, | 245 | .flush = gm20b_flush_ltc, |
246 | .set_enabled = gp10b_ltc_set_enabled, | 246 | .set_enabled = gp10b_ltc_set_enabled, |
247 | .intr_en_illegal_compstat = gv11b_ltc_intr_en_illegal_compstat, | 247 | .intr_en_illegal_compstat = gv11b_ltc_intr_en_illegal_compstat, |
248 | .pri_is_ltc_addr = gm20b_ltc_pri_is_ltc_addr, | ||
249 | .is_ltcs_ltss_addr = gm20b_ltc_is_ltcs_ltss_addr, | ||
250 | .is_ltcn_ltss_addr = gm20b_ltc_is_ltcn_ltss_addr, | ||
251 | .split_lts_broadcast_addr = gm20b_ltc_split_lts_broadcast_addr, | ||
252 | .split_ltc_broadcast_addr = gm20b_ltc_split_ltc_broadcast_addr, | ||
248 | }, | 253 | }, |
249 | .ce2 = { | 254 | .ce2 = { |
250 | .isr_stall = gv11b_ce_isr, | 255 | .isr_stall = gv11b_ce_isr, |
@@ -332,10 +337,6 @@ static const struct gpu_ops gv11b_ops = { | |||
332 | .init_sm_id_table = gr_gv100_init_sm_id_table, | 337 | .init_sm_id_table = gr_gv100_init_sm_id_table, |
333 | .load_smid_config = gr_gv11b_load_smid_config, | 338 | .load_smid_config = gr_gv11b_load_smid_config, |
334 | .program_sm_id_numbering = gr_gv11b_program_sm_id_numbering, | 339 | .program_sm_id_numbering = gr_gv11b_program_sm_id_numbering, |
335 | .is_ltcs_ltss_addr = gr_gm20b_is_ltcs_ltss_addr, | ||
336 | .is_ltcn_ltss_addr = gr_gm20b_is_ltcn_ltss_addr, | ||
337 | .split_lts_broadcast_addr = gr_gm20b_split_lts_broadcast_addr, | ||
338 | .split_ltc_broadcast_addr = gr_gm20b_split_ltc_broadcast_addr, | ||
339 | .setup_rop_mapping = gr_gv11b_setup_rop_mapping, | 340 | .setup_rop_mapping = gr_gv11b_setup_rop_mapping, |
340 | .program_zcull_mapping = gr_gv11b_program_zcull_mapping, | 341 | .program_zcull_mapping = gr_gv11b_program_zcull_mapping, |
341 | .commit_global_timeslice = gr_gv11b_commit_global_timeslice, | 342 | .commit_global_timeslice = gr_gv11b_commit_global_timeslice, |