From 673dd971600b26131c0afdb221e13c080da022fd Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Wed, 10 May 2017 20:35:24 +0530 Subject: 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 Reviewed-on: http://git-master/r/1479209 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp106/sec2_gp106.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106/sec2_gp106.c') 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 @@ * more details. */ +#include + #include "gk20a/gk20a.h" #include "gk20a/pmu_gk20a.h" @@ -88,7 +90,7 @@ int sec2_wait_for_halt(struct gk20a *g, unsigned int timeout) return completion; } -void sec2_copy_to_dmem(struct pmu_gk20a *pmu, +void sec2_copy_to_dmem(struct nvgpu_pmu *pmu, u32 dst, u8 *src, u32 size, u8 port) { struct gk20a *g = gk20a_from_pmu(pmu); @@ -139,7 +141,7 @@ void sec2_copy_to_dmem(struct pmu_gk20a *pmu, return; } -int bl_bootstrap_sec2(struct pmu_gk20a *pmu, +int bl_bootstrap_sec2(struct nvgpu_pmu *pmu, void *desc, u32 bl_sz) { struct gk20a *g = gk20a_from_pmu(pmu); @@ -223,7 +225,7 @@ int bl_bootstrap_sec2(struct pmu_gk20a *pmu, return 0; } -void sec_enable_irq(struct pmu_gk20a *pmu, bool enable) +void sec_enable_irq(struct nvgpu_pmu *pmu, bool enable) { struct gk20a *g = gk20a_from_pmu(pmu); @@ -281,7 +283,7 @@ void sec_enable_irq(struct pmu_gk20a *pmu, bool enable) void init_pmu_setup_hw1(struct gk20a *g) { struct mm_gk20a *mm = &g->mm; - struct pmu_gk20a *pmu = &g->pmu; + struct nvgpu_pmu *pmu = &g->pmu; /* PMU TRANSCFG */ /* setup apertures - virtual */ @@ -331,7 +333,7 @@ void init_pmu_setup_hw1(struct gk20a *g) int init_sec2_setup_hw1(struct gk20a *g, void *desc, u32 bl_sz) { - struct pmu_gk20a *pmu = &g->pmu; + struct nvgpu_pmu *pmu = &g->pmu; int err; u32 data = 0; -- cgit v1.2.2