From 147330c2dac6ffaed78100a7ad46907d7e622dca Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Tue, 24 May 2016 14:32:09 +0530 Subject: 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 Reviewed-on: http://git-master/r/1152401 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gm20b/acr_gm20b.c') 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) u32 img_size_in_bytes = 0; u32 status, size; u64 start; - struct acr_gm20b *acr = &g->acr; + struct acr_desc *acr = &g->acr; const struct firmware *acr_fw = acr->acr_fw; struct flcn_bl_dmem_desc *bl_dmem_desc = &acr->bl_dmem_desc; u32 *acr_ucode_header_t210_load; @@ -1204,7 +1204,7 @@ static int bl_bootstrap(struct pmu_gk20a *pmu, struct flcn_bl_dmem_desc *pbl_desc, u32 bl_sz) { struct gk20a *g = gk20a_from_pmu(pmu); - struct acr_gm20b *acr = &g->acr; + struct acr_desc *acr = &g->acr; struct mm_gk20a *mm = &g->mm; u32 imem_dst_blk = 0; u32 virt_addr = 0; @@ -1375,7 +1375,7 @@ int pmu_exec_gen_bl(struct gk20a *g, void *desc, u8 b_wait_for_halt) struct device *d = dev_from_gk20a(g); int err = 0; u32 bl_sz; - struct acr_gm20b *acr = &g->acr; + struct acr_desc *acr = &g->acr; const struct firmware *hsbl_fw = acr->hsbl_fw; struct hsflcn_bl_desc *pmu_bl_gm10x_desc; u32 *pmu_bl_gm10x = NULL; -- cgit v1.2.2