diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-08-13 15:58:18 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-16 13:14:40 -0400 |
commit | 974d541623929fa2622d27d5d338a5b63596794b (patch) | |
tree | f47a540bf07efd7f6cda68f49d3675c2462d731a /drivers/gpu/nvgpu/gv100 | |
parent | 1e7f229e5d92078f772d4f81893b23504cd847a8 (diff) |
gpu: nvgpu: Move ltc HAL to common
Move implementation of ltc HAL to common/ltc.
JIRA NVGPU-956
Change-Id: Id78d74e8612d7dacfb8d322d491abecd798e42b5
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1798461
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv100')
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 7926c35c..6904313b 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -39,6 +39,9 @@ | |||
39 | #include "common/therm/therm_gp106.h" | 39 | #include "common/therm/therm_gp106.h" |
40 | #include "common/therm/therm_gp10b.h" | 40 | #include "common/therm/therm_gp10b.h" |
41 | #include "common/therm/therm_gv11b.h" | 41 | #include "common/therm/therm_gv11b.h" |
42 | #include "common/ltc/ltc_gm20b.h" | ||
43 | #include "common/ltc/ltc_gp10b.h" | ||
44 | #include "common/ltc/ltc_gv11b.h" | ||
42 | 45 | ||
43 | #include "gk20a/gk20a.h" | 46 | #include "gk20a/gk20a.h" |
44 | #include "gk20a/fifo_gk20a.h" | 47 | #include "gk20a/fifo_gk20a.h" |
@@ -52,7 +55,6 @@ | |||
52 | #include "gk20a/pmu_gk20a.h" | 55 | #include "gk20a/pmu_gk20a.h" |
53 | #include "gk20a/gr_gk20a.h" | 56 | #include "gk20a/gr_gk20a.h" |
54 | 57 | ||
55 | #include "gm20b/ltc_gm20b.h" | ||
56 | #include "gm20b/gr_gm20b.h" | 58 | #include "gm20b/gr_gm20b.h" |
57 | #include "gm20b/fifo_gm20b.h" | 59 | #include "gm20b/fifo_gm20b.h" |
58 | #include "gm20b/mm_gm20b.h" | 60 | #include "gm20b/mm_gm20b.h" |
@@ -69,7 +71,6 @@ | |||
69 | #include "gp106/flcn_gp106.h" | 71 | #include "gp106/flcn_gp106.h" |
70 | 72 | ||
71 | #include "gp10b/gr_gp10b.h" | 73 | #include "gp10b/gr_gp10b.h" |
72 | #include "gp10b/ltc_gp10b.h" | ||
73 | #include "gp10b/mc_gp10b.h" | 74 | #include "gp10b/mc_gp10b.h" |
74 | #include "gp10b/ce_gp10b.h" | 75 | #include "gp10b/ce_gp10b.h" |
75 | #include "gp10b/fifo_gp10b.h" | 76 | #include "gp10b/fifo_gp10b.h" |
@@ -83,7 +84,6 @@ | |||
83 | #include "gv11b/hal_gv11b.h" | 84 | #include "gv11b/hal_gv11b.h" |
84 | #include "gv11b/gr_gv11b.h" | 85 | #include "gv11b/gr_gv11b.h" |
85 | #include "gv11b/mc_gv11b.h" | 86 | #include "gv11b/mc_gv11b.h" |
86 | #include "gv11b/ltc_gv11b.h" | ||
87 | #include "gv11b/gv11b.h" | 87 | #include "gv11b/gv11b.h" |
88 | #include "gv11b/ce_gv11b.h" | 88 | #include "gv11b/ce_gv11b.h" |
89 | #include "gv11b/mm_gv11b.h" | 89 | #include "gv11b/mm_gv11b.h" |
@@ -288,6 +288,11 @@ static const struct gpu_ops gv100_ops = { | |||
288 | .flush = gm20b_flush_ltc, | 288 | .flush = gm20b_flush_ltc, |
289 | .set_enabled = gp10b_ltc_set_enabled, | 289 | .set_enabled = gp10b_ltc_set_enabled, |
290 | .intr_en_illegal_compstat = gv11b_ltc_intr_en_illegal_compstat, | 290 | .intr_en_illegal_compstat = gv11b_ltc_intr_en_illegal_compstat, |
291 | .pri_is_ltc_addr = gm20b_ltc_pri_is_ltc_addr, | ||
292 | .is_ltcs_ltss_addr = gm20b_ltc_is_ltcs_ltss_addr, | ||
293 | .is_ltcn_ltss_addr = gm20b_ltc_is_ltcn_ltss_addr, | ||
294 | .split_lts_broadcast_addr = gm20b_ltc_split_lts_broadcast_addr, | ||
295 | .split_ltc_broadcast_addr = gm20b_ltc_split_ltc_broadcast_addr, | ||
291 | }, | 296 | }, |
292 | .ce2 = { | 297 | .ce2 = { |
293 | .isr_stall = gv11b_ce_isr, | 298 | .isr_stall = gv11b_ce_isr, |
@@ -377,10 +382,6 @@ static const struct gpu_ops gv100_ops = { | |||
377 | .init_sm_id_table = gr_gv100_init_sm_id_table, | 382 | .init_sm_id_table = gr_gv100_init_sm_id_table, |
378 | .load_smid_config = gr_gv11b_load_smid_config, | 383 | .load_smid_config = gr_gv11b_load_smid_config, |
379 | .program_sm_id_numbering = gr_gv11b_program_sm_id_numbering, | 384 | .program_sm_id_numbering = gr_gv11b_program_sm_id_numbering, |
380 | .is_ltcs_ltss_addr = gr_gm20b_is_ltcs_ltss_addr, | ||
381 | .is_ltcn_ltss_addr = gr_gm20b_is_ltcn_ltss_addr, | ||
382 | .split_lts_broadcast_addr = gr_gm20b_split_lts_broadcast_addr, | ||
383 | .split_ltc_broadcast_addr = gr_gm20b_split_ltc_broadcast_addr, | ||
384 | .setup_rop_mapping = gr_gv11b_setup_rop_mapping, | 385 | .setup_rop_mapping = gr_gv11b_setup_rop_mapping, |
385 | .program_zcull_mapping = gr_gv11b_program_zcull_mapping, | 386 | .program_zcull_mapping = gr_gv11b_program_zcull_mapping, |
386 | .commit_global_timeslice = gr_gv11b_commit_global_timeslice, | 387 | .commit_global_timeslice = gr_gv11b_commit_global_timeslice, |