summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/hal_gm20b.c')
-rw-r--r--drivers/gpu/nvgpu/gm20b/hal_gm20b.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index c6c7b590..4baed828 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -16,6 +16,7 @@
16#include "gk20a/gk20a.h" 16#include "gk20a/gk20a.h"
17#include "gk20a/dbg_gpu_gk20a.h" 17#include "gk20a/dbg_gpu_gk20a.h"
18#include "gk20a/css_gr_gk20a.h" 18#include "gk20a/css_gr_gk20a.h"
19#include "gk20a/mc_gk20a.h"
19#include "gk20a/bus_gk20a.h" 20#include "gk20a/bus_gk20a.h"
20#include "gk20a/flcn_gk20a.h" 21#include "gk20a/flcn_gk20a.h"
21#include "gk20a/priv_ring_gk20a.h" 22#include "gk20a/priv_ring_gk20a.h"
@@ -31,7 +32,6 @@
31#include "mm_gm20b.h" 32#include "mm_gm20b.h"
32#include "pmu_gm20b.h" 33#include "pmu_gm20b.h"
33#include "clk_gm20b.h" 34#include "clk_gm20b.h"
34#include "mc_gm20b.h"
35#include "regops_gm20b.h" 35#include "regops_gm20b.h"
36#include "cde_gm20b.h" 36#include "cde_gm20b.h"
37#include "therm_gm20b.h" 37#include "therm_gm20b.h"
@@ -199,6 +199,22 @@ static const struct gpu_ops gm20b_ops = {
199 .pg_gr_load_gating_prod = 199 .pg_gr_load_gating_prod =
200 gr_gm20b_pg_gr_load_gating_prod, 200 gr_gm20b_pg_gr_load_gating_prod,
201 }, 201 },
202 .mc = {
203 .intr_enable = mc_gk20a_intr_enable,
204 .intr_unit_config = mc_gk20a_intr_unit_config,
205 .isr_stall = mc_gk20a_isr_stall,
206 .intr_stall = mc_gk20a_intr_stall,
207 .intr_stall_pause = mc_gk20a_intr_stall_pause,
208 .intr_stall_resume = mc_gk20a_intr_stall_resume,
209 .intr_nonstall = mc_gk20a_intr_nonstall,
210 .intr_nonstall_pause = mc_gk20a_intr_nonstall_pause,
211 .intr_nonstall_resume = mc_gk20a_intr_nonstall_resume,
212 .enable = gk20a_mc_enable,
213 .disable = gk20a_mc_disable,
214 .reset = gk20a_mc_reset,
215 .boot_0 = gk20a_mc_boot_0,
216 .is_intr1_pending = mc_gk20a_is_intr1_pending,
217 },
202 .cde = { 218 .cde = {
203 .get_program_numbers = gm20b_cde_get_program_numbers, 219 .get_program_numbers = gm20b_cde_get_program_numbers,
204 }, 220 },
@@ -217,6 +233,7 @@ int gm20b_init_hal(struct gk20a *g)
217 233
218 gops->ltc = gm20b_ops.ltc; 234 gops->ltc = gm20b_ops.ltc;
219 gops->clock_gating = gm20b_ops.clock_gating; 235 gops->clock_gating = gm20b_ops.clock_gating;
236 gops->mc = gm20b_ops.mc;
220 gops->cde = gm20b_ops.cde; 237 gops->cde = gm20b_ops.cde;
221 gops->falcon = gm20b_ops.falcon; 238 gops->falcon = gm20b_ops.falcon;
222 239
@@ -255,7 +272,6 @@ int gm20b_init_hal(struct gk20a *g)
255 } 272 }
256#endif 273#endif
257 gk20a_init_bus(gops); 274 gk20a_init_bus(gops);
258 gm20b_init_mc(gops);
259 gk20a_init_priv_ring(gops); 275 gk20a_init_priv_ring(gops);
260 gm20b_init_gr(gops); 276 gm20b_init_gr(gops);
261 gm20b_init_fb(gops); 277 gm20b_init_fb(gops);