diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2017-05-10 11:05:24 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-05 02:05:18 -0400 |
commit | 673dd971600b26131c0afdb221e13c080da022fd (patch) | |
tree | 7c8416ac2ef61891812773d55c8c8dc61da824aa /drivers/gpu/nvgpu/gp106/pmu_gp106.c | |
parent | 7668ccb2a2e4a8c13d82b427c65be79c725afe08 (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/pmu_gp106.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/pmu_gp106.c | 14 |
1 files changed, 8 insertions, 6 deletions
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 @@ | |||
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 | ||
@@ -31,7 +33,7 @@ | |||
31 | #define PMU_MEM_SCRUBBING_TIMEOUT_MAX 1000 | 33 | #define PMU_MEM_SCRUBBING_TIMEOUT_MAX 1000 |
32 | #define PMU_MEM_SCRUBBING_TIMEOUT_DEFAULT 10 | 34 | #define PMU_MEM_SCRUBBING_TIMEOUT_DEFAULT 10 |
33 | 35 | ||
34 | static int gp106_pmu_enable_hw(struct pmu_gk20a *pmu, bool enable) | 36 | static int gp106_pmu_enable_hw(struct nvgpu_pmu *pmu, bool enable) |
35 | { | 37 | { |
36 | struct gk20a *g = gk20a_from_pmu(pmu); | 38 | struct gk20a *g = gk20a_from_pmu(pmu); |
37 | 39 | ||
@@ -86,7 +88,7 @@ static int gp106_pmu_enable_hw(struct pmu_gk20a *pmu, bool enable) | |||
86 | } | 88 | } |
87 | } | 89 | } |
88 | 90 | ||
89 | static int pmu_enable(struct pmu_gk20a *pmu, bool enable) | 91 | static int pmu_enable(struct nvgpu_pmu *pmu, bool enable) |
90 | { | 92 | { |
91 | struct gk20a *g = gk20a_from_pmu(pmu); | 93 | struct gk20a *g = gk20a_from_pmu(pmu); |
92 | u32 reg_reset; | 94 | u32 reg_reset; |
@@ -121,7 +123,7 @@ static int pmu_enable(struct pmu_gk20a *pmu, bool enable) | |||
121 | 123 | ||
122 | int gp106_pmu_reset(struct gk20a *g) | 124 | int gp106_pmu_reset(struct gk20a *g) |
123 | { | 125 | { |
124 | struct pmu_gk20a *pmu = &g->pmu; | 126 | struct nvgpu_pmu *pmu = &g->pmu; |
125 | int err = 0; | 127 | int err = 0; |
126 | 128 | ||
127 | gk20a_dbg_fn(""); | 129 | gk20a_dbg_fn(""); |
@@ -210,7 +212,7 @@ static void pmu_handle_param_msg(struct gk20a *g, struct pmu_msg *msg, | |||
210 | 212 | ||
211 | static int gp106_pg_param_init(struct gk20a *g, u32 pg_engine_id) | 213 | static int gp106_pg_param_init(struct gk20a *g, u32 pg_engine_id) |
212 | { | 214 | { |
213 | struct pmu_gk20a *pmu = &g->pmu; | 215 | struct nvgpu_pmu *pmu = &g->pmu; |
214 | struct pmu_cmd cmd; | 216 | struct pmu_cmd cmd; |
215 | u32 seq; | 217 | u32 seq; |
216 | u32 status; | 218 | u32 status; |
@@ -262,7 +264,7 @@ static int gp106_pg_param_init(struct gk20a *g, u32 pg_engine_id) | |||
262 | void gp106_pmu_elpg_statistics(struct gk20a *g, u32 pg_engine_id, | 264 | void gp106_pmu_elpg_statistics(struct gk20a *g, u32 pg_engine_id, |
263 | struct pmu_pg_stats_data *pg_stat_data) | 265 | struct pmu_pg_stats_data *pg_stat_data) |
264 | { | 266 | { |
265 | struct pmu_gk20a *pmu = &g->pmu; | 267 | struct nvgpu_pmu *pmu = &g->pmu; |
266 | struct pmu_pg_stats_v2 stats; | 268 | struct pmu_pg_stats_v2 stats; |
267 | 269 | ||
268 | pmu_copy_from_dmem(pmu, | 270 | pmu_copy_from_dmem(pmu, |
@@ -335,7 +337,7 @@ static bool gp106_is_priv_load(u32 falcon_id) | |||
335 | static void gp106_pmu_load_multiple_falcons(struct gk20a *g, u32 falconidmask, | 337 | static void gp106_pmu_load_multiple_falcons(struct gk20a *g, u32 falconidmask, |
336 | u32 flags) | 338 | u32 flags) |
337 | { | 339 | { |
338 | struct pmu_gk20a *pmu = &g->pmu; | 340 | struct nvgpu_pmu *pmu = &g->pmu; |
339 | struct pmu_cmd cmd; | 341 | struct pmu_cmd cmd; |
340 | u32 seq; | 342 | u32 seq; |
341 | 343 | ||