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/gp10b/pmu_gp10b.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b/pmu_gp10b.c') diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c index 1167006d..1409d279 100644 --- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c @@ -15,6 +15,9 @@ #include +#include +#include + #include "gk20a/gk20a.h" #include "gk20a/pmu_gk20a.h" #include "gm20b/acr_gm20b.h" @@ -23,8 +26,6 @@ #include "pmu_gp10b.h" #include "gp10b_sysfs.h" -#include - #include #include @@ -142,7 +143,7 @@ static struct pg_init_sequence_list _pginitseq_gp10b[] = { static void gp10b_pmu_load_multiple_falcons(struct gk20a *g, u32 falconidmask, u32 flags) { - struct pmu_gk20a *pmu = &g->pmu; + struct nvgpu_pmu *pmu = &g->pmu; struct pmu_cmd cmd; u32 seq; @@ -226,7 +227,7 @@ static void pmu_handle_gr_param_msg(struct gk20a *g, struct pmu_msg *msg, int gp10b_pg_gr_init(struct gk20a *g, u32 pg_engine_id) { - struct pmu_gk20a *pmu = &g->pmu; + struct nvgpu_pmu *pmu = &g->pmu; struct pmu_cmd cmd; u32 seq; @@ -255,7 +256,7 @@ int gp10b_pg_gr_init(struct gk20a *g, u32 pg_engine_id) static void gp10b_pmu_elpg_statistics(struct gk20a *g, u32 pg_engine_id, struct pmu_pg_stats_data *pg_stat_data) { - struct pmu_gk20a *pmu = &g->pmu; + struct nvgpu_pmu *pmu = &g->pmu; struct pmu_pg_stats_v1 stats; pmu_copy_from_dmem(pmu, @@ -301,7 +302,7 @@ void gp10b_write_dmatrfbase(struct gk20a *g, u32 addr) static int gp10b_init_pmu_setup_hw1(struct gk20a *g) { - struct pmu_gk20a *pmu = &g->pmu; + struct nvgpu_pmu *pmu = &g->pmu; int err; gk20a_dbg_fn(""); -- cgit v1.2.2