summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
diff options
context:
space:
mode:
authorMahantesh Kumbar <mkumbar@nvidia.com>2016-05-24 05:02:09 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-05-26 19:06:30 -0400
commit147330c2dac6ffaed78100a7ad46907d7e622dca (patch)
treecf65b851286f9dc240c17f941957ab49d1022167 /drivers/gpu/nvgpu/gm20b/acr_gm20b.c
parente9d5e7dfca6ac2fa7af380ceea0a0ca4ac3827c6 (diff)
gpu: nvgpu: move & rename acr_gm20b to acr_desc
acr_gm20b renamed to acr_desc to support multiple gpu chips JIRA DNVGPU-10 Change-Id: Ib3b38d5845043f026ddc365a682b7bb454463326 Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com> Reviewed-on: http://git-master/r/1152401 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/acr_gm20b.c')
-rw-r--r--drivers/gpu/nvgpu/gm20b/acr_gm20b.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
index ea4500eb..1f78749c 100644
--- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
@@ -1058,7 +1058,7 @@ int gm20b_bootstrap_hs_flcn(struct gk20a *g)
1058 u32 img_size_in_bytes = 0; 1058 u32 img_size_in_bytes = 0;
1059 u32 status, size; 1059 u32 status, size;
1060 u64 start; 1060 u64 start;
1061 struct acr_gm20b *acr = &g->acr; 1061 struct acr_desc *acr = &g->acr;
1062 const struct firmware *acr_fw = acr->acr_fw; 1062 const struct firmware *acr_fw = acr->acr_fw;
1063 struct flcn_bl_dmem_desc *bl_dmem_desc = &acr->bl_dmem_desc; 1063 struct flcn_bl_dmem_desc *bl_dmem_desc = &acr->bl_dmem_desc;
1064 u32 *acr_ucode_header_t210_load; 1064 u32 *acr_ucode_header_t210_load;
@@ -1204,7 +1204,7 @@ static int bl_bootstrap(struct pmu_gk20a *pmu,
1204 struct flcn_bl_dmem_desc *pbl_desc, u32 bl_sz) 1204 struct flcn_bl_dmem_desc *pbl_desc, u32 bl_sz)
1205{ 1205{
1206 struct gk20a *g = gk20a_from_pmu(pmu); 1206 struct gk20a *g = gk20a_from_pmu(pmu);
1207 struct acr_gm20b *acr = &g->acr; 1207 struct acr_desc *acr = &g->acr;
1208 struct mm_gk20a *mm = &g->mm; 1208 struct mm_gk20a *mm = &g->mm;
1209 u32 imem_dst_blk = 0; 1209 u32 imem_dst_blk = 0;
1210 u32 virt_addr = 0; 1210 u32 virt_addr = 0;
@@ -1375,7 +1375,7 @@ int pmu_exec_gen_bl(struct gk20a *g, void *desc, u8 b_wait_for_halt)
1375 struct device *d = dev_from_gk20a(g); 1375 struct device *d = dev_from_gk20a(g);
1376 int err = 0; 1376 int err = 0;
1377 u32 bl_sz; 1377 u32 bl_sz;
1378 struct acr_gm20b *acr = &g->acr; 1378 struct acr_desc *acr = &g->acr;
1379 const struct firmware *hsbl_fw = acr->hsbl_fw; 1379 const struct firmware *hsbl_fw = acr->hsbl_fw;
1380 struct hsflcn_bl_desc *pmu_bl_gm10x_desc; 1380 struct hsflcn_bl_desc *pmu_bl_gm10x_desc;
1381 u32 *pmu_bl_gm10x = NULL; 1381 u32 *pmu_bl_gm10x = NULL;