diff options
Diffstat (limited to 'drivers/gpu/nvgpu/pmgr')
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pmgrpmu.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pwrdev.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pwrdev.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pwrmonitor.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pwrmonitor.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pwrpolicy.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pwrpolicy.h | 4 |
7 files changed, 10 insertions, 17 deletions
diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c index ea070060..53241734 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c +++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.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, |
@@ -16,8 +16,7 @@ | |||
16 | #include "include/bios.h" | 16 | #include "include/bios.h" |
17 | #include "boardobj/boardobjgrp.h" | 17 | #include "boardobj/boardobjgrp.h" |
18 | #include "boardobj/boardobjgrp_e32.h" | 18 | #include "boardobj/boardobjgrp_e32.h" |
19 | #include "pmuif/gpmuifboardobj.h" | 19 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
20 | #include "pmuif/gpmuifpmgr.h" | ||
21 | #include "gm206/bios_gm206.h" | 20 | #include "gm206/bios_gm206.h" |
22 | #include "gk20a/pmu_gk20a.h" | 21 | #include "gk20a/pmu_gk20a.h" |
23 | #include "pmgrpmu.h" | 22 | #include "pmgrpmu.h" |
diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/pmgr/pwrdev.c index da034b31..e831126b 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrdev.c +++ b/drivers/gpu/nvgpu/pmgr/pwrdev.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, |
@@ -16,8 +16,6 @@ | |||
16 | #include "include/bios.h" | 16 | #include "include/bios.h" |
17 | #include "boardobj/boardobjgrp.h" | 17 | #include "boardobj/boardobjgrp.h" |
18 | #include "boardobj/boardobjgrp_e32.h" | 18 | #include "boardobj/boardobjgrp_e32.h" |
19 | #include "pmuif/gpmuifboardobj.h" | ||
20 | #include "pmuif/gpmuifpmgr.h" | ||
21 | #include "gm206/bios_gm206.h" | 19 | #include "gm206/bios_gm206.h" |
22 | #include "gk20a/pmu_gk20a.h" | 20 | #include "gk20a/pmu_gk20a.h" |
23 | 21 | ||
diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.h b/drivers/gpu/nvgpu/pmgr/pwrdev.h index b8592a18..144113e2 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrdev.h +++ b/drivers/gpu/nvgpu/pmgr/pwrdev.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * general power device structures & definitions | 2 | * general power device structures & definitions |
3 | * | 3 | * |
4 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -16,7 +16,7 @@ | |||
16 | #define _PWRDEV_H_ | 16 | #define _PWRDEV_H_ |
17 | 17 | ||
18 | #include "boardobj/boardobj.h" | 18 | #include "boardobj/boardobj.h" |
19 | #include "pmuif/gpmuifpmgr.h" | 19 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
20 | #include "ctrl/ctrlpmgr.h" | 20 | #include "ctrl/ctrlpmgr.h" |
21 | 21 | ||
22 | #define PWRDEV_I2CDEV_DEVICE_INDEX_NONE (0xFF) | 22 | #define PWRDEV_I2CDEV_DEVICE_INDEX_NONE (0xFF) |
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c index f14bac07..ab2460eb 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c +++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.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, |
@@ -16,8 +16,6 @@ | |||
16 | #include "include/bios.h" | 16 | #include "include/bios.h" |
17 | #include "boardobj/boardobjgrp.h" | 17 | #include "boardobj/boardobjgrp.h" |
18 | #include "boardobj/boardobjgrp_e32.h" | 18 | #include "boardobj/boardobjgrp_e32.h" |
19 | #include "pmuif/gpmuifboardobj.h" | ||
20 | #include "pmuif/gpmuifpmgr.h" | ||
21 | #include "gm206/bios_gm206.h" | 19 | #include "gm206/bios_gm206.h" |
22 | #include "gk20a/pmu_gk20a.h" | 20 | #include "gk20a/pmu_gk20a.h" |
23 | 21 | ||
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h index 7cd6b8c9..9ef5c821 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h +++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * general power channel structures & definitions | 2 | * general power channel structures & definitions |
3 | * | 3 | * |
4 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -15,9 +15,9 @@ | |||
15 | #ifndef _PWRMONITOR_H_ | 15 | #ifndef _PWRMONITOR_H_ |
16 | #define _PWRMONITOR_H_ | 16 | #define _PWRMONITOR_H_ |
17 | 17 | ||
18 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | ||
18 | #include "boardobj/boardobjgrp.h" | 19 | #include "boardobj/boardobjgrp.h" |
19 | #include "boardobj/boardobj.h" | 20 | #include "boardobj/boardobj.h" |
20 | #include "pmuif/gpmuifpmgr.h" | ||
21 | #include "ctrl/ctrlpmgr.h" | 21 | #include "ctrl/ctrlpmgr.h" |
22 | 22 | ||
23 | struct pwr_channel { | 23 | struct pwr_channel { |
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c index 2b0be8d8..d19f9a1c 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c +++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c | |||
@@ -16,8 +16,6 @@ | |||
16 | #include "include/bios.h" | 16 | #include "include/bios.h" |
17 | #include "boardobj/boardobjgrp.h" | 17 | #include "boardobj/boardobjgrp.h" |
18 | #include "boardobj/boardobjgrp_e32.h" | 18 | #include "boardobj/boardobjgrp_e32.h" |
19 | #include "pmuif/gpmuifboardobj.h" | ||
20 | #include "pmuif/gpmuifpmgr.h" | ||
21 | #include "gm206/bios_gm206.h" | 19 | #include "gm206/bios_gm206.h" |
22 | #include "gk20a/pmu_gk20a.h" | 20 | #include "gk20a/pmu_gk20a.h" |
23 | 21 | ||
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h index 008282d3..e14369ea 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h +++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * general power channel structures & definitions | 2 | * general power channel structures & definitions |
3 | * | 3 | * |
4 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -15,9 +15,9 @@ | |||
15 | #ifndef _PWRPOLICY_H_ | 15 | #ifndef _PWRPOLICY_H_ |
16 | #define _PWRPOLICY_H_ | 16 | #define _PWRPOLICY_H_ |
17 | 17 | ||
18 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | ||
18 | #include "boardobj/boardobjgrp.h" | 19 | #include "boardobj/boardobjgrp.h" |
19 | #include "boardobj/boardobj.h" | 20 | #include "boardobj/boardobj.h" |
20 | #include "pmuif/gpmuifpmgr.h" | ||
21 | #include "ctrl/ctrlpmgr.h" | 21 | #include "ctrl/ctrlpmgr.h" |
22 | 22 | ||
23 | #define PWR_POLICY_EXT_POWER_STATE_ID_COUNT 0x4 | 23 | #define PWR_POLICY_EXT_POWER_STATE_ID_COUNT 0x4 |