diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/acr_gm20b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index da3adb72..013ce43a 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c | |||
@@ -59,14 +59,14 @@ static void lsfm_free_nonpmu_ucode_img_res(struct gk20a *g, | |||
59 | struct flcn_ucode_img *p_img); | 59 | struct flcn_ucode_img *p_img); |
60 | static int lsf_gen_wpr_requirements(struct gk20a *g, struct ls_flcn_mgr *plsfm); | 60 | static int lsf_gen_wpr_requirements(struct gk20a *g, struct ls_flcn_mgr *plsfm); |
61 | static void lsfm_init_wpr_contents(struct gk20a *g, struct ls_flcn_mgr *plsfm, | 61 | static void lsfm_init_wpr_contents(struct gk20a *g, struct ls_flcn_mgr *plsfm, |
62 | struct mem_desc *nonwpr); | 62 | struct nvgpu_mem *nonwpr); |
63 | static void free_acr_resources(struct gk20a *g, struct ls_flcn_mgr *plsfm); | 63 | static void free_acr_resources(struct gk20a *g, struct ls_flcn_mgr *plsfm); |
64 | static int gm20b_pmu_populate_loader_cfg(struct gk20a *g, | 64 | static int gm20b_pmu_populate_loader_cfg(struct gk20a *g, |
65 | void *lsfm, u32 *p_bl_gen_desc_size); | 65 | void *lsfm, u32 *p_bl_gen_desc_size); |
66 | static int gm20b_flcn_populate_bl_dmem_desc(struct gk20a *g, | 66 | static int gm20b_flcn_populate_bl_dmem_desc(struct gk20a *g, |
67 | void *lsfm, u32 *p_bl_gen_desc_size, u32 falconid); | 67 | void *lsfm, u32 *p_bl_gen_desc_size, u32 falconid); |
68 | static int gm20b_alloc_blob_space(struct gk20a *g, | 68 | static int gm20b_alloc_blob_space(struct gk20a *g, |
69 | size_t size, struct mem_desc *mem); | 69 | size_t size, struct nvgpu_mem *mem); |
70 | static bool gm20b_is_priv_load(u32 falcon_id); | 70 | static bool gm20b_is_priv_load(u32 falcon_id); |
71 | static bool gm20b_is_lazy_bootstrap(u32 falcon_id); | 71 | static bool gm20b_is_lazy_bootstrap(u32 falcon_id); |
72 | static void gm20b_wpr_info(struct gk20a *g, struct wpr_carveout_info *inf); | 72 | static void gm20b_wpr_info(struct gk20a *g, struct wpr_carveout_info *inf); |
@@ -364,7 +364,7 @@ static bool gm20b_is_priv_load(u32 falcon_id) | |||
364 | } | 364 | } |
365 | 365 | ||
366 | static int gm20b_alloc_blob_space(struct gk20a *g, | 366 | static int gm20b_alloc_blob_space(struct gk20a *g, |
367 | size_t size, struct mem_desc *mem) | 367 | size_t size, struct nvgpu_mem *mem) |
368 | { | 368 | { |
369 | int err; | 369 | int err; |
370 | 370 | ||
@@ -707,7 +707,7 @@ static int lsfm_fill_flcn_bl_gen_desc(struct gk20a *g, | |||
707 | 707 | ||
708 | /* Initialize WPR contents */ | 708 | /* Initialize WPR contents */ |
709 | static void lsfm_init_wpr_contents(struct gk20a *g, struct ls_flcn_mgr *plsfm, | 709 | static void lsfm_init_wpr_contents(struct gk20a *g, struct ls_flcn_mgr *plsfm, |
710 | struct mem_desc *ucode) | 710 | struct nvgpu_mem *ucode) |
711 | { | 711 | { |
712 | struct lsfm_managed_ucode_img *pnode = plsfm->ucode_img_list; | 712 | struct lsfm_managed_ucode_img *pnode = plsfm->ucode_img_list; |
713 | u32 i; | 713 | u32 i; |