From 998c59883453388f9e4a8eb391b7604c069154a6 Mon Sep 17 00:00:00 2001 From: ddutta Date: Fri, 14 Sep 2018 15:34:20 +0530 Subject: gpu: nvgpu: change location of gk20a.h Update the location of gk20a.h to include/nvgpu/gk20a.h in the following directories. nvgpu/boardobj/ nvgpu/clk/ nvgpu/lpwr/ nvgpu/perf/ nvgpu/pmgr/ nvgpu/pstate/ nvgpu/therm/ nvgpu/volt/ Jira NVGPU-597 Change-Id: I5d9e74ae2f1a646087f15a5872daf9017c1580a9 Signed-off-by: Debarshi Dutta Reviewed-on: https://git-master.nvidia.com/r/1822741 Reviewed-by: svc-misra-checker Reviewed-by: Konsta Holtta GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/boardobj/boardobj.c | 2 +- drivers/gpu/nvgpu/boardobj/boardobjgrp.c | 2 +- drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c | 3 ++- drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c | 2 +- drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c | 3 ++- drivers/gpu/nvgpu/clk/clk.c | 2 +- drivers/gpu/nvgpu/clk/clk_arb.c | 2 +- drivers/gpu/nvgpu/clk/clk_domain.c | 2 +- drivers/gpu/nvgpu/clk/clk_fll.c | 2 +- drivers/gpu/nvgpu/clk/clk_freq_controller.c | 2 +- drivers/gpu/nvgpu/clk/clk_prog.c | 2 +- drivers/gpu/nvgpu/clk/clk_vf_point.c | 2 +- drivers/gpu/nvgpu/clk/clk_vin.c | 3 +-- drivers/gpu/nvgpu/lpwr/lpwr.c | 2 +- drivers/gpu/nvgpu/lpwr/rppg.c | 2 +- drivers/gpu/nvgpu/perf/perf.c | 2 +- drivers/gpu/nvgpu/perf/vfe_equ.c | 2 +- drivers/gpu/nvgpu/perf/vfe_var.c | 2 +- drivers/gpu/nvgpu/pmgr/pmgr.c | 3 ++- drivers/gpu/nvgpu/pmgr/pmgrpmu.c | 2 +- drivers/gpu/nvgpu/pmgr/pmgrpmu.h | 3 ++- drivers/gpu/nvgpu/pmgr/pwrdev.c | 2 +- drivers/gpu/nvgpu/pmgr/pwrmonitor.c | 2 +- drivers/gpu/nvgpu/pmgr/pwrpolicy.c | 2 +- drivers/gpu/nvgpu/pstate/pstate.c | 2 +- drivers/gpu/nvgpu/therm/thrm.c | 3 ++- drivers/gpu/nvgpu/therm/thrmchannel.c | 2 +- drivers/gpu/nvgpu/therm/thrmdev.c | 2 +- drivers/gpu/nvgpu/therm/thrmpmu.c | 2 +- drivers/gpu/nvgpu/volt/volt_dev.c | 2 +- drivers/gpu/nvgpu/volt/volt_pmu.c | 2 +- drivers/gpu/nvgpu/volt/volt_policy.c | 2 +- drivers/gpu/nvgpu/volt/volt_rail.c | 2 +- 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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "boardobj.h" #include "ctrl/ctrlboardobj.h" 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 @@ * DEALINGS IN THE SOFTWARE. */ #include +#include -#include "gk20a/gk20a.h" #include "boardobjgrp.h" #include "ctrl/ctrlboardobj.h" #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 @@ * DEALINGS IN THE SOFTWARE. */ -#include "gk20a/gk20a.h" +#include + #include "boardobj.h" #include "boardobjgrp_e255.h" #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 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ +#include -#include "gk20a/gk20a.h" #include "boardobj.h" #include "boardobjgrp.h" #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 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include "gk20a/gk20a.h" +#include + #include "boardobjgrp.h" #include "ctrl/ctrlboardobj.h" 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 @@ #include #include +#include -#include "gk20a/gk20a.h" #include "clk.h" #include "ctrl/ctrlclk.h" #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 @@ #include #include #include +#include -#include "gk20a/gk20a.h" #include "clk/clk.h" #include "pstate/pstate.h" #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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "clk.h" #include "clk_fll.h" #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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "clk.h" #include "clk_fll.h" #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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "clk.h" #include "clk_fll.h" #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 @@ #include #include +#include -#include "gk20a/gk20a.h" #include "clk.h" #include "clk_prog.h" #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 @@ * DEALINGS IN THE SOFTWARE. */ +#include -#include "gk20a/gk20a.h" #include "clk.h" #include "clk_vf_point.h" #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 @@ #include #include #include - -#include "gk20a/gk20a.h" +#include #include "boardobj/boardobjgrp.h" #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 @@ #include #include #include +#include -#include "gk20a/gk20a.h" #include "gp106/bios_gp106.h" #include "pstate/pstate.h" #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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "gp106/bios_gp106.h" #include "pstate/pstate.h" #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 @@ #include #include #include +#include -#include "gk20a/gk20a.h" #include "perf.h" 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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "perf.h" #include "vfe_equ.h" #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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "perf.h" #include "vfe_var.h" #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 @@ * DEALINGS IN THE SOFTWARE. */ -#include "gk20a/gk20a.h" +#include + #include "pwrdev.h" #include "pmgrpmu.h" 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 @@ #include #include #include +#include -#include "gk20a/gk20a.h" #include "gp106/bios_gp106.h" #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 @@ #ifndef _PMGRPMU_H_ #define _PMGRPMU_H_ -#include "gk20a/gk20a.h" +#include + #include "pwrdev.h" #include "pwrmonitor.h" 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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "pwrdev.h" #include "boardobj/boardobjgrp.h" #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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "pwrdev.h" #include "boardobj/boardobjgrp.h" #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 @@ #include #include +#include -#include "gk20a/gk20a.h" #include "pwrpolicy.h" #include "boardobj/boardobjgrp.h" #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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "clk/clk.h" #include "perf/perf.h" #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 @@ * DEALINGS IN THE SOFTWARE. */ -#include "gk20a/gk20a.h" +#include + #include "thrm.h" #include "thrmpmu.h" 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 @@ */ #include +#include #include -#include "gk20a/gk20a.h" #include "thrmchannel.h" #include "boardobj/boardobjgrp.h" #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 @@ */ #include +#include #include -#include "gk20a/gk20a.h" #include "thrmdev.h" #include "boardobj/boardobjgrp.h" #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 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ +#include -#include "gk20a/gk20a.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" #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 @@ #include #include #include +#include -#include "gk20a/gk20a.h" #include "gp106/bios_gp106.h" #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 @@ #include #include +#include -#include "gk20a/gk20a.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" #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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" #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 @@ */ #include +#include -#include "gk20a/gk20a.h" #include "boardobj/boardobjgrp.h" #include "boardobj/boardobjgrp_e32.h" #include "gp106/bios_gp106.h" -- cgit v1.2.2