diff options
Diffstat (limited to 'drivers/gpu')
33 files changed, 38 insertions, 34 deletions
diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.c b/drivers/gpu/nvgpu/boardobj/boardobj.c index b7892c78..2044b5b5 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.c +++ b/drivers/gpu/nvgpu/boardobj/boardobj.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/kmem.h> | 23 | #include <nvgpu/kmem.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "boardobj.h" | 26 | #include "boardobj.h" |
27 | #include "ctrl/ctrlboardobj.h" | 27 | #include "ctrl/ctrlboardobj.h" |
28 | 28 | ||
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c index e3b69d4b..088c0e95 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #include <nvgpu/bug.h> | 22 | #include <nvgpu/bug.h> |
23 | #include <nvgpu/gk20a.h> | ||
23 | 24 | ||
24 | #include "gk20a/gk20a.h" | ||
25 | #include "boardobjgrp.h" | 25 | #include "boardobjgrp.h" |
26 | #include "ctrl/ctrlboardobj.h" | 26 | #include "ctrl/ctrlboardobj.h" |
27 | #include "boardobj.h" | 27 | #include "boardobj.h" |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c index b26f8ecb..63546a9b 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c | |||
@@ -20,7 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include <nvgpu/gk20a.h> |
24 | |||
24 | #include "boardobj.h" | 25 | #include "boardobj.h" |
25 | #include "boardobjgrp_e255.h" | 26 | #include "boardobjgrp_e255.h" |
26 | #include "ctrl/ctrlboardobj.h" | 27 | #include "ctrl/ctrlboardobj.h" |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c index 48322310..d72e8cb0 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c | |||
@@ -19,8 +19,8 @@ | |||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #include <nvgpu/gk20a.h> | ||
22 | 23 | ||
23 | #include "gk20a/gk20a.h" | ||
24 | #include "boardobj.h" | 24 | #include "boardobj.h" |
25 | #include "boardobjgrp.h" | 25 | #include "boardobjgrp.h" |
26 | #include "boardobjgrp_e32.h" | 26 | #include "boardobjgrp_e32.h" |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c index d957467b..a1dcd6d7 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c | |||
@@ -19,7 +19,8 @@ | |||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #include "gk20a/gk20a.h" | 22 | #include <nvgpu/gk20a.h> |
23 | |||
23 | #include "boardobjgrp.h" | 24 | #include "boardobjgrp.h" |
24 | #include "ctrl/ctrlboardobj.h" | 25 | #include "ctrl/ctrlboardobj.h" |
25 | 26 | ||
diff --git a/drivers/gpu/nvgpu/clk/clk.c b/drivers/gpu/nvgpu/clk/clk.c index 392fc9b4..f0624595 100644 --- a/drivers/gpu/nvgpu/clk/clk.c +++ b/drivers/gpu/nvgpu/clk/clk.c | |||
@@ -22,8 +22,8 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/pmu.h> | 23 | #include <nvgpu/pmu.h> |
24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
25 | #include <nvgpu/gk20a.h> | ||
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | ||
27 | #include "clk.h" | 27 | #include "clk.h" |
28 | #include "ctrl/ctrlclk.h" | 28 | #include "ctrl/ctrlclk.h" |
29 | #include "ctrl/ctrlvolt.h" | 29 | #include "ctrl/ctrlvolt.h" |
diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c index 8543196b..81220c6e 100644 --- a/drivers/gpu/nvgpu/clk/clk_arb.c +++ b/drivers/gpu/nvgpu/clk/clk_arb.c | |||
@@ -32,8 +32,8 @@ | |||
32 | #include <nvgpu/list.h> | 32 | #include <nvgpu/list.h> |
33 | #include <nvgpu/clk_arb.h> | 33 | #include <nvgpu/clk_arb.h> |
34 | #include <nvgpu/timers.h> | 34 | #include <nvgpu/timers.h> |
35 | #include <nvgpu/gk20a.h> | ||
35 | 36 | ||
36 | #include "gk20a/gk20a.h" | ||
37 | #include "clk/clk.h" | 37 | #include "clk/clk.h" |
38 | #include "pstate/pstate.h" | 38 | #include "pstate/pstate.h" |
39 | #include "lpwr/lpwr.h" | 39 | #include "lpwr/lpwr.h" |
diff --git a/drivers/gpu/nvgpu/clk/clk_domain.c b/drivers/gpu/nvgpu/clk/clk_domain.c index 1fccff54..3b64f519 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.c +++ b/drivers/gpu/nvgpu/clk/clk_domain.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "clk.h" | 26 | #include "clk.h" |
27 | #include "clk_fll.h" | 27 | #include "clk_fll.h" |
28 | #include "clk_domain.h" | 28 | #include "clk_domain.h" |
diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/clk/clk_fll.c index 700aeb2d..105457d7 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.c +++ b/drivers/gpu/nvgpu/clk/clk_fll.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "clk.h" | 26 | #include "clk.h" |
27 | #include "clk_fll.h" | 27 | #include "clk_fll.h" |
28 | #include "clk_domain.h" | 28 | #include "clk_domain.h" |
diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.c b/drivers/gpu/nvgpu/clk/clk_freq_controller.c index f114f5d5..f4d09b0c 100644 --- a/drivers/gpu/nvgpu/clk/clk_freq_controller.c +++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "clk.h" | 26 | #include "clk.h" |
27 | #include "clk_fll.h" | 27 | #include "clk_fll.h" |
28 | #include "clk_domain.h" | 28 | #include "clk_domain.h" |
diff --git a/drivers/gpu/nvgpu/clk/clk_prog.c b/drivers/gpu/nvgpu/clk/clk_prog.c index ae8f8e01..e5c2a295 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.c +++ b/drivers/gpu/nvgpu/clk/clk_prog.c | |||
@@ -22,8 +22,8 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/kmem.h> | 24 | #include <nvgpu/kmem.h> |
25 | #include <nvgpu/gk20a.h> | ||
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | ||
27 | #include "clk.h" | 27 | #include "clk.h" |
28 | #include "clk_prog.h" | 28 | #include "clk_prog.h" |
29 | #include "clk_vf_point.h" | 29 | #include "clk_vf_point.h" |
diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/clk/clk_vf_point.c index 80eefe96..96413c81 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.c +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.c | |||
@@ -20,8 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/gk20a.h> | ||
23 | 24 | ||
24 | #include "gk20a/gk20a.h" | ||
25 | #include "clk.h" | 25 | #include "clk.h" |
26 | #include "clk_vf_point.h" | 26 | #include "clk_vf_point.h" |
27 | #include "boardobj/boardobjgrp.h" | 27 | #include "boardobj/boardobjgrp.h" |
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c index 9a163594..2ff7de19 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.c +++ b/drivers/gpu/nvgpu/clk/clk_vin.c | |||
@@ -23,8 +23,7 @@ | |||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
25 | #include <nvgpu/io.h> | 25 | #include <nvgpu/io.h> |
26 | 26 | #include <nvgpu/gk20a.h> | |
27 | #include "gk20a/gk20a.h" | ||
28 | 27 | ||
29 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
30 | #include "boardobj/boardobjgrp_e32.h" | 29 | #include "boardobj/boardobjgrp_e32.h" |
diff --git a/drivers/gpu/nvgpu/lpwr/lpwr.c b/drivers/gpu/nvgpu/lpwr/lpwr.c index a536bf9e..3c4e4580 100644 --- a/drivers/gpu/nvgpu/lpwr/lpwr.c +++ b/drivers/gpu/nvgpu/lpwr/lpwr.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/pmu.h> | 24 | #include <nvgpu/pmu.h> |
25 | #include <nvgpu/clk_arb.h> | 25 | #include <nvgpu/clk_arb.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "gp106/bios_gp106.h" | 28 | #include "gp106/bios_gp106.h" |
29 | #include "pstate/pstate.h" | 29 | #include "pstate/pstate.h" |
30 | #include "perf/perf.h" | 30 | #include "perf/perf.h" |
diff --git a/drivers/gpu/nvgpu/lpwr/rppg.c b/drivers/gpu/nvgpu/lpwr/rppg.c index 1613e33b..13e81264 100644 --- a/drivers/gpu/nvgpu/lpwr/rppg.c +++ b/drivers/gpu/nvgpu/lpwr/rppg.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/pmu.h> | 23 | #include <nvgpu/pmu.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "gp106/bios_gp106.h" | 26 | #include "gp106/bios_gp106.h" |
27 | #include "pstate/pstate.h" | 27 | #include "pstate/pstate.h" |
28 | #include "lpwr/rppg.h" | 28 | #include "lpwr/rppg.h" |
diff --git a/drivers/gpu/nvgpu/perf/perf.c b/drivers/gpu/nvgpu/perf/perf.c index f8b1daf0..daed6f54 100644 --- a/drivers/gpu/nvgpu/perf/perf.c +++ b/drivers/gpu/nvgpu/perf/perf.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <nvgpu/bug.h> | 23 | #include <nvgpu/bug.h> |
24 | #include <nvgpu/pmu.h> | 24 | #include <nvgpu/pmu.h> |
25 | #include <nvgpu/clk_arb.h> | 25 | #include <nvgpu/clk_arb.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "perf.h" | 28 | #include "perf.h" |
29 | 29 | ||
30 | struct perfrpc_pmucmdhandler_params { | 30 | struct perfrpc_pmucmdhandler_params { |
diff --git a/drivers/gpu/nvgpu/perf/vfe_equ.c b/drivers/gpu/nvgpu/perf/vfe_equ.c index 8b308f37..4e93c82e 100644 --- a/drivers/gpu/nvgpu/perf/vfe_equ.c +++ b/drivers/gpu/nvgpu/perf/vfe_equ.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "perf.h" | 26 | #include "perf.h" |
27 | #include "vfe_equ.h" | 27 | #include "vfe_equ.h" |
28 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
diff --git a/drivers/gpu/nvgpu/perf/vfe_var.c b/drivers/gpu/nvgpu/perf/vfe_var.c index 9be069b0..8518fc26 100644 --- a/drivers/gpu/nvgpu/perf/vfe_var.c +++ b/drivers/gpu/nvgpu/perf/vfe_var.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "perf.h" | 26 | #include "perf.h" |
27 | #include "vfe_var.h" | 27 | #include "vfe_var.h" |
28 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.c b/drivers/gpu/nvgpu/pmgr/pmgr.c index 227a9893..f5be01bf 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgr.c +++ b/drivers/gpu/nvgpu/pmgr/pmgr.c | |||
@@ -20,7 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include <nvgpu/gk20a.h> |
24 | |||
24 | #include "pwrdev.h" | 25 | #include "pwrdev.h" |
25 | #include "pmgrpmu.h" | 26 | #include "pmgrpmu.h" |
26 | 27 | ||
diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c index d0c0e763..411550be 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c +++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <nvgpu/kmem.h> | 23 | #include <nvgpu/kmem.h> |
24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
25 | #include <nvgpu/pmu.h> | 25 | #include <nvgpu/pmu.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "gp106/bios_gp106.h" | 28 | #include "gp106/bios_gp106.h" |
29 | 29 | ||
30 | #include "boardobj/boardobjgrp.h" | 30 | #include "boardobj/boardobjgrp.h" |
diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.h b/drivers/gpu/nvgpu/pmgr/pmgrpmu.h index a576f384..23062b13 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.h +++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.h | |||
@@ -24,7 +24,8 @@ | |||
24 | #ifndef _PMGRPMU_H_ | 24 | #ifndef _PMGRPMU_H_ |
25 | #define _PMGRPMU_H_ | 25 | #define _PMGRPMU_H_ |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include <nvgpu/gk20a.h> |
28 | |||
28 | #include "pwrdev.h" | 29 | #include "pwrdev.h" |
29 | #include "pwrmonitor.h" | 30 | #include "pwrmonitor.h" |
30 | 31 | ||
diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/pmgr/pwrdev.c index 90d39610..cf45f723 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrdev.c +++ b/drivers/gpu/nvgpu/pmgr/pwrdev.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "pwrdev.h" | 26 | #include "pwrdev.h" |
27 | #include "boardobj/boardobjgrp.h" | 27 | #include "boardobj/boardobjgrp.h" |
28 | #include "boardobj/boardobjgrp_e32.h" | 28 | #include "boardobj/boardobjgrp_e32.h" |
diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c index 9b2f91de..28074afb 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c +++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "pwrdev.h" | 26 | #include "pwrdev.h" |
27 | #include "boardobj/boardobjgrp.h" | 27 | #include "boardobj/boardobjgrp.h" |
28 | #include "boardobj/boardobjgrp_e32.h" | 28 | #include "boardobj/boardobjgrp_e32.h" |
diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c index d3fd941e..82cf0e78 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c +++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c | |||
@@ -22,8 +22,8 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/bug.h> | 24 | #include <nvgpu/bug.h> |
25 | #include <nvgpu/gk20a.h> | ||
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | ||
27 | #include "pwrpolicy.h" | 27 | #include "pwrpolicy.h" |
28 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
29 | #include "boardobj/boardobjgrp_e32.h" | 29 | #include "boardobj/boardobjgrp_e32.h" |
diff --git a/drivers/gpu/nvgpu/pstate/pstate.c b/drivers/gpu/nvgpu/pstate/pstate.c index 616d6747..80f3edb6 100644 --- a/drivers/gpu/nvgpu/pstate/pstate.c +++ b/drivers/gpu/nvgpu/pstate/pstate.c | |||
@@ -23,8 +23,8 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <nvgpu/bios.h> | 25 | #include <nvgpu/bios.h> |
26 | #include <nvgpu/gk20a.h> | ||
26 | 27 | ||
27 | #include "gk20a/gk20a.h" | ||
28 | #include "clk/clk.h" | 28 | #include "clk/clk.h" |
29 | #include "perf/perf.h" | 29 | #include "perf/perf.h" |
30 | #include "pmgr/pmgr.h" | 30 | #include "pmgr/pmgr.h" |
diff --git a/drivers/gpu/nvgpu/therm/thrm.c b/drivers/gpu/nvgpu/therm/thrm.c index 8b35b466..c4e27318 100644 --- a/drivers/gpu/nvgpu/therm/thrm.c +++ b/drivers/gpu/nvgpu/therm/thrm.c | |||
@@ -20,7 +20,8 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include <nvgpu/gk20a.h> |
24 | |||
24 | #include "thrm.h" | 25 | #include "thrm.h" |
25 | #include "thrmpmu.h" | 26 | #include "thrmpmu.h" |
26 | 27 | ||
diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.c b/drivers/gpu/nvgpu/therm/thrmchannel.c index 8130656c..419ce0b5 100644 --- a/drivers/gpu/nvgpu/therm/thrmchannel.c +++ b/drivers/gpu/nvgpu/therm/thrmchannel.c | |||
@@ -21,9 +21,9 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 25 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | ||
27 | #include "thrmchannel.h" | 27 | #include "thrmchannel.h" |
28 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
29 | #include "boardobj/boardobjgrp_e32.h" | 29 | #include "boardobj/boardobjgrp_e32.h" |
diff --git a/drivers/gpu/nvgpu/therm/thrmdev.c b/drivers/gpu/nvgpu/therm/thrmdev.c index b0e65af7..63e10331 100644 --- a/drivers/gpu/nvgpu/therm/thrmdev.c +++ b/drivers/gpu/nvgpu/therm/thrmdev.c | |||
@@ -21,9 +21,9 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 25 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | ||
27 | #include "thrmdev.h" | 27 | #include "thrmdev.h" |
28 | #include "boardobj/boardobjgrp.h" | 28 | #include "boardobj/boardobjgrp.h" |
29 | #include "boardobj/boardobjgrp_e32.h" | 29 | #include "boardobj/boardobjgrp_e32.h" |
diff --git a/drivers/gpu/nvgpu/therm/thrmpmu.c b/drivers/gpu/nvgpu/therm/thrmpmu.c index e23d1d63..65587ab4 100644 --- a/drivers/gpu/nvgpu/therm/thrmpmu.c +++ b/drivers/gpu/nvgpu/therm/thrmpmu.c | |||
@@ -19,8 +19,8 @@ | |||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | #include <nvgpu/gk20a.h> | ||
22 | 23 | ||
23 | #include "gk20a/gk20a.h" | ||
24 | #include "boardobj/boardobjgrp.h" | 24 | #include "boardobj/boardobjgrp.h" |
25 | #include "boardobj/boardobjgrp_e32.h" | 25 | #include "boardobj/boardobjgrp_e32.h" |
26 | #include "thrmpmu.h" | 26 | #include "thrmpmu.h" |
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c index b6e69a37..fccd3b03 100644 --- a/drivers/gpu/nvgpu/volt/volt_dev.c +++ b/drivers/gpu/nvgpu/volt/volt_dev.c | |||
@@ -25,8 +25,8 @@ | |||
25 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 25 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
26 | #include <nvgpu/bios.h> | 26 | #include <nvgpu/bios.h> |
27 | #include <nvgpu/kmem.h> | 27 | #include <nvgpu/kmem.h> |
28 | #include <nvgpu/gk20a.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | ||
30 | #include "gp106/bios_gp106.h" | 30 | #include "gp106/bios_gp106.h" |
31 | 31 | ||
32 | #include "boardobj/boardobjgrp.h" | 32 | #include "boardobj/boardobjgrp.h" |
diff --git a/drivers/gpu/nvgpu/volt/volt_pmu.c b/drivers/gpu/nvgpu/volt/volt_pmu.c index 6d92686c..184aa5d0 100644 --- a/drivers/gpu/nvgpu/volt/volt_pmu.c +++ b/drivers/gpu/nvgpu/volt/volt_pmu.c | |||
@@ -22,8 +22,8 @@ | |||
22 | 22 | ||
23 | #include <nvgpu/pmu.h> | 23 | #include <nvgpu/pmu.h> |
24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> | 24 | #include <nvgpu/pmuif/nvgpu_gpmu_cmdif.h> |
25 | #include <nvgpu/gk20a.h> | ||
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | ||
27 | #include "boardobj/boardobjgrp.h" | 27 | #include "boardobj/boardobjgrp.h" |
28 | #include "boardobj/boardobjgrp_e32.h" | 28 | #include "boardobj/boardobjgrp_e32.h" |
29 | #include "gp106/bios_gp106.h" | 29 | #include "gp106/bios_gp106.h" |
diff --git a/drivers/gpu/nvgpu/volt/volt_policy.c b/drivers/gpu/nvgpu/volt/volt_policy.c index e4b081a1..4f9d7ad8 100644 --- a/drivers/gpu/nvgpu/volt/volt_policy.c +++ b/drivers/gpu/nvgpu/volt/volt_policy.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "boardobj/boardobjgrp.h" | 26 | #include "boardobj/boardobjgrp.h" |
27 | #include "boardobj/boardobjgrp_e32.h" | 27 | #include "boardobj/boardobjgrp_e32.h" |
28 | #include "gp106/bios_gp106.h" | 28 | #include "gp106/bios_gp106.h" |
diff --git a/drivers/gpu/nvgpu/volt/volt_rail.c b/drivers/gpu/nvgpu/volt/volt_rail.c index c8dc25f2..37e85761 100644 --- a/drivers/gpu/nvgpu/volt/volt_rail.c +++ b/drivers/gpu/nvgpu/volt/volt_rail.c | |||
@@ -21,8 +21,8 @@ | |||
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <nvgpu/bios.h> | 23 | #include <nvgpu/bios.h> |
24 | #include <nvgpu/gk20a.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | ||
26 | #include "boardobj/boardobjgrp.h" | 26 | #include "boardobj/boardobjgrp.h" |
27 | #include "boardobj/boardobjgrp_e32.h" | 27 | #include "boardobj/boardobjgrp_e32.h" |
28 | #include "gp106/bios_gp106.h" | 28 | #include "gp106/bios_gp106.h" |