summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-03-21 15:55:35 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-06 21:14:53 -0400
commitc9665079d7b12f22a847c62587724b4ee120ca6e (patch)
tree7882bd08193db4c34b3b8ad7df7013339da2fba1 /drivers/gpu/nvgpu/gm20b/acr_gm20b.c
parentb69020bff5dfa69cad926c9374cdbe9a62509ffd (diff)
gpu: nvgpu: rename mem_desc to nvgpu_mem
Renaming was done with the following command: $ find -type f | \ xargs sed -i 's/struct mem_desc/struct nvgpu_mem/g' Also rename mem_desc.[ch] to nvgpu_mem.[ch]. JIRA NVGPU-12 Change-Id: I69395758c22a56aa01e3dffbcded70a729bf559a Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/1325547 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/acr_gm20b.c')
-rw-r--r--drivers/gpu/nvgpu/gm20b/acr_gm20b.c8
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);
60static int lsf_gen_wpr_requirements(struct gk20a *g, struct ls_flcn_mgr *plsfm); 60static int lsf_gen_wpr_requirements(struct gk20a *g, struct ls_flcn_mgr *plsfm);
61static void lsfm_init_wpr_contents(struct gk20a *g, struct ls_flcn_mgr *plsfm, 61static void lsfm_init_wpr_contents(struct gk20a *g, struct ls_flcn_mgr *plsfm,
62 struct mem_desc *nonwpr); 62 struct nvgpu_mem *nonwpr);
63static void free_acr_resources(struct gk20a *g, struct ls_flcn_mgr *plsfm); 63static void free_acr_resources(struct gk20a *g, struct ls_flcn_mgr *plsfm);
64static int gm20b_pmu_populate_loader_cfg(struct gk20a *g, 64static 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);
66static int gm20b_flcn_populate_bl_dmem_desc(struct gk20a *g, 66static 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);
68static int gm20b_alloc_blob_space(struct gk20a *g, 68static int gm20b_alloc_blob_space(struct gk20a *g,
69 size_t size, struct mem_desc *mem); 69 size_t size, struct nvgpu_mem *mem);
70static bool gm20b_is_priv_load(u32 falcon_id); 70static bool gm20b_is_priv_load(u32 falcon_id);
71static bool gm20b_is_lazy_bootstrap(u32 falcon_id); 71static bool gm20b_is_lazy_bootstrap(u32 falcon_id);
72static void gm20b_wpr_info(struct gk20a *g, struct wpr_carveout_info *inf); 72static 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
366static int gm20b_alloc_blob_space(struct gk20a *g, 366static 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 */
709static void lsfm_init_wpr_contents(struct gk20a *g, struct ls_flcn_mgr *plsfm, 709static 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;