diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 50f0bbb23..9b5d3b1ec 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -36,8 +36,6 @@ obj-$(CONFIG_GK20A) := nvgpu.o nvgpu-y += \ common/ptimer/ptimer.o \ common/ptimer/ptimer_gk20a.o \ - common/perf/perf_gm20b.o \ - common/perf/perf_gv11b.o \ common/perf/perfbuf.o \ common/xve/xve_gp106.o \ common/therm/therm.o \ @@ -194,6 +192,8 @@ nvgpu-y += \ hal/gr/zbc/zbc_gm20b.o \ hal/gr/zbc/zbc_gp10b.o \ hal/gr/zbc/zbc_gv11b.o \ + hal/perf/perf_gm20b.o \ + hal/perf/perf_gv11b.o \ hal/priv_ring/priv_ring_gm20b.o \ hal/priv_ring/priv_ring_gp10b.o \ hal/power_features/cg/gm20b_gating_reglist.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 765ced1fe..024fa65a7 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -80,8 +80,6 @@ srcs += common/sim.c \ common/init/hal_init.c \ common/xve/xve_gp106.c \ common/therm/therm.c \ - common/perf/perf_gm20b.c \ - common/perf/perf_gv11b.c \ common/perf/perfbuf.c \ common/perf/cyclestats_snapshot.c \ common/top/top_gm20b.c \ @@ -325,6 +323,8 @@ srcs += common/sim.c \ hal/gr/zbc/zbc_gm20b.c \ hal/gr/zbc/zbc_gp10b.c \ hal/gr/zbc/zbc_gv11b.c \ + hal/perf/perf_gm20b.c \ + hal/perf/perf_gv11b.c \ hal/priv_ring/priv_ring_gm20b.c \ hal/priv_ring/priv_ring_gp10b.c \ hal/power_features/cg/gm20b_gating_reglist.c \ diff --git a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c index eb0f40741..91bdd3b03 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -45,8 +45,8 @@ #include "hal/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #include "hal/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "hal/netlist/netlist_gp10b.h" +#include "hal/perf/perf_gm20b.h" -#include "common/perf/perf_gm20b.h" #include "common/regops/regops_gp10b.h" #include "common/fifo/channel_gm20b.h" #include "common/clk_arb/clk_arb_gp10b.h" diff --git a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c index 44a85857b..bff7adf09 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -57,9 +57,9 @@ #include "hal/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #include "hal/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "hal/gr/ctxsw_prog/ctxsw_prog_gv11b.h" +#include "hal/perf/perf_gv11b.h" #include "hal/netlist/netlist_gv11b.h" -#include "common/perf/perf_gv11b.h" #include "common/sync/syncpt_cmdbuf_gv11b.h" #include "common/sync/sema_cmdbuf_gv11b.h" #include "common/regops/regops_gv11b.h" diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 371ca609e..618fe6086 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -77,11 +77,11 @@ #include "hal/gr/config/gr_config_gm20b.h" #include "hal/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #include "hal/falcon/falcon_gk20a.h" +#include "hal/perf/perf_gm20b.h" #include "hal/pmu/pmu_hal_gk20a.h" #include "hal/netlist/netlist_gm20b.h" #include "common/ptimer/ptimer_gk20a.h" -#include "common/perf/perf_gm20b.h" #include "common/pmu/pmu_gk20a.h" #include "common/pmu/pmu_gm20b.h" #include "common/top/top_gm20b.h" diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index bd47ede99..4771ff05d 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -96,11 +96,11 @@ #include "hal/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #include "hal/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "hal/falcon/falcon_gk20a.h" +#include "hal/perf/perf_gm20b.h" #include "hal/pmu/pmu_hal_gk20a.h" #include "hal/netlist/netlist_gp10b.h" #include "common/ptimer/ptimer_gk20a.h" -#include "common/perf/perf_gm20b.h" #include "common/pmu/pmu_gk20a.h" #include "common/pmu/pmu_gm20b.h" #include "common/pmu/pmu_gp10b.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index beee16857..edfa1b91a 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -97,6 +97,7 @@ #include "hal/falcon/falcon_gk20a.h" #include "hal/nvdec/nvdec_gp106.h" #include "hal/gsp/gsp_gv100.h" +#include "hal/perf/perf_gv11b.h" #include "hal/pmu/pmu_hal_gk20a.h" #include "hal/sec2/sec2_gp106.h" #include "hal/netlist/netlist_gv100.h" @@ -106,7 +107,6 @@ #include "common/top/top_gm20b.h" #include "common/top/top_gp10b.h" #include "common/top/top_gv100.h" -#include "common/perf/perf_gv11b.h" #include "common/pmu/pmu_gk20a.h" #include "common/pmu/pmu_gm20b.h" #include "common/pmu/pmu_gp10b.h" diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 40d15574c..13c320270 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -95,11 +95,11 @@ #include "hal/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "hal/gr/ctxsw_prog/ctxsw_prog_gv11b.h" #include "hal/falcon/falcon_gk20a.h" +#include "hal/perf/perf_gv11b.h" #include "hal/pmu/pmu_hal_gk20a.h" #include "hal/netlist/netlist_gv11b.h" #include "common/ptimer/ptimer_gk20a.h" -#include "common/perf/perf_gv11b.h" #include "common/pmu/pmu_gk20a.h" #include "common/pmu/pmu_gm20b.h" #include "common/pmu/pmu_gp10b.h" diff --git a/drivers/gpu/nvgpu/common/perf/perf_gm20b.c b/drivers/gpu/nvgpu/hal/perf/perf_gm20b.c similarity index 100% rename from drivers/gpu/nvgpu/common/perf/perf_gm20b.c rename to drivers/gpu/nvgpu/hal/perf/perf_gm20b.c diff --git a/drivers/gpu/nvgpu/common/perf/perf_gm20b.h b/drivers/gpu/nvgpu/hal/perf/perf_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/common/perf/perf_gm20b.h rename to drivers/gpu/nvgpu/hal/perf/perf_gm20b.h diff --git a/drivers/gpu/nvgpu/common/perf/perf_gv11b.c b/drivers/gpu/nvgpu/hal/perf/perf_gv11b.c similarity index 100% rename from drivers/gpu/nvgpu/common/perf/perf_gv11b.c rename to drivers/gpu/nvgpu/hal/perf/perf_gv11b.c diff --git a/drivers/gpu/nvgpu/common/perf/perf_gv11b.h b/drivers/gpu/nvgpu/hal/perf/perf_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/common/perf/perf_gv11b.h rename to drivers/gpu/nvgpu/hal/perf/perf_gv11b.h diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index bf505dc07..042b4edb9 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -103,13 +103,13 @@ #include "hal/falcon/falcon_gk20a.h" #include "hal/nvdec/nvdec_tu104.h" #include "hal/gsp/gsp_gv100.h" +#include "hal/perf/perf_gv11b.h" #include "hal/pmu/pmu_hal_gk20a.h" #include "hal/sec2/sec2_tu104.h" #include "hal/netlist/netlist_tu104.h" #include "common/ptimer/ptimer_gk20a.h" #include "common/xve/xve_gp106.h" -#include "common/perf/perf_gv11b.h" #include "common/pmu/pmu_gk20a.h" #include "common/pmu/pmu_gm20b.h" #include "common/pmu/pmu_gp10b.h"