diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index d4c368ec4..d0cf7f9b2 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -53,7 +53,12 @@ nvgpu-y += common/bus/bus_gk20a.o \ common/mc/mc_gp10b.o \ common/mc/mc_gv11b.o \ common/mc/mc_gv100.o \ - common/sync/channel_sync.o + common/sync/channel_sync.o \ + common/boardobj/boardobj.o \ + common/boardobj/boardobjgrp.o \ + common/boardobj/boardobjgrpmask.o \ + common/boardobj/boardobjgrp_e255.o \ + common/boardobj/boardobjgrp_e32.o # Linux specific parts of nvgpu. nvgpu-y += \ @@ -254,12 +259,7 @@ nvgpu-y += \ gm20b/acr_gm20b.o \ gm20b/pmu_gm20b.o \ gm20b/mm_gm20b.o \ - gm20b/regops_gm20b.o \ - boardobj/boardobj.o \ - boardobj/boardobjgrp.o \ - boardobj/boardobjgrpmask.o \ - boardobj/boardobjgrp_e255.o \ - boardobj/boardobjgrp_e32.o + gm20b/regops_gm20b.o nvgpu-$(CONFIG_GK20A_VIDMEM) += \ common/mm/vidmem.o diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 81b949737..652c4af19 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -121,11 +121,11 @@ srcs := os/posix/nvgpu.c \ common/mc/mc_gp10b.c \ common/mc/mc_gv11b.c \ common/mc/mc_gv100.c \ - boardobj/boardobj.c \ - boardobj/boardobjgrp.c \ - boardobj/boardobjgrpmask.c \ - boardobj/boardobjgrp_e255.c \ - boardobj/boardobjgrp_e32.c \ + common/boardobj/boardobj.c \ + common/boardobj/boardobjgrp.c \ + common/boardobj/boardobjgrpmask.c \ + common/boardobj/boardobjgrp_e255.c \ + common/boardobj/boardobjgrp_e32.c \ pstate/pstate.c \ volt/volt_dev.c \ volt/volt_pmu.c \ diff --git a/drivers/gpu/nvgpu/clk/clk_domain.c b/drivers/gpu/nvgpu/clk/clk_domain.c index 5f4ef55c7..7b07607be 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.c +++ b/drivers/gpu/nvgpu/clk/clk_domain.c @@ -22,12 +22,12 @@ #include #include +#include +#include #include "clk.h" #include "clk_fll.h" #include "clk_domain.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_domain.h b/drivers/gpu/nvgpu/clk/clk_domain.h index e5a7153e1..c86abf668 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.h +++ b/drivers/gpu/nvgpu/clk/clk_domain.h @@ -26,8 +26,8 @@ #include "ctrl/ctrlclk.h" #include "ctrl/ctrlboardobj.h" #include -#include "boardobj/boardobjgrp_e32.h" -#include "boardobj/boardobjgrpmask.h" +#include +#include #define CLK_DOMAIN_BOARDOBJGRP_VERSION 0x30 #define CLK_TABLE_HAL_ENTRY_GP 0x02 diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/clk/clk_fll.c index 89f566bda..58c9ecf34 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.c +++ b/drivers/gpu/nvgpu/clk/clk_fll.c @@ -22,12 +22,12 @@ #include #include +#include +#include #include "clk.h" #include "clk_fll.h" #include "clk_domain.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_fll.h b/drivers/gpu/nvgpu/clk/clk_fll.h index 6cbdfe2e5..5f7fea4ee 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.h +++ b/drivers/gpu/nvgpu/clk/clk_fll.h @@ -24,8 +24,8 @@ #define NVGPU_CLK_FLL_H #include -#include "boardobj/boardobjgrp_e32.h" -#include "boardobj/boardobjgrpmask.h" +#include +#include /*data and function definition to talk to driver*/ int clk_fll_sw_setup(struct gk20a *g); diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.c b/drivers/gpu/nvgpu/clk/clk_freq_controller.c index 8f4bbe148..e139e564e 100644 --- a/drivers/gpu/nvgpu/clk/clk_freq_controller.c +++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.c @@ -22,13 +22,13 @@ #include #include +#include +#include #include "clk.h" #include "clk_fll.h" #include "clk_domain.h" #include "clk_freq_controller.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_prog.c b/drivers/gpu/nvgpu/clk/clk_prog.c index 1486d1be6..7d2e8e78d 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.c +++ b/drivers/gpu/nvgpu/clk/clk_prog.c @@ -23,12 +23,12 @@ #include #include #include +#include +#include #include "clk.h" #include "clk_prog.h" #include "clk_vf_point.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "gp106/bios_gp106.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_prog.h b/drivers/gpu/nvgpu/clk/clk_prog.h index af6368fd5..206058fa2 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.h +++ b/drivers/gpu/nvgpu/clk/clk_prog.h @@ -25,9 +25,9 @@ #include "ctrl/ctrlclk.h" #include "ctrl/ctrlboardobj.h" #include -#include "boardobj/boardobjgrp_e32.h" -#include "boardobj/boardobjgrp_e255.h" -#include "boardobj/boardobjgrpmask.h" +#include +#include +#include int clk_prog_sw_setup(struct gk20a *g); int clk_prog_pmu_setup(struct gk20a *g); diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/clk/clk_vf_point.c index 96413c813..c49689d36 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.c +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.c @@ -21,11 +21,11 @@ */ #include +#include +#include #include "clk.h" #include "clk_vf_point.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.h b/drivers/gpu/nvgpu/clk/clk_vf_point.h index b72fe64c6..f788c2d5f 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.h +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.h @@ -25,8 +25,8 @@ #include "ctrl/ctrlclk.h" #include "ctrl/ctrlboardobj.h" #include -#include "boardobj/boardobjgrp_e32.h" -#include "boardobj/boardobjgrpmask.h" +#include +#include int clk_vf_point_sw_setup(struct gk20a *g); int clk_vf_point_pmu_setup(struct gk20a *g); diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c index 8f5b44f85..9a4f61ced 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.c +++ b/drivers/gpu/nvgpu/clk/clk_vin.c @@ -24,9 +24,8 @@ #include #include #include - -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" +#include +#include #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/clk/clk_vin.h b/drivers/gpu/nvgpu/clk/clk_vin.h index 73b93e40a..833adf8fc 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.h +++ b/drivers/gpu/nvgpu/clk/clk_vin.h @@ -23,9 +23,9 @@ #ifndef NVGPU_CLK_VIN_H #define NVGPU_CLK_VIN_H -#include "boardobj/boardobj.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" +#include +#include +#include struct vin_device; struct clk_pmupstate; diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.c b/drivers/gpu/nvgpu/common/boardobj/boardobj.c similarity index 99% rename from drivers/gpu/nvgpu/boardobj/boardobj.c rename to drivers/gpu/nvgpu/common/boardobj/boardobj.c index 69a6a4426..765a57cc8 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.c +++ b/drivers/gpu/nvgpu/common/boardobj/boardobj.c @@ -22,8 +22,8 @@ #include #include +#include -#include "boardobj.h" #include "ctrl/ctrlboardobj.h" int boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj, diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp.c similarity index 99% rename from drivers/gpu/nvgpu/boardobj/boardobjgrp.c rename to drivers/gpu/nvgpu/common/boardobj/boardobjgrp.c index 20d8b0491..24f848ade 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c +++ b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp.c @@ -21,10 +21,10 @@ */ #include #include +#include +#include -#include "boardobjgrp.h" #include "ctrl/ctrlboardobj.h" -#include "boardobj.h" static boardobjgrp_objinsert boardobjgrp_objinsert_final; static boardobjgrp_objgetbyidx boardobjgrp_objgetbyidx_final; diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e255.c similarity index 95% rename from drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c rename to drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e255.c index 63546a9b4..42c655703 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c +++ b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e255.c @@ -21,12 +21,12 @@ */ #include +#include +#include +#include +#include -#include "boardobj.h" -#include "boardobjgrp_e255.h" #include "ctrl/ctrlboardobj.h" -#include "boardobjgrp.h" -#include "boardobjgrpmask.h" int boardobjgrpconstruct_e255(struct gk20a *g, struct boardobjgrp_e255 *pboardobjgrp_e255) diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e32.c similarity index 95% rename from drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c rename to drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e32.c index d72e8cb04..ce8f13320 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c +++ b/drivers/gpu/nvgpu/common/boardobj/boardobjgrp_e32.c @@ -20,12 +20,12 @@ * DEALINGS IN THE SOFTWARE. */ #include +#include +#include +#include +#include -#include "boardobj.h" -#include "boardobjgrp.h" -#include "boardobjgrp_e32.h" #include "ctrl/ctrlboardobj.h" -#include "boardobjgrpmask.h" int boardobjgrpconstruct_e32(struct gk20a *g, diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c b/drivers/gpu/nvgpu/common/boardobj/boardobjgrpmask.c similarity index 99% rename from drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c rename to drivers/gpu/nvgpu/common/boardobj/boardobjgrpmask.c index f37ced54b..1c24550ff 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c +++ b/drivers/gpu/nvgpu/common/boardobj/boardobjgrpmask.c @@ -20,8 +20,8 @@ * DEALINGS IN THE SOFTWARE. */ #include +#include -#include "boardobjgrp.h" #include "ctrl/ctrlboardobj.h" /* diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c index 3441cdbe1..8c6b6803f 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c @@ -28,9 +28,8 @@ #include #include #include - -#include "boardobj/boardobj.h" -#include "boardobj/boardobjgrp.h" +#include +#include /* PMU NS UCODE IMG */ #define NVGPU_PMU_NS_UCODE_IMAGE "gpmu_ucode.bin" diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.h b/drivers/gpu/nvgpu/include/nvgpu/boardobj.h similarity index 99% rename from drivers/gpu/nvgpu/boardobj/boardobj.h rename to drivers/gpu/nvgpu/include/nvgpu/boardobj.h index b1be9bd58..8f49e6977 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.h +++ b/drivers/gpu/nvgpu/include/nvgpu/boardobj.h @@ -26,10 +26,9 @@ #include #include -#include "ctrl/ctrlboardobj.h" - struct boardobj; struct nvgpu_list_node; +struct gk20a; /* * check whether the specified BOARDOBJ object implements the queried diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h b/drivers/gpu/nvgpu/include/nvgpu/boardobjgrp.h similarity index 99% rename from drivers/gpu/nvgpu/boardobj/boardobjgrp.h rename to drivers/gpu/nvgpu/include/nvgpu/boardobjgrp.h index cd13b85e1..0ae5bfa89 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h +++ b/drivers/gpu/nvgpu/include/nvgpu/boardobjgrp.h @@ -30,9 +30,8 @@ struct pmu_surface; /* ------------------------ Includes ----------------------------------------*/ -#include "ctrl/ctrlboardobj.h" -#include "boardobj.h" -#include "boardobjgrpmask.h" +#include +#include #include #include diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h b/drivers/gpu/nvgpu/include/nvgpu/boardobjgrp_e255.h similarity index 94% rename from drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h rename to drivers/gpu/nvgpu/include/nvgpu/boardobjgrp_e255.h index bc4054199..4c538c54f 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h +++ b/drivers/gpu/nvgpu/include/nvgpu/boardobjgrp_e255.h @@ -23,10 +23,9 @@ #ifndef NVGPU_BOARDOBJGRP_E255_H #define NVGPU_BOARDOBJGRP_E255_H -#include "ctrl/ctrlboardobj.h" -#include "boardobj.h" -#include "boardobjgrpmask.h" -#include "boardobj/boardobjgrp.h" +#include +#include +#include /* * boardobjgrp_e255 is @ref BOARDOBJGRP child class allowing storage of up diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h b/drivers/gpu/nvgpu/include/nvgpu/boardobjgrp_e32.h similarity index 94% rename from drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h rename to drivers/gpu/nvgpu/include/nvgpu/boardobjgrp_e32.h index d4beb47e8..77b780479 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h +++ b/drivers/gpu/nvgpu/include/nvgpu/boardobjgrp_e32.h @@ -23,11 +23,9 @@ #ifndef NVGPU_BOARDOBJGRP_E32_H #define NVGPU_BOARDOBJGRP_E32_H -#include "ctrl/ctrlboardobj.h" -#include "boardobj.h" -#include "boardobjgrp.h" -#include "boardobjgrpmask.h" -#include "boardobj/boardobjgrp.h" +#include +#include +#include /* * boardobjgrp_e32 is @ref BOARDOBJGRP child class allowing storage of up to 32 diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h b/drivers/gpu/nvgpu/include/nvgpu/boardobjgrpmask.h similarity index 98% rename from drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h rename to drivers/gpu/nvgpu/include/nvgpu/boardobjgrpmask.h index f4ed0af42..803025bfe 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h +++ b/drivers/gpu/nvgpu/include/nvgpu/boardobjgrpmask.h @@ -23,7 +23,9 @@ #ifndef NVGPU_BOARDOBJGRPMASK_H #define NVGPU_BOARDOBJGRPMASK_H -#include "ctrl/ctrlboardobj.h" +#include + +struct ctrl_boardobjgrp_mask; /* diff --git a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c index b6947f201..375afe20c 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgrpmu.c +++ b/drivers/gpu/nvgpu/pmgr/pmgrpmu.c @@ -24,12 +24,11 @@ #include #include #include +#include +#include #include "gp106/bios_gp106.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" - #include "pwrdev.h" #include "pmgrpmu.h" diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/pmgr/pwrdev.c index c1bf08444..a1c729b03 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrdev.c +++ b/drivers/gpu/nvgpu/pmgr/pwrdev.c @@ -22,10 +22,10 @@ #include #include +#include +#include #include "pwrdev.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "gp106/bios_gp106.h" static int _pwr_device_pmudata_instget(struct gk20a *g, diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.h b/drivers/gpu/nvgpu/pmgr/pwrdev.h index 4bcf65a71..a13288b27 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrdev.h +++ b/drivers/gpu/nvgpu/pmgr/pwrdev.h @@ -24,7 +24,7 @@ #ifndef NVGPU_PMGR_PWRDEV_H #define NVGPU_PMGR_PWRDEV_H -#include "boardobj/boardobj.h" +#include #include #include "ctrl/ctrlpmgr.h" diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c index 710ae85ba..c457b921e 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.c +++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.c @@ -22,10 +22,10 @@ #include #include +#include +#include #include "pwrdev.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "gp106/bios_gp106.h" static int _pwr_channel_pmudata_instget(struct gk20a *g, diff --git a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h index bf4c76f9e..7fff71109 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrmonitor.h +++ b/drivers/gpu/nvgpu/pmgr/pwrmonitor.h @@ -25,8 +25,8 @@ #define NVGPU_PMGR_PWRMONITOR_H #include -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobj.h" +#include +#include #include "ctrl/ctrlpmgr.h" struct pwr_channel { diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c index 3bf6f3288..804fddc6a 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.c +++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.c @@ -23,10 +23,10 @@ #include #include #include +#include +#include #include "pwrpolicy.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "gp106/bios_gp106.h" #define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output diff --git a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h index 74f4937d2..41496a4f7 100644 --- a/drivers/gpu/nvgpu/pmgr/pwrpolicy.h +++ b/drivers/gpu/nvgpu/pmgr/pwrpolicy.h @@ -25,8 +25,8 @@ #define NVGPU_PMGR_PWRPOLICY_H #include -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobj.h" +#include +#include #include "ctrl/ctrlpmgr.h" #define PWR_POLICY_EXT_POWER_STATE_ID_COUNT 0x4U diff --git a/drivers/gpu/nvgpu/pmu_perf/pmu_perf.h b/drivers/gpu/nvgpu/pmu_perf/pmu_perf.h index 5b68d6964..365593294 100644 --- a/drivers/gpu/nvgpu/pmu_perf/pmu_perf.h +++ b/drivers/gpu/nvgpu/pmu_perf/pmu_perf.h @@ -28,7 +28,6 @@ #include "pstate/pstate.h" #include "volt/volt.h" #include "lpwr/lpwr.h" -#include "boardobj/boardobjgrp_e255.h" #define CTRL_PERF_VFE_VAR_TYPE_INVALID 0x00U #define CTRL_PERF_VFE_VAR_TYPE_DERIVED 0x01U diff --git a/drivers/gpu/nvgpu/pmu_perf/vfe_equ.c b/drivers/gpu/nvgpu/pmu_perf/vfe_equ.c index 1c4cbd5ec..e7dbda1d0 100644 --- a/drivers/gpu/nvgpu/pmu_perf/vfe_equ.c +++ b/drivers/gpu/nvgpu/pmu_perf/vfe_equ.c @@ -22,11 +22,11 @@ #include #include +#include +#include #include "pmu_perf.h" #include "vfe_equ.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e255.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/pmu_perf/vfe_equ.h b/drivers/gpu/nvgpu/pmu_perf/vfe_equ.h index 6131d0908..79aba1c98 100644 --- a/drivers/gpu/nvgpu/pmu_perf/vfe_equ.h +++ b/drivers/gpu/nvgpu/pmu_perf/vfe_equ.h @@ -24,7 +24,7 @@ #ifndef NVGPU_PERF_VFE_EQU_H #define NVGPU_PERF_VFE_EQU_H -#include "boardobj/boardobjgrp.h" +#include #include "vfe_var.h" #include diff --git a/drivers/gpu/nvgpu/pmu_perf/vfe_var.c b/drivers/gpu/nvgpu/pmu_perf/vfe_var.c index 754b22940..4a973ac02 100644 --- a/drivers/gpu/nvgpu/pmu_perf/vfe_var.c +++ b/drivers/gpu/nvgpu/pmu_perf/vfe_var.c @@ -22,11 +22,11 @@ #include #include +#include +#include #include "pmu_perf.h" #include "vfe_var.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" #include "ctrl/ctrlperf.h" diff --git a/drivers/gpu/nvgpu/pmu_perf/vfe_var.h b/drivers/gpu/nvgpu/pmu_perf/vfe_var.h index 98b7c40b0..1500ba41c 100644 --- a/drivers/gpu/nvgpu/pmu_perf/vfe_var.h +++ b/drivers/gpu/nvgpu/pmu_perf/vfe_var.h @@ -23,7 +23,7 @@ #ifndef NVGPU_PERF_VFE_VAR_H #define NVGPU_PERF_VFE_VAR_H -#include "boardobj/boardobjgrp.h" +#include #include int vfe_var_sw_setup(struct gk20a *g); diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.c b/drivers/gpu/nvgpu/therm/thrmchannel.c index 419ce0b50..caaf871e5 100644 --- a/drivers/gpu/nvgpu/therm/thrmchannel.c +++ b/drivers/gpu/nvgpu/therm/thrmchannel.c @@ -23,10 +23,10 @@ #include #include #include +#include +#include #include "thrmchannel.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "gp106/bios_gp106.h" static int _therm_channel_pmudatainit_device(struct gk20a *g, diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.h b/drivers/gpu/nvgpu/therm/thrmchannel.h index 89be673f4..57280ac72 100644 --- a/drivers/gpu/nvgpu/therm/thrmchannel.h +++ b/drivers/gpu/nvgpu/therm/thrmchannel.h @@ -24,8 +24,8 @@ #ifndef NVGPU_THERM_THRMCHANNEL_H #define NVGPU_THERM_THRMCHANNEL_H -#include "boardobj/boardobj.h" -#include "boardobj/boardobjgrp.h" +#include +#include #include "ctrl/ctrltherm.h" struct therm_channel { diff --git a/drivers/gpu/nvgpu/therm/thrmdev.c b/drivers/gpu/nvgpu/therm/thrmdev.c index 63e103314..1ef1332e2 100644 --- a/drivers/gpu/nvgpu/therm/thrmdev.c +++ b/drivers/gpu/nvgpu/therm/thrmdev.c @@ -23,10 +23,10 @@ #include #include #include +#include +#include #include "thrmdev.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "gp106/bios_gp106.h" #include "ctrl/ctrltherm.h" diff --git a/drivers/gpu/nvgpu/therm/thrmdev.h b/drivers/gpu/nvgpu/therm/thrmdev.h index 151e96fba..f05eeab96 100644 --- a/drivers/gpu/nvgpu/therm/thrmdev.h +++ b/drivers/gpu/nvgpu/therm/thrmdev.h @@ -24,8 +24,8 @@ #ifndef NVGPU_THERM_THRMDEV_H #define NVGPU_THERM_THRMDEV_H -#include "boardobj/boardobj.h" -#include "boardobj/boardobjgrp.h" +#include +#include struct therm_devices { struct boardobjgrp_e32 super; diff --git a/drivers/gpu/nvgpu/therm/thrmpmu.c b/drivers/gpu/nvgpu/therm/thrmpmu.c index 65587ab45..1765c9dfe 100644 --- a/drivers/gpu/nvgpu/therm/thrmpmu.c +++ b/drivers/gpu/nvgpu/therm/thrmpmu.c @@ -20,9 +20,9 @@ * DEALINGS IN THE SOFTWARE. */ #include +#include +#include -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "thrmpmu.h" #include diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c index bb5d1821e..5d98cde46 100644 --- a/drivers/gpu/nvgpu/volt/volt_dev.c +++ b/drivers/gpu/nvgpu/volt/volt_dev.c @@ -26,11 +26,11 @@ #include #include #include +#include +#include #include "gp106/bios_gp106.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "ctrl/ctrlvolt.h" #include "volt.h" diff --git a/drivers/gpu/nvgpu/volt/volt_dev.h b/drivers/gpu/nvgpu/volt/volt_dev.h index 48d93aea9..e36f5627d 100644 --- a/drivers/gpu/nvgpu/volt/volt_dev.h +++ b/drivers/gpu/nvgpu/volt/volt_dev.h @@ -23,8 +23,8 @@ #ifndef NVGPU_VOLT_DEV_H #define NVGPU_VOLT_DEV_H -#include "boardobj/boardobj.h" -#include "boardobj/boardobjgrp.h" +#include +#include #include "ctrl/ctrlvolt.h" #define VOLTAGE_TABLE_MAX_ENTRIES_ONE 1U diff --git a/drivers/gpu/nvgpu/volt/volt_pmu.c b/drivers/gpu/nvgpu/volt/volt_pmu.c index 2249ae24b..11367077e 100644 --- a/drivers/gpu/nvgpu/volt/volt_pmu.c +++ b/drivers/gpu/nvgpu/volt/volt_pmu.c @@ -23,9 +23,9 @@ #include #include #include +#include +#include -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "gp106/bios_gp106.h" #include "ctrl/ctrlvolt.h" #include "ctrl/ctrlperf.h" diff --git a/drivers/gpu/nvgpu/volt/volt_policy.c b/drivers/gpu/nvgpu/volt/volt_policy.c index cc60730d0..cb5e3d620 100644 --- a/drivers/gpu/nvgpu/volt/volt_policy.c +++ b/drivers/gpu/nvgpu/volt/volt_policy.c @@ -22,9 +22,9 @@ #include #include +#include +#include -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "gp106/bios_gp106.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/volt/volt_rail.c b/drivers/gpu/nvgpu/volt/volt_rail.c index caf297f08..77470112c 100644 --- a/drivers/gpu/nvgpu/volt/volt_rail.c +++ b/drivers/gpu/nvgpu/volt/volt_rail.c @@ -22,9 +22,9 @@ #include #include +#include +#include -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" #include "gp106/bios_gp106.h" #include "ctrl/ctrlvolt.h" diff --git a/drivers/gpu/nvgpu/volt/volt_rail.h b/drivers/gpu/nvgpu/volt/volt_rail.h index 72bb25464..c73f315d9 100644 --- a/drivers/gpu/nvgpu/volt/volt_rail.h +++ b/drivers/gpu/nvgpu/volt/volt_rail.h @@ -24,8 +24,8 @@ #ifndef NVGPU_VOLT_RAIL_H #define NVGPU_VOLT_RAIL_H -#include "boardobj/boardobj.h" -#include "boardobj/boardobjgrp.h" +#include +#include #define CTRL_VOLT_RAIL_VOLT_DELTA_MAX_ENTRIES 0x04U #define CTRL_PMGR_PWR_EQUATION_INDEX_INVALID 0xFFU