summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp106/sec2_gp106.c
diff options
context:
space:
mode:
authorMahantesh Kumbar <mkumbar@nvidia.com>2017-05-10 11:05:24 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-06-05 02:05:18 -0400
commit673dd971600b26131c0afdb221e13c080da022fd (patch)
tree7c8416ac2ef61891812773d55c8c8dc61da824aa /drivers/gpu/nvgpu/gp106/sec2_gp106.c
parent7668ccb2a2e4a8c13d82b427c65be79c725afe08 (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/sec2_gp106.c')
-rw-r--r--drivers/gpu/nvgpu/gp106/sec2_gp106.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gp106/sec2_gp106.c b/drivers/gpu/nvgpu/gp106/sec2_gp106.c
index 078a1436..9c86c5b5 100644
--- a/drivers/gpu/nvgpu/gp106/sec2_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/sec2_gp106.c
@@ -11,6 +11,8 @@
11 * more details. 11 * more details.
12 */ 12 */
13 13
14#include <nvgpu/pmu.h>
15
14#include "gk20a/gk20a.h" 16#include "gk20a/gk20a.h"
15#include "gk20a/pmu_gk20a.h" 17#include "gk20a/pmu_gk20a.h"
16 18
@@ -88,7 +90,7 @@ int sec2_wait_for_halt(struct gk20a *g, unsigned int timeout)
88 return completion; 90 return completion;
89} 91}
90 92
91void sec2_copy_to_dmem(struct pmu_gk20a *pmu, 93void sec2_copy_to_dmem(struct nvgpu_pmu *pmu,
92 u32 dst, u8 *src, u32 size, u8 port) 94 u32 dst, u8 *src, u32 size, u8 port)
93{ 95{
94 struct gk20a *g = gk20a_from_pmu(pmu); 96 struct gk20a *g = gk20a_from_pmu(pmu);
@@ -139,7 +141,7 @@ void sec2_copy_to_dmem(struct pmu_gk20a *pmu,
139 return; 141 return;
140} 142}
141 143
142int bl_bootstrap_sec2(struct pmu_gk20a *pmu, 144int bl_bootstrap_sec2(struct nvgpu_pmu *pmu,
143 void *desc, u32 bl_sz) 145 void *desc, u32 bl_sz)
144{ 146{
145 struct gk20a *g = gk20a_from_pmu(pmu); 147 struct gk20a *g = gk20a_from_pmu(pmu);
@@ -223,7 +225,7 @@ int bl_bootstrap_sec2(struct pmu_gk20a *pmu,
223 return 0; 225 return 0;
224} 226}
225 227
226void sec_enable_irq(struct pmu_gk20a *pmu, bool enable) 228void sec_enable_irq(struct nvgpu_pmu *pmu, bool enable)
227{ 229{
228 struct gk20a *g = gk20a_from_pmu(pmu); 230 struct gk20a *g = gk20a_from_pmu(pmu);
229 231
@@ -281,7 +283,7 @@ void sec_enable_irq(struct pmu_gk20a *pmu, bool enable)
281void init_pmu_setup_hw1(struct gk20a *g) 283void init_pmu_setup_hw1(struct gk20a *g)
282{ 284{
283 struct mm_gk20a *mm = &g->mm; 285 struct mm_gk20a *mm = &g->mm;
284 struct pmu_gk20a *pmu = &g->pmu; 286 struct nvgpu_pmu *pmu = &g->pmu;
285 287
286 /* PMU TRANSCFG */ 288 /* PMU TRANSCFG */
287 /* setup apertures - virtual */ 289 /* setup apertures - virtual */
@@ -331,7 +333,7 @@ void init_pmu_setup_hw1(struct gk20a *g)
331int init_sec2_setup_hw1(struct gk20a *g, 333int init_sec2_setup_hw1(struct gk20a *g,
332 void *desc, u32 bl_sz) 334 void *desc, u32 bl_sz)
333{ 335{
334 struct pmu_gk20a *pmu = &g->pmu; 336 struct nvgpu_pmu *pmu = &g->pmu;
335 int err; 337 int err;
336 u32 data = 0; 338 u32 data = 0;
337 339