diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-03-15 19:42:12 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-06 21:14:48 -0400 |
commit | b69020bff5dfa69cad926c9374cdbe9a62509ffd (patch) | |
tree | 222f6b6bc23561a38004a257cbac401e431ff3be /drivers/gpu/nvgpu/gp106/acr_gp106.c | |
parent | fa4ecf5730a75269e85cc41c2ad2ee61307e72a9 (diff) |
gpu: nvgpu: Rename gk20a_mem_* functions
Rename the functions used for mem_desc access to nvgpu_mem_*.
JIRA NVGPU-12
Change-Id: Ibfdc1112d43f0a125e4487c250e3f977ffd2cd75
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1323325
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index c7638d3e..ee709ed1 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c | |||
@@ -701,7 +701,7 @@ static void lsfm_init_wpr_contents(struct gk20a *g, | |||
701 | */ | 701 | */ |
702 | while (pnode) { | 702 | while (pnode) { |
703 | /* Flush WPR header to memory*/ | 703 | /* Flush WPR header to memory*/ |
704 | gk20a_mem_wr_n(g, ucode, i * sizeof(pnode->wpr_header), | 704 | nvgpu_mem_wr_n(g, ucode, i * sizeof(pnode->wpr_header), |
705 | &pnode->wpr_header, sizeof(pnode->wpr_header)); | 705 | &pnode->wpr_header, sizeof(pnode->wpr_header)); |
706 | 706 | ||
707 | gp106_dbg_pmu("wpr header"); | 707 | gp106_dbg_pmu("wpr header"); |
@@ -717,7 +717,7 @@ static void lsfm_init_wpr_contents(struct gk20a *g, | |||
717 | pnode->wpr_header.status); | 717 | pnode->wpr_header.status); |
718 | 718 | ||
719 | /*Flush LSB header to memory*/ | 719 | /*Flush LSB header to memory*/ |
720 | gk20a_mem_wr_n(g, ucode, pnode->wpr_header.lsb_offset, | 720 | nvgpu_mem_wr_n(g, ucode, pnode->wpr_header.lsb_offset, |
721 | &pnode->lsb_header, sizeof(pnode->lsb_header)); | 721 | &pnode->lsb_header, sizeof(pnode->lsb_header)); |
722 | 722 | ||
723 | gp106_dbg_pmu("lsb header"); | 723 | gp106_dbg_pmu("lsb header"); |
@@ -751,13 +751,13 @@ static void lsfm_init_wpr_contents(struct gk20a *g, | |||
751 | if (!pnode->ucode_img.header) { | 751 | if (!pnode->ucode_img.header) { |
752 | /*Populate gen bl and flush to memory*/ | 752 | /*Populate gen bl and flush to memory*/ |
753 | lsfm_fill_flcn_bl_gen_desc(g, pnode); | 753 | lsfm_fill_flcn_bl_gen_desc(g, pnode); |
754 | gk20a_mem_wr_n(g, ucode, | 754 | nvgpu_mem_wr_n(g, ucode, |
755 | pnode->lsb_header.bl_data_off, | 755 | pnode->lsb_header.bl_data_off, |
756 | &pnode->bl_gen_desc, | 756 | &pnode->bl_gen_desc, |
757 | pnode->bl_gen_desc_size); | 757 | pnode->bl_gen_desc_size); |
758 | } | 758 | } |
759 | /*Copying of ucode*/ | 759 | /*Copying of ucode*/ |
760 | gk20a_mem_wr_n(g, ucode, pnode->lsb_header.ucode_off, | 760 | nvgpu_mem_wr_n(g, ucode, pnode->lsb_header.ucode_off, |
761 | pnode->ucode_img.data, | 761 | pnode->ucode_img.data, |
762 | pnode->ucode_img.data_size); | 762 | pnode->ucode_img.data_size); |
763 | pnode = pnode->next; | 763 | pnode = pnode->next; |
@@ -765,7 +765,7 @@ static void lsfm_init_wpr_contents(struct gk20a *g, | |||
765 | } | 765 | } |
766 | 766 | ||
767 | /* Tag the terminator WPR header with an invalid falcon ID. */ | 767 | /* Tag the terminator WPR header with an invalid falcon ID. */ |
768 | gk20a_mem_wr32(g, ucode, | 768 | nvgpu_mem_wr32(g, ucode, |
769 | plsfm->managed_flcn_cnt * sizeof(struct lsf_wpr_header) + | 769 | plsfm->managed_flcn_cnt * sizeof(struct lsf_wpr_header) + |
770 | offsetof(struct lsf_wpr_header, falcon_id), | 770 | offsetof(struct lsf_wpr_header, falcon_id), |
771 | LSF_FALCON_ID_INVALID); | 771 | LSF_FALCON_ID_INVALID); |
@@ -1124,7 +1124,7 @@ static int gp106_bootstrap_hs_flcn(struct gk20a *g) | |||
1124 | ((struct flcn_acr_desc_v1 *)acr_dmem)->regions.region_props[ | 1124 | ((struct flcn_acr_desc_v1 *)acr_dmem)->regions.region_props[ |
1125 | 0].shadowmMem_startaddress = wpr_inf.nonwpr_base >> 8; | 1125 | 0].shadowmMem_startaddress = wpr_inf.nonwpr_base >> 8; |
1126 | 1126 | ||
1127 | gk20a_mem_wr_n(g, &acr->acr_ucode, 0, | 1127 | nvgpu_mem_wr_n(g, &acr->acr_ucode, 0, |
1128 | acr_ucode_data_t210_load, img_size_in_bytes); | 1128 | acr_ucode_data_t210_load, img_size_in_bytes); |
1129 | 1129 | ||
1130 | /* | 1130 | /* |