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/boardobj | |
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/boardobj')
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobj.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h | 1 |
4 files changed, 5 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.h b/drivers/gpu/nvgpu/boardobj/boardobj.h index a445a2c6..f2ae52e6 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.h +++ b/drivers/gpu/nvgpu/boardobj/boardobj.h | |||
@@ -14,11 +14,11 @@ | |||
14 | #ifndef _BOARDOBJ_H_ | 14 | #ifndef _BOARDOBJ_H_ |
15 | #define _BOARDOBJ_H_ | 15 | #define _BOARDOBJ_H_ |
16 | 16 | ||
17 | struct boardobj; | 17 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
18 | 18 | ||
19 | #include "gk20a/pmu_gk20a.h" | ||
20 | #include "ctrl/ctrlboardobj.h" | 19 | #include "ctrl/ctrlboardobj.h" |
21 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 20 | |
21 | struct boardobj; | ||
22 | 22 | ||
23 | /* | 23 | /* |
24 | * check whether the specified BOARDOBJ object implements the queried | 24 | * check whether the specified BOARDOBJ object implements the queried |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c index d2fb8a45..51c23589 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -10,15 +10,13 @@ | |||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | 10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | #include <nvgpu/bug.h> | ||
13 | 14 | ||
14 | #include "gk20a/gk20a.h" | 15 | #include "gk20a/gk20a.h" |
15 | #include "gk20a/pmu_gk20a.h" | ||
16 | #include "boardobjgrp.h" | 16 | #include "boardobjgrp.h" |
17 | #include "ctrl/ctrlboardobj.h" | 17 | #include "ctrl/ctrlboardobj.h" |
18 | #include "boardobj.h" | 18 | #include "boardobj.h" |
19 | 19 | ||
20 | #include <nvgpu/bug.h> | ||
21 | |||
22 | static boardobjgrp_objinsert boardobjgrp_objinsert_final; | 20 | static boardobjgrp_objinsert boardobjgrp_objinsert_final; |
23 | static boardobjgrp_objgetbyidx boardobjgrp_objgetbyidx_final; | 21 | static boardobjgrp_objgetbyidx boardobjgrp_objgetbyidx_final; |
24 | static boardobjgrp_objgetnext boardobjgrp_objgetnext_final; | 22 | static boardobjgrp_objgetnext boardobjgrp_objgetnext_final; |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h index 059b224d..93e9d4b0 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #ifndef _BOARDOBJGRP_E255_H_ | 14 | #ifndef _BOARDOBJGRP_E255_H_ |
15 | #define _BOARDOBJGRP_E255_H_ | 15 | #define _BOARDOBJGRP_E255_H_ |
16 | 16 | ||
17 | #include "gk20a/pmu_gk20a.h" | ||
18 | #include "ctrl/ctrlboardobj.h" | 17 | #include "ctrl/ctrlboardobj.h" |
19 | #include "boardobj.h" | 18 | #include "boardobj.h" |
20 | #include "boardobjgrpmask.h" | 19 | #include "boardobjgrpmask.h" |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h index fb114024..62498f79 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #ifndef _BOARDOBJGRP_E32_H_ | 14 | #ifndef _BOARDOBJGRP_E32_H_ |
15 | #define _BOARDOBJGRP_E32_H_ | 15 | #define _BOARDOBJGRP_E32_H_ |
16 | 16 | ||
17 | #include "gk20a/pmu_gk20a.h" | ||
18 | #include "ctrl/ctrlboardobj.h" | 17 | #include "ctrl/ctrlboardobj.h" |
19 | #include "boardobj.h" | 18 | #include "boardobj.h" |
20 | #include "boardobjgrp.h" | 19 | #include "boardobjgrp.h" |