diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2017-05-10 11:05:24 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-05 02:05:18 -0400 |
commit | 673dd971600b26131c0afdb221e13c080da022fd (patch) | |
tree | 7c8416ac2ef61891812773d55c8c8dc61da824aa /drivers/gpu/nvgpu/gp106/acr_gp106.c | |
parent | 7668ccb2a2e4a8c13d82b427c65be79c725afe08 (diff) |
gpu: nvgpu: moved & renamed "struct pmu_gk20a"
- Renamed "struct pmu_gk20a" to "struct nvgpu_pmu" then moved
to file "pmu.h" under folder "drivers/gpu/nvgpu/include/nvgpu/"
- Included header file "pmu.h" to dependent file &
removed "pmu_gk20a.h" include if its usage is not present.
- Replaced "struct pmu_gk20a" with "struct nvgpu_pmu" in dependent
source & header files.
JIRA NVGPU-56
Change-Id: Ia3c606616831027093d5c216959c6a40d7c2632e
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1479209
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/acr_gp106.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/acr_gp106.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index 5570489e..c7d71ab0 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <nvgpu/dma.h> | 20 | #include <nvgpu/dma.h> |
21 | #include <nvgpu/acr/nvgpu_acr.h> | 21 | #include <nvgpu/acr/nvgpu_acr.h> |
22 | #include <nvgpu/firmware.h> | 22 | #include <nvgpu/firmware.h> |
23 | #include <nvgpu/pmu.h> | ||
23 | 24 | ||
24 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
25 | #include "gk20a/pmu_gk20a.h" | 26 | #include "gk20a/pmu_gk20a.h" |
@@ -140,7 +141,7 @@ void gp106_init_secure_pmu(struct gpu_ops *gops) | |||
140 | static int pmu_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) | 141 | static int pmu_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img) |
141 | { | 142 | { |
142 | struct nvgpu_firmware *pmu_fw, *pmu_desc, *pmu_sig; | 143 | struct nvgpu_firmware *pmu_fw, *pmu_desc, *pmu_sig; |
143 | struct pmu_gk20a *pmu = &g->pmu; | 144 | struct nvgpu_pmu *pmu = &g->pmu; |
144 | struct lsf_ucode_desc_v1 *lsf_desc; | 145 | struct lsf_ucode_desc_v1 *lsf_desc; |
145 | int err; | 146 | int err; |
146 | 147 | ||
@@ -382,7 +383,7 @@ static int gp106_prepare_ucode_blob(struct gk20a *g) | |||
382 | 383 | ||
383 | int err; | 384 | int err; |
384 | struct ls_flcn_mgr_v1 lsfm_l, *plsfm; | 385 | struct ls_flcn_mgr_v1 lsfm_l, *plsfm; |
385 | struct pmu_gk20a *pmu = &g->pmu; | 386 | struct nvgpu_pmu *pmu = &g->pmu; |
386 | struct wpr_carveout_info wpr_inf; | 387 | struct wpr_carveout_info wpr_inf; |
387 | 388 | ||
388 | if (g->acr.ucode_blob.cpu_va) { | 389 | if (g->acr.ucode_blob.cpu_va) { |
@@ -445,7 +446,7 @@ static u8 lsfm_falcon_disabled(struct gk20a *g, struct ls_flcn_mgr_v1 *plsfm, | |||
445 | static int lsfm_discover_ucode_images(struct gk20a *g, | 446 | static int lsfm_discover_ucode_images(struct gk20a *g, |
446 | struct ls_flcn_mgr_v1 *plsfm) | 447 | struct ls_flcn_mgr_v1 *plsfm) |
447 | { | 448 | { |
448 | struct pmu_gk20a *pmu = &g->pmu; | 449 | struct nvgpu_pmu *pmu = &g->pmu; |
449 | struct flcn_ucode_img_v1 ucode_img; | 450 | struct flcn_ucode_img_v1 ucode_img; |
450 | u32 falcon_id; | 451 | u32 falcon_id; |
451 | u32 i; | 452 | u32 i; |
@@ -531,7 +532,7 @@ static int gp106_pmu_populate_loader_cfg(struct gk20a *g, | |||
531 | void *lsfm, u32 *p_bl_gen_desc_size) | 532 | void *lsfm, u32 *p_bl_gen_desc_size) |
532 | { | 533 | { |
533 | struct wpr_carveout_info wpr_inf; | 534 | struct wpr_carveout_info wpr_inf; |
534 | struct pmu_gk20a *pmu = &g->pmu; | 535 | struct nvgpu_pmu *pmu = &g->pmu; |
535 | struct lsfm_managed_ucode_img_v2 *p_lsfm = | 536 | struct lsfm_managed_ucode_img_v2 *p_lsfm = |
536 | (struct lsfm_managed_ucode_img_v2 *)lsfm; | 537 | (struct lsfm_managed_ucode_img_v2 *)lsfm; |
537 | struct flcn_ucode_img_v1 *p_img = &(p_lsfm->ucode_img); | 538 | struct flcn_ucode_img_v1 *p_img = &(p_lsfm->ucode_img); |
@@ -661,7 +662,7 @@ static int lsfm_fill_flcn_bl_gen_desc(struct gk20a *g, | |||
661 | struct lsfm_managed_ucode_img_v2 *pnode) | 662 | struct lsfm_managed_ucode_img_v2 *pnode) |
662 | { | 663 | { |
663 | 664 | ||
664 | struct pmu_gk20a *pmu = &g->pmu; | 665 | struct nvgpu_pmu *pmu = &g->pmu; |
665 | if (pnode->wpr_header.falcon_id != pmu->falcon_id) { | 666 | if (pnode->wpr_header.falcon_id != pmu->falcon_id) { |
666 | gp106_dbg_pmu("non pmu. write flcn bl gen desc\n"); | 667 | gp106_dbg_pmu("non pmu. write flcn bl gen desc\n"); |
667 | g->ops.pmu.flcn_populate_bl_dmem_desc(g, | 668 | g->ops.pmu.flcn_populate_bl_dmem_desc(g, |
@@ -818,7 +819,7 @@ static void lsfm_fill_static_lsb_hdr_info(struct gk20a *g, | |||
818 | u32 falcon_id, struct lsfm_managed_ucode_img_v2 *pnode) | 819 | u32 falcon_id, struct lsfm_managed_ucode_img_v2 *pnode) |
819 | { | 820 | { |
820 | 821 | ||
821 | struct pmu_gk20a *pmu = &g->pmu; | 822 | struct nvgpu_pmu *pmu = &g->pmu; |
822 | u32 full_app_size = 0; | 823 | u32 full_app_size = 0; |
823 | u32 data = 0; | 824 | u32 data = 0; |
824 | 825 | ||