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/pmu_gp106.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106/pmu_gp106.c') diff --git a/drivers/gpu/nvgpu/gp106/pmu_gp106.c b/drivers/gpu/nvgpu/gp106/pmu_gp106.c index 467c50be..89144c2a 100644 --- a/drivers/gpu/nvgpu/gp106/pmu_gp106.c +++ b/drivers/gpu/nvgpu/gp106/pmu_gp106.c @@ -11,6 +11,8 @@ * more details. */ +#include + #include "gk20a/gk20a.h" #include "gk20a/pmu_gk20a.h" @@ -31,7 +33,7 @@ #define PMU_MEM_SCRUBBING_TIMEOUT_MAX 1000 #define PMU_MEM_SCRUBBING_TIMEOUT_DEFAULT 10 -static int gp106_pmu_enable_hw(struct pmu_gk20a *pmu, bool enable) +static int gp106_pmu_enable_hw(struct nvgpu_pmu *pmu, bool enable) { struct gk20a *g = gk20a_from_pmu(pmu); @@ -86,7 +88,7 @@ static int gp106_pmu_enable_hw(struct pmu_gk20a *pmu, bool enable) } } -static int pmu_enable(struct pmu_gk20a *pmu, bool enable) +static int pmu_enable(struct nvgpu_pmu *pmu, bool enable) { struct gk20a *g = gk20a_from_pmu(pmu); u32 reg_reset; @@ -121,7 +123,7 @@ static int pmu_enable(struct pmu_gk20a *pmu, bool enable) int gp106_pmu_reset(struct gk20a *g) { - struct pmu_gk20a *pmu = &g->pmu; + struct nvgpu_pmu *pmu = &g->pmu; int err = 0; gk20a_dbg_fn(""); @@ -210,7 +212,7 @@ static void pmu_handle_param_msg(struct gk20a *g, struct pmu_msg *msg, static int gp106_pg_param_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; u32 status; @@ -262,7 +264,7 @@ static int gp106_pg_param_init(struct gk20a *g, u32 pg_engine_id) void gp106_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_v2 stats; pmu_copy_from_dmem(pmu, @@ -335,7 +337,7 @@ static bool gp106_is_priv_load(u32 falcon_id) static void gp106_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; -- cgit v1.2.2