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/gp10b | |
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/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | 13 |
1 files changed, 7 insertions, 6 deletions
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 @@ | |||
15 | 15 | ||
16 | #include <soc/tegra/fuse.h> | 16 | #include <soc/tegra/fuse.h> |
17 | 17 | ||
18 | #include <nvgpu/pmu.h> | ||
19 | #include <nvgpu/log.h> | ||
20 | |||
18 | #include "gk20a/gk20a.h" | 21 | #include "gk20a/gk20a.h" |
19 | #include "gk20a/pmu_gk20a.h" | 22 | #include "gk20a/pmu_gk20a.h" |
20 | #include "gm20b/acr_gm20b.h" | 23 | #include "gm20b/acr_gm20b.h" |
@@ -23,8 +26,6 @@ | |||
23 | #include "pmu_gp10b.h" | 26 | #include "pmu_gp10b.h" |
24 | #include "gp10b_sysfs.h" | 27 | #include "gp10b_sysfs.h" |
25 | 28 | ||
26 | #include <nvgpu/log.h> | ||
27 | |||
28 | #include <nvgpu/hw/gp10b/hw_pwr_gp10b.h> | 29 | #include <nvgpu/hw/gp10b/hw_pwr_gp10b.h> |
29 | #include <nvgpu/hw/gp10b/hw_fuse_gp10b.h> | 30 | #include <nvgpu/hw/gp10b/hw_fuse_gp10b.h> |
30 | 31 | ||
@@ -142,7 +143,7 @@ static struct pg_init_sequence_list _pginitseq_gp10b[] = { | |||
142 | static void gp10b_pmu_load_multiple_falcons(struct gk20a *g, u32 falconidmask, | 143 | static void gp10b_pmu_load_multiple_falcons(struct gk20a *g, u32 falconidmask, |
143 | u32 flags) | 144 | u32 flags) |
144 | { | 145 | { |
145 | struct pmu_gk20a *pmu = &g->pmu; | 146 | struct nvgpu_pmu *pmu = &g->pmu; |
146 | struct pmu_cmd cmd; | 147 | struct pmu_cmd cmd; |
147 | u32 seq; | 148 | u32 seq; |
148 | 149 | ||
@@ -226,7 +227,7 @@ static void pmu_handle_gr_param_msg(struct gk20a *g, struct pmu_msg *msg, | |||
226 | 227 | ||
227 | int gp10b_pg_gr_init(struct gk20a *g, u32 pg_engine_id) | 228 | int gp10b_pg_gr_init(struct gk20a *g, u32 pg_engine_id) |
228 | { | 229 | { |
229 | struct pmu_gk20a *pmu = &g->pmu; | 230 | struct nvgpu_pmu *pmu = &g->pmu; |
230 | struct pmu_cmd cmd; | 231 | struct pmu_cmd cmd; |
231 | u32 seq; | 232 | u32 seq; |
232 | 233 | ||
@@ -255,7 +256,7 @@ int gp10b_pg_gr_init(struct gk20a *g, u32 pg_engine_id) | |||
255 | static void gp10b_pmu_elpg_statistics(struct gk20a *g, u32 pg_engine_id, | 256 | static void gp10b_pmu_elpg_statistics(struct gk20a *g, u32 pg_engine_id, |
256 | struct pmu_pg_stats_data *pg_stat_data) | 257 | struct pmu_pg_stats_data *pg_stat_data) |
257 | { | 258 | { |
258 | struct pmu_gk20a *pmu = &g->pmu; | 259 | struct nvgpu_pmu *pmu = &g->pmu; |
259 | struct pmu_pg_stats_v1 stats; | 260 | struct pmu_pg_stats_v1 stats; |
260 | 261 | ||
261 | pmu_copy_from_dmem(pmu, | 262 | pmu_copy_from_dmem(pmu, |
@@ -301,7 +302,7 @@ void gp10b_write_dmatrfbase(struct gk20a *g, u32 addr) | |||
301 | 302 | ||
302 | static int gp10b_init_pmu_setup_hw1(struct gk20a *g) | 303 | static int gp10b_init_pmu_setup_hw1(struct gk20a *g) |
303 | { | 304 | { |
304 | struct pmu_gk20a *pmu = &g->pmu; | 305 | struct nvgpu_pmu *pmu = &g->pmu; |
305 | int err; | 306 | int err; |
306 | 307 | ||
307 | gk20a_dbg_fn(""); | 308 | gk20a_dbg_fn(""); |