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/pmgr | |
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/pmgr')
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pmgrpmu.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pwrdev.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pwrmonitor.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pwrpolicy.c | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c index 7445d81c..7abe4976 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c +++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c | |||
@@ -13,11 +13,11 @@ | |||
13 | 13 | ||
14 | #include <nvgpu/kmem.h> | 14 | #include <nvgpu/kmem.h> |
15 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 15 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
16 | #include <nvgpu/pmu.h> | ||
16 | 17 | ||
17 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
18 | #include "gk20a/platform_gk20a.h" | 19 | #include "gk20a/platform_gk20a.h" |
19 | #include "gm206/bios_gm206.h" | 20 | #include "gm206/bios_gm206.h" |
20 | #include "gk20a/pmu_gk20a.h" | ||
21 | 21 | ||
22 | #include "boardobj/boardobjgrp.h" | 22 | #include "boardobj/boardobjgrp.h" |
23 | #include "boardobj/boardobjgrp_e32.h" | 23 | #include "boardobj/boardobjgrp_e32.h" |
diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/pmgr/pwrdev.c index 3823c4e9..0dbbd2c2 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrdev.c +++ b/drivers/gpu/nvgpu/pmgr/pwrdev.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include "boardobj/boardobjgrp.h" | 18 | #include "boardobj/boardobjgrp.h" |
19 | #include "boardobj/boardobjgrp_e32.h" | 19 | #include "boardobj/boardobjgrp_e32.h" |
20 | #include "gm206/bios_gm206.h" | 20 | #include "gm206/bios_gm206.h" |
21 | #include "gk20a/pmu_gk20a.h" | ||
22 | 21 | ||
23 | static u32 _pwr_device_pmudata_instget(struct gk20a *g, | 22 | static u32 _pwr_device_pmudata_instget(struct gk20a *g, |
24 | struct nv_pmu_boardobjgrp *pmuboardobjgrp, | 23 | struct nv_pmu_boardobjgrp *pmuboardobjgrp, |
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c index 05636001..330d23c8 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c +++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include "boardobj/boardobjgrp.h" | 18 | #include "boardobj/boardobjgrp.h" |
19 | #include "boardobj/boardobjgrp_e32.h" | 19 | #include "boardobj/boardobjgrp_e32.h" |
20 | #include "gm206/bios_gm206.h" | 20 | #include "gm206/bios_gm206.h" |
21 | #include "gk20a/pmu_gk20a.h" | ||
22 | 21 | ||
23 | static u32 _pwr_channel_pmudata_instget(struct gk20a *g, | 22 | static u32 _pwr_channel_pmudata_instget(struct gk20a *g, |
24 | struct nv_pmu_boardobjgrp *pmuboardobjgrp, | 23 | struct nv_pmu_boardobjgrp *pmuboardobjgrp, |
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c index c7384b6e..74dc7a6a 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c +++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include "boardobj/boardobjgrp.h" | 20 | #include "boardobj/boardobjgrp.h" |
21 | #include "boardobj/boardobjgrp_e32.h" | 21 | #include "boardobj/boardobjgrp_e32.h" |
22 | #include "gm206/bios_gm206.h" | 22 | #include "gm206/bios_gm206.h" |
23 | #include "gk20a/pmu_gk20a.h" | ||
24 | 23 | ||
25 | #define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output | 24 | #define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output |
26 | #define _pwr_policy_limitdeltaapply(limit, delta) ((u32)max(((s32)limit) + (delta), 0)) | 25 | #define _pwr_policy_limitdeltaapply(limit, delta) ((u32)max(((s32)limit) + (delta), 0)) |