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/gp106/hal_gp106.c | |
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/gp106/hal_gp106.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 02a2f0a6..1c5e1800 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -36,6 +36,8 @@ | |||
36 | #include "common/xve/xve_gp106.h" | 36 | #include "common/xve/xve_gp106.h" |
37 | #include "common/therm/therm_gm20b.h" | 37 | #include "common/therm/therm_gm20b.h" |
38 | #include "common/therm/therm_gp106.h" | 38 | #include "common/therm/therm_gp106.h" |
39 | #include "common/ltc/ltc_gm20b.h" | ||
40 | #include "common/ltc/ltc_gp10b.h" | ||
39 | 41 | ||
40 | #include "gk20a/gk20a.h" | 42 | #include "gk20a/gk20a.h" |
41 | #include "gk20a/fifo_gk20a.h" | 43 | #include "gk20a/fifo_gk20a.h" |
@@ -49,7 +51,6 @@ | |||
49 | #include "gk20a/pmu_gk20a.h" | 51 | #include "gk20a/pmu_gk20a.h" |
50 | #include "gk20a/gr_gk20a.h" | 52 | #include "gk20a/gr_gk20a.h" |
51 | 53 | ||
52 | #include "gp10b/ltc_gp10b.h" | ||
53 | #include "gp10b/gr_gp10b.h" | 54 | #include "gp10b/gr_gp10b.h" |
54 | #include "gp10b/fecs_trace_gp10b.h" | 55 | #include "gp10b/fecs_trace_gp10b.h" |
55 | #include "gp10b/mc_gp10b.h" | 56 | #include "gp10b/mc_gp10b.h" |
@@ -64,7 +65,6 @@ | |||
64 | #include "gp106/fifo_gp106.h" | 65 | #include "gp106/fifo_gp106.h" |
65 | #include "gp106/regops_gp106.h" | 66 | #include "gp106/regops_gp106.h" |
66 | 67 | ||
67 | #include "gm20b/ltc_gm20b.h" | ||
68 | #include "gm20b/gr_gm20b.h" | 68 | #include "gm20b/gr_gm20b.h" |
69 | #include "gm20b/fifo_gm20b.h" | 69 | #include "gm20b/fifo_gm20b.h" |
70 | #include "gm20b/mm_gm20b.h" | 70 | #include "gm20b/mm_gm20b.h" |
@@ -256,6 +256,11 @@ static const struct gpu_ops gp106_ops = { | |||
256 | .cbc_fix_config = NULL, | 256 | .cbc_fix_config = NULL, |
257 | .flush = gm20b_flush_ltc, | 257 | .flush = gm20b_flush_ltc, |
258 | .set_enabled = gp10b_ltc_set_enabled, | 258 | .set_enabled = gp10b_ltc_set_enabled, |
259 | .pri_is_ltc_addr = gm20b_ltc_pri_is_ltc_addr, | ||
260 | .is_ltcs_ltss_addr = gm20b_ltc_is_ltcs_ltss_addr, | ||
261 | .is_ltcn_ltss_addr = gm20b_ltc_is_ltcn_ltss_addr, | ||
262 | .split_lts_broadcast_addr = gm20b_ltc_split_lts_broadcast_addr, | ||
263 | .split_ltc_broadcast_addr = gm20b_ltc_split_ltc_broadcast_addr, | ||
259 | }, | 264 | }, |
260 | .ce2 = { | 265 | .ce2 = { |
261 | .isr_stall = gp10b_ce_isr, | 266 | .isr_stall = gp10b_ce_isr, |
@@ -340,10 +345,6 @@ static const struct gpu_ops gp106_ops = { | |||
340 | .init_sm_id_table = gr_gk20a_init_sm_id_table, | 345 | .init_sm_id_table = gr_gk20a_init_sm_id_table, |
341 | .load_smid_config = gr_gp10b_load_smid_config, | 346 | .load_smid_config = gr_gp10b_load_smid_config, |
342 | .program_sm_id_numbering = gr_gm20b_program_sm_id_numbering, | 347 | .program_sm_id_numbering = gr_gm20b_program_sm_id_numbering, |
343 | .is_ltcs_ltss_addr = gr_gm20b_is_ltcs_ltss_addr, | ||
344 | .is_ltcn_ltss_addr = gr_gm20b_is_ltcn_ltss_addr, | ||
345 | .split_lts_broadcast_addr = gr_gm20b_split_lts_broadcast_addr, | ||
346 | .split_ltc_broadcast_addr = gr_gm20b_split_ltc_broadcast_addr, | ||
347 | .setup_rop_mapping = gr_gk20a_setup_rop_mapping, | 348 | .setup_rop_mapping = gr_gk20a_setup_rop_mapping, |
348 | .program_zcull_mapping = gr_gk20a_program_zcull_mapping, | 349 | .program_zcull_mapping = gr_gk20a_program_zcull_mapping, |
349 | .commit_global_timeslice = gr_gk20a_commit_global_timeslice, | 350 | .commit_global_timeslice = gr_gk20a_commit_global_timeslice, |