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/vgpu | |
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/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 13 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 15 |
2 files changed, 15 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index aadd17d6..a4ad64a8 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -30,6 +30,8 @@ | |||
30 | #include "common/fb/fb_gp10b.h" | 30 | #include "common/fb/fb_gp10b.h" |
31 | #include "common/therm/therm_gm20b.h" | 31 | #include "common/therm/therm_gm20b.h" |
32 | #include "common/therm/therm_gp10b.h" | 32 | #include "common/therm/therm_gp10b.h" |
33 | #include "common/ltc/ltc_gm20b.h" | ||
34 | #include "common/ltc/ltc_gp10b.h" | ||
33 | 35 | ||
34 | #include "vgpu/fifo_vgpu.h" | 36 | #include "vgpu/fifo_vgpu.h" |
35 | #include "vgpu/gr_vgpu.h" | 37 | #include "vgpu/gr_vgpu.h" |
@@ -50,7 +52,6 @@ | |||
50 | #include "gk20a/dbg_gpu_gk20a.h" | 52 | #include "gk20a/dbg_gpu_gk20a.h" |
51 | 53 | ||
52 | #include "gp10b/mc_gp10b.h" | 54 | #include "gp10b/mc_gp10b.h" |
53 | #include "gp10b/ltc_gp10b.h" | ||
54 | #include "gp10b/mm_gp10b.h" | 55 | #include "gp10b/mm_gp10b.h" |
55 | #include "gp10b/ce_gp10b.h" | 56 | #include "gp10b/ce_gp10b.h" |
56 | #include "gp10b/pmu_gp10b.h" | 57 | #include "gp10b/pmu_gp10b.h" |
@@ -60,7 +61,6 @@ | |||
60 | #include "gp10b/regops_gp10b.h" | 61 | #include "gp10b/regops_gp10b.h" |
61 | #include "gp10b/fuse_gp10b.h" | 62 | #include "gp10b/fuse_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" |
@@ -91,6 +91,11 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
91 | .cbc_fix_config = gm20b_ltc_cbc_fix_config, | 91 | .cbc_fix_config = gm20b_ltc_cbc_fix_config, |
92 | .flush = gm20b_flush_ltc, | 92 | .flush = gm20b_flush_ltc, |
93 | .set_enabled = NULL, | 93 | .set_enabled = NULL, |
94 | .pri_is_ltc_addr = gm20b_ltc_pri_is_ltc_addr, | ||
95 | .is_ltcs_ltss_addr = gm20b_ltc_is_ltcs_ltss_addr, | ||
96 | .is_ltcn_ltss_addr = gm20b_ltc_is_ltcn_ltss_addr, | ||
97 | .split_lts_broadcast_addr = gm20b_ltc_split_lts_broadcast_addr, | ||
98 | .split_ltc_broadcast_addr = gm20b_ltc_split_ltc_broadcast_addr, | ||
94 | }, | 99 | }, |
95 | .ce2 = { | 100 | .ce2 = { |
96 | .isr_stall = gp10b_ce_isr, | 101 | .isr_stall = gp10b_ce_isr, |
@@ -173,10 +178,6 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
173 | .init_sm_id_table = vgpu_gr_init_sm_id_table, | 178 | .init_sm_id_table = vgpu_gr_init_sm_id_table, |
174 | .load_smid_config = gr_gp10b_load_smid_config, | 179 | .load_smid_config = gr_gp10b_load_smid_config, |
175 | .program_sm_id_numbering = gr_gm20b_program_sm_id_numbering, | 180 | .program_sm_id_numbering = gr_gm20b_program_sm_id_numbering, |
176 | .is_ltcs_ltss_addr = gr_gm20b_is_ltcs_ltss_addr, | ||
177 | .is_ltcn_ltss_addr = gr_gm20b_is_ltcn_ltss_addr, | ||
178 | .split_lts_broadcast_addr = gr_gm20b_split_lts_broadcast_addr, | ||
179 | .split_ltc_broadcast_addr = gr_gm20b_split_ltc_broadcast_addr, | ||
180 | .setup_rop_mapping = gr_gk20a_setup_rop_mapping, | 181 | .setup_rop_mapping = gr_gk20a_setup_rop_mapping, |
181 | .program_zcull_mapping = gr_gk20a_program_zcull_mapping, | 182 | .program_zcull_mapping = gr_gk20a_program_zcull_mapping, |
182 | .commit_global_timeslice = gr_gk20a_commit_global_timeslice, | 183 | .commit_global_timeslice = gr_gk20a_commit_global_timeslice, |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index e2410e4e..a02c47f2 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -32,6 +32,9 @@ | |||
32 | #include "common/therm/therm_gm20b.h" | 32 | #include "common/therm/therm_gm20b.h" |
33 | #include "common/therm/therm_gp10b.h" | 33 | #include "common/therm/therm_gp10b.h" |
34 | #include "common/therm/therm_gv11b.h" | 34 | #include "common/therm/therm_gv11b.h" |
35 | #include "common/ltc/ltc_gm20b.h" | ||
36 | #include "common/ltc/ltc_gp10b.h" | ||
37 | #include "common/ltc/ltc_gv11b.h" | ||
35 | 38 | ||
36 | #include <gk20a/gk20a.h> | 39 | #include <gk20a/gk20a.h> |
37 | #include <gv11b/hal_gv11b.h> | 40 | #include <gv11b/hal_gv11b.h> |
@@ -58,7 +61,6 @@ | |||
58 | #include <gm20b/pmu_gm20b.h> | 61 | #include <gm20b/pmu_gm20b.h> |
59 | #include <gm20b/mm_gm20b.h> | 62 | #include <gm20b/mm_gm20b.h> |
60 | #include <gm20b/acr_gm20b.h> | 63 | #include <gm20b/acr_gm20b.h> |
61 | #include <gm20b/ltc_gm20b.h> | ||
62 | 64 | ||
63 | #include <gp10b/pmu_gp10b.h> | 65 | #include <gp10b/pmu_gp10b.h> |
64 | #include <gp10b/mm_gp10b.h> | 66 | #include <gp10b/mm_gp10b.h> |
@@ -66,7 +68,6 @@ | |||
66 | #include <gp10b/ce_gp10b.h> | 68 | #include <gp10b/ce_gp10b.h> |
67 | #include "gp10b/gr_gp10b.h" | 69 | #include "gp10b/gr_gp10b.h" |
68 | #include <gp10b/fifo_gp10b.h> | 70 | #include <gp10b/fifo_gp10b.h> |
69 | #include <gp10b/ltc_gp10b.h> | ||
70 | #include <gp10b/fuse_gp10b.h> | 71 | #include <gp10b/fuse_gp10b.h> |
71 | 72 | ||
72 | #include <gp106/pmu_gp106.h> | 73 | #include <gp106/pmu_gp106.h> |
@@ -80,7 +81,6 @@ | |||
80 | #include <gv11b/fifo_gv11b.h> | 81 | #include <gv11b/fifo_gv11b.h> |
81 | #include <gv11b/regops_gv11b.h> | 82 | #include <gv11b/regops_gv11b.h> |
82 | #include <gv11b/gr_ctx_gv11b.h> | 83 | #include <gv11b/gr_ctx_gv11b.h> |
83 | #include <gv11b/ltc_gv11b.h> | ||
84 | #include <gv11b/gr_gv11b.h> | 84 | #include <gv11b/gr_gv11b.h> |
85 | 85 | ||
86 | #include <nvgpu/enabled.h> | 86 | #include <nvgpu/enabled.h> |
@@ -110,6 +110,11 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
110 | .isr = gv11b_ltc_isr, | 110 | .isr = gv11b_ltc_isr, |
111 | .flush = gm20b_flush_ltc, | 111 | .flush = gm20b_flush_ltc, |
112 | .set_enabled = NULL, | 112 | .set_enabled = NULL, |
113 | .pri_is_ltc_addr = gm20b_ltc_pri_is_ltc_addr, | ||
114 | .is_ltcs_ltss_addr = gm20b_ltc_is_ltcs_ltss_addr, | ||
115 | .is_ltcn_ltss_addr = gm20b_ltc_is_ltcn_ltss_addr, | ||
116 | .split_lts_broadcast_addr = gm20b_ltc_split_lts_broadcast_addr, | ||
117 | .split_ltc_broadcast_addr = gm20b_ltc_split_ltc_broadcast_addr, | ||
113 | }, | 118 | }, |
114 | .ce2 = { | 119 | .ce2 = { |
115 | .isr_stall = gv11b_ce_isr, | 120 | .isr_stall = gv11b_ce_isr, |
@@ -191,10 +196,6 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
191 | .init_sm_id_table = vgpu_gr_init_sm_id_table, | 196 | .init_sm_id_table = vgpu_gr_init_sm_id_table, |
192 | .load_smid_config = gr_gv11b_load_smid_config, | 197 | .load_smid_config = gr_gv11b_load_smid_config, |
193 | .program_sm_id_numbering = gr_gv11b_program_sm_id_numbering, | 198 | .program_sm_id_numbering = gr_gv11b_program_sm_id_numbering, |
194 | .is_ltcs_ltss_addr = gr_gm20b_is_ltcs_ltss_addr, | ||
195 | .is_ltcn_ltss_addr = gr_gm20b_is_ltcn_ltss_addr, | ||
196 | .split_lts_broadcast_addr = gr_gm20b_split_lts_broadcast_addr, | ||
197 | .split_ltc_broadcast_addr = gr_gm20b_split_ltc_broadcast_addr, | ||
198 | .setup_rop_mapping = gr_gv11b_setup_rop_mapping, | 199 | .setup_rop_mapping = gr_gv11b_setup_rop_mapping, |
199 | .program_zcull_mapping = gr_gv11b_program_zcull_mapping, | 200 | .program_zcull_mapping = gr_gv11b_program_zcull_mapping, |
200 | .commit_global_timeslice = gr_gv11b_commit_global_timeslice, | 201 | .commit_global_timeslice = gr_gv11b_commit_global_timeslice, |