diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/hal_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index cfbdc6ce..b9d8c81a 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -34,6 +34,8 @@ | |||
34 | #include "common/fb/fb_gp10b.h" | 34 | #include "common/fb/fb_gp10b.h" |
35 | #include "common/therm/therm_gm20b.h" | 35 | #include "common/therm/therm_gm20b.h" |
36 | #include "common/therm/therm_gp10b.h" | 36 | #include "common/therm/therm_gp10b.h" |
37 | #include "common/ltc/ltc_gm20b.h" | ||
38 | #include "common/ltc/ltc_gp10b.h" | ||
37 | 39 | ||
38 | #include "gk20a/gk20a.h" | 40 | #include "gk20a/gk20a.h" |
39 | #include "gk20a/fifo_gk20a.h" | 41 | #include "gk20a/fifo_gk20a.h" |
@@ -51,7 +53,6 @@ | |||
51 | #include "gp10b/gr_gp10b.h" | 53 | #include "gp10b/gr_gp10b.h" |
52 | #include "gp10b/fecs_trace_gp10b.h" | 54 | #include "gp10b/fecs_trace_gp10b.h" |
53 | #include "gp10b/mc_gp10b.h" | 55 | #include "gp10b/mc_gp10b.h" |
54 | #include "gp10b/ltc_gp10b.h" | ||
55 | #include "gp10b/mm_gp10b.h" | 56 | #include "gp10b/mm_gp10b.h" |
56 | #include "gp10b/ce_gp10b.h" | 57 | #include "gp10b/ce_gp10b.h" |
57 | #include "gp10b/pmu_gp10b.h" | 58 | #include "gp10b/pmu_gp10b.h" |
@@ -60,7 +61,6 @@ | |||
60 | #include "gp10b/regops_gp10b.h" | 61 | #include "gp10b/regops_gp10b.h" |
61 | #include "gp10b/ecc_gp10b.h" | 62 | #include "gp10b/ecc_gp10b.h" |
62 | 63 | ||
63 | #include "gm20b/ltc_gm20b.h" | ||
64 | #include "gm20b/gr_gm20b.h" | 64 | #include "gm20b/gr_gm20b.h" |
65 | #include "gm20b/fifo_gm20b.h" | 65 | #include "gm20b/fifo_gm20b.h" |
66 | #include "gm20b/acr_gm20b.h" | 66 | #include "gm20b/acr_gm20b.h" |
@@ -214,6 +214,11 @@ static const struct gpu_ops gp10b_ops = { | |||
214 | .cbc_fix_config = gm20b_ltc_cbc_fix_config, | 214 | .cbc_fix_config = gm20b_ltc_cbc_fix_config, |
215 | .flush = gm20b_flush_ltc, | 215 | .flush = gm20b_flush_ltc, |
216 | .set_enabled = gp10b_ltc_set_enabled, | 216 | .set_enabled = gp10b_ltc_set_enabled, |
217 | .pri_is_ltc_addr = gm20b_ltc_pri_is_ltc_addr, | ||
218 | .is_ltcs_ltss_addr = gm20b_ltc_is_ltcs_ltss_addr, | ||
219 | .is_ltcn_ltss_addr = gm20b_ltc_is_ltcn_ltss_addr, | ||
220 | .split_lts_broadcast_addr = gm20b_ltc_split_lts_broadcast_addr, | ||
221 | .split_ltc_broadcast_addr = gm20b_ltc_split_ltc_broadcast_addr, | ||
217 | }, | 222 | }, |
218 | .ce2 = { | 223 | .ce2 = { |
219 | .isr_stall = gp10b_ce_isr, | 224 | .isr_stall = gp10b_ce_isr, |
@@ -299,10 +304,6 @@ static const struct gpu_ops gp10b_ops = { | |||
299 | .init_sm_id_table = gr_gk20a_init_sm_id_table, | 304 | .init_sm_id_table = gr_gk20a_init_sm_id_table, |
300 | .load_smid_config = gr_gp10b_load_smid_config, | 305 | .load_smid_config = gr_gp10b_load_smid_config, |
301 | .program_sm_id_numbering = gr_gm20b_program_sm_id_numbering, | 306 | .program_sm_id_numbering = gr_gm20b_program_sm_id_numbering, |
302 | .is_ltcs_ltss_addr = gr_gm20b_is_ltcs_ltss_addr, | ||
303 | .is_ltcn_ltss_addr = gr_gm20b_is_ltcn_ltss_addr, | ||
304 | .split_lts_broadcast_addr = gr_gm20b_split_lts_broadcast_addr, | ||
305 | .split_ltc_broadcast_addr = gr_gm20b_split_ltc_broadcast_addr, | ||
306 | .setup_rop_mapping = gr_gk20a_setup_rop_mapping, | 307 | .setup_rop_mapping = gr_gk20a_setup_rop_mapping, |
307 | .program_zcull_mapping = gr_gk20a_program_zcull_mapping, | 308 | .program_zcull_mapping = gr_gk20a_program_zcull_mapping, |
308 | .commit_global_timeslice = gr_gk20a_commit_global_timeslice, | 309 | .commit_global_timeslice = gr_gk20a_commit_global_timeslice, |