diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp106')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/flcn_gp106.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/flcn_gp106.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 5 |
3 files changed, 9 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/gp106/flcn_gp106.c b/drivers/gpu/nvgpu/gp106/flcn_gp106.c index 6ae0b7af..3cb51dcc 100644 --- a/drivers/gpu/nvgpu/gp106/flcn_gp106.c +++ b/drivers/gpu/nvgpu/gp106/flcn_gp106.c | |||
@@ -40,7 +40,7 @@ static void gp106_falcon_ops(struct nvgpu_falcon *flcn) | |||
40 | gp106_falcon_engine_dependency_ops(flcn); | 40 | gp106_falcon_engine_dependency_ops(flcn); |
41 | } | 41 | } |
42 | 42 | ||
43 | static void gp106_falcon_hal_sw_init(struct nvgpu_falcon *flcn) | 43 | void gp106_falcon_hal_sw_init(struct nvgpu_falcon *flcn) |
44 | { | 44 | { |
45 | struct gk20a *g = flcn->g; | 45 | struct gk20a *g = flcn->g; |
46 | 46 | ||
@@ -78,8 +78,3 @@ static void gp106_falcon_hal_sw_init(struct nvgpu_falcon *flcn) | |||
78 | nvgpu_info(g, "falcon 0x%x not supported on %s", | 78 | nvgpu_info(g, "falcon 0x%x not supported on %s", |
79 | flcn->flcn_id, g->name); | 79 | flcn->flcn_id, g->name); |
80 | } | 80 | } |
81 | |||
82 | void gp106_falcon_init_hal(struct gpu_ops *gops) | ||
83 | { | ||
84 | gops->falcon.falcon_hal_sw_init = gp106_falcon_hal_sw_init; | ||
85 | } | ||
diff --git a/drivers/gpu/nvgpu/gp106/flcn_gp106.h b/drivers/gpu/nvgpu/gp106/flcn_gp106.h index d5ea14ae..e57100d5 100644 --- a/drivers/gpu/nvgpu/gp106/flcn_gp106.h +++ b/drivers/gpu/nvgpu/gp106/flcn_gp106.h | |||
@@ -10,9 +10,9 @@ | |||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | 10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | #ifndef __FLCN_GK20A_H__ | 13 | #ifndef __FLCN_GP106_H__ |
14 | #define __FLCN_GK20A_H__ | 14 | #define __FLCN_GP106_H__ |
15 | 15 | ||
16 | void gp106_falcon_init_hal(struct gpu_ops *gops); | 16 | void gp106_falcon_hal_sw_init(struct nvgpu_falcon *flcn); |
17 | 17 | ||
18 | #endif /* __FLCN_GK20A_H__ */ | 18 | #endif /* __FLCN_GP106_H__ */ |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 555a2192..29b52e44 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -259,6 +259,9 @@ static const struct gpu_ops gp106_ops = { | |||
259 | .enable_shadow_rom = xve_enable_shadow_rom_gp106, | 259 | .enable_shadow_rom = xve_enable_shadow_rom_gp106, |
260 | .disable_shadow_rom = xve_disable_shadow_rom_gp106, | 260 | .disable_shadow_rom = xve_disable_shadow_rom_gp106, |
261 | }, | 261 | }, |
262 | .falcon = { | ||
263 | .falcon_hal_sw_init = gp106_falcon_hal_sw_init, | ||
264 | }, | ||
262 | .get_litter_value = gp106_get_litter_value, | 265 | .get_litter_value = gp106_get_litter_value, |
263 | .chip_init_gpu_characteristics = gp106_init_gpu_characteristics, | 266 | .chip_init_gpu_characteristics = gp106_init_gpu_characteristics, |
264 | .bios_init = gm206_bios_init, | 267 | .bios_init = gm206_bios_init, |
@@ -275,6 +278,7 @@ int gp106_init_hal(struct gk20a *g) | |||
275 | gops->clock_gating = gp106_ops.clock_gating; | 278 | gops->clock_gating = gp106_ops.clock_gating; |
276 | gops->cde = gp106_ops.cde; | 279 | gops->cde = gp106_ops.cde; |
277 | gops->xve = gp106_ops.xve; | 280 | gops->xve = gp106_ops.xve; |
281 | gops->falcon = gp106_ops.falcon; | ||
278 | 282 | ||
279 | /* Lone functions */ | 283 | /* Lone functions */ |
280 | gops->get_litter_value = gp106_ops.get_litter_value; | 284 | gops->get_litter_value = gp106_ops.get_litter_value; |
@@ -295,7 +299,6 @@ int gp106_init_hal(struct gk20a *g) | |||
295 | gp10b_init_ce(gops); | 299 | gp10b_init_ce(gops); |
296 | gp106_init_gr_ctx(gops); | 300 | gp106_init_gr_ctx(gops); |
297 | gp106_init_mm(gops); | 301 | gp106_init_mm(gops); |
298 | gp106_falcon_init_hal(gops); | ||
299 | gp106_init_pmu_ops(gops); | 302 | gp106_init_pmu_ops(gops); |
300 | gk20a_init_debug_ops(gops); | 303 | gk20a_init_debug_ops(gops); |
301 | gk20a_init_dbg_session_ops(gops); | 304 | gk20a_init_dbg_session_ops(gops); |