diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index bef0f2e32..09884cb4b 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -80,9 +80,6 @@ nvgpu-y += \ common/gr/config/gr_config.o \ common/gr/config/gr_config_gm20b.o \ common/gr/fecs_trace/fecs_trace.o \ - common/gr/fecs_trace/fecs_trace_gm20b.o \ - common/gr/fecs_trace/fecs_trace_gp10b.o \ - common/gr/fecs_trace/fecs_trace_gv11b.o \ common/gr/zbc.o \ common/gr/hwpm_map.o \ common/netlist/netlist.o \ @@ -166,6 +163,9 @@ nvgpu-y += \ hal/bus/bus_gp10b.o \ hal/bus/bus_gv100.o \ hal/bus/bus_tu104.o \ + hal/gr/fecs_trace/fecs_trace_gm20b.o \ + hal/gr/fecs_trace/fecs_trace_gp10b.o \ + hal/gr/fecs_trace/fecs_trace_gv11b.o \ hal/gr/init/gr_init_gm20b.o \ hal/gr/init/gr_init_gp10b.o \ hal/gr/init/gr_init_gv11b.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index e0090ef97..dff8d783d 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -116,9 +116,6 @@ srcs += common/sim.c \ common/gr/config/gr_config.c \ common/gr/config/gr_config_gm20b.c \ common/gr/fecs_trace/fecs_trace.c \ - common/gr/fecs_trace/fecs_trace_gm20b.c \ - common/gr/fecs_trace/fecs_trace_gp10b.c \ - common/gr/fecs_trace/fecs_trace_gv11b.c \ common/gr/zbc.c \ common/gr/hwpm_map.c \ common/netlist/netlist.c \ @@ -322,6 +319,9 @@ srcs += common/sim.c \ hal/bus/bus_gp10b.c \ hal/bus/bus_gv100.c \ hal/bus/bus_tu104.c \ + hal/gr/fecs_trace/fecs_trace_gm20b.c \ + hal/gr/fecs_trace/fecs_trace_gp10b.c \ + hal/gr/fecs_trace/fecs_trace_gv11b.c \ hal/gr/init/gr_init_gm20b.c \ hal/gr/init/gr_init_gp10b.c \ hal/gr/init/gr_init_gv11b.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 3bce2d6fa..f19182379 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -29,12 +29,12 @@ #include "hal/ltc/ltc_gp10b.h" #include "hal/fb/fb_gm20b.h" #include "hal/fb/fb_gp10b.h" +#include "hal/gr/fecs_trace/fecs_trace_gm20b.h" #include "common/netlist/netlist_gp10b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "common/gr/config/gr_config_gm20b.h" -#include "common/gr/fecs_trace/fecs_trace_gm20b.h" #include "common/perf/perf_gm20b.h" #include "common/regops/regops_gp10b.h" #include "common/fifo/runlist_gk20a.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 c275e91c8..2131aade5 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -26,6 +26,7 @@ #include "hal/therm/therm_gm20b.h" #include "hal/therm/therm_gp10b.h" #include "hal/therm/therm_gv11b.h" +#include "hal/gr/fecs_trace/fecs_trace_gv11b.h" #include "hal/gr/zbc/zbc_gv11b.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h" #include "hal/ltc/ltc_gm20b.h" @@ -39,7 +40,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gv11b.h" -#include "common/gr/fecs_trace/fecs_trace_gv11b.h" #include "common/perf/perf_gv11b.h" #include "common/sync/syncpt_cmdbuf_gv11b.h" #include "common/sync/sema_cmdbuf_gv11b.h" diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index cbd3d1e19..cb5db925b 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -55,6 +55,8 @@ #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" #include "hal/fifo/engines_gm20b.h" +#include "hal/gr/fecs_trace/fecs_trace_gm20b.h" +#include "hal/gr/fecs_trace/fecs_trace_gp10b.h" #include "hal/gr/zbc/zbc_gp10b.h" #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/init/gr_init_gp10b.h" @@ -65,8 +67,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "common/gr/config/gr_config_gm20b.h" -#include "common/gr/fecs_trace/fecs_trace_gm20b.h" -#include "common/gr/fecs_trace/fecs_trace_gp10b.h" #include "common/mc/mc_gm20b.h" #include "common/mc/mc_gp10b.h" #include "common/perf/perf_gm20b.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 915dca6e0..1df8cfce2 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -46,6 +46,7 @@ #include "hal/fuse/fuse_gp10b.h" #include "hal/fuse/fuse_gp106.h" #include "hal/fifo/engines_gv11b.h" +#include "hal/gr/fecs_trace/fecs_trace_gm20b.h" #include "hal/gr/zbc/zbc_gp10b.h" #include "hal/gr/zbc/zbc_gv11b.h" #include "hal/gr/init/gr_init_gm20b.h" @@ -61,7 +62,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gv11b.h" #include "common/gr/config/gr_config_gm20b.h" -#include "common/gr/fecs_trace/fecs_trace_gm20b.h" #include "common/top/top_gm20b.h" #include "common/top/top_gp10b.h" #include "common/top/top_gv100.h" diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 047c883d2..ae417c971 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -46,6 +46,8 @@ #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" #include "hal/fifo/engines_gv11b.h" +#include "hal/gr/fecs_trace/fecs_trace_gm20b.h" +#include "hal/gr/fecs_trace/fecs_trace_gv11b.h" #include "hal/gr/zbc/zbc_gp10b.h" #include "hal/gr/zbc/zbc_gv11b.h" #include "hal/gr/init/gr_init_gm20b.h" @@ -60,8 +62,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gv11b.h" #include "common/gr/config/gr_config_gm20b.h" -#include "common/gr/fecs_trace/fecs_trace_gm20b.h" -#include "common/gr/fecs_trace/fecs_trace_gv11b.h" #include "common/mc/mc_gm20b.h" #include "common/mc/mc_gp10b.h" #include "common/mc/mc_gv11b.h" diff --git a/drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gm20b.c b/drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gm20b.c similarity index 100% rename from drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gm20b.c rename to drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gm20b.c diff --git a/drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gm20b.h b/drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gm20b.h rename to drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gm20b.h diff --git a/drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gp10b.c b/drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gp10b.c similarity index 100% rename from drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gp10b.c rename to drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gp10b.c diff --git a/drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gp10b.h b/drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gp10b.h similarity index 100% rename from drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gp10b.h rename to drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gp10b.h diff --git a/drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gv11b.c b/drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gv11b.c similarity index 100% rename from drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gv11b.c rename to drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gv11b.c diff --git a/drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gv11b.h b/drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/common/gr/fecs_trace/fecs_trace_gv11b.h rename to drivers/gpu/nvgpu/hal/gr/fecs_trace/fecs_trace_gv11b.h diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index b75e38cef..92204598c 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -50,6 +50,8 @@ #include "hal/fuse/fuse_gp10b.h" #include "hal/fuse/fuse_gp106.h" #include "hal/fifo/engines_gv11b.h" +#include "hal/gr/fecs_trace/fecs_trace_gm20b.h" +#include "hal/gr/fecs_trace/fecs_trace_gv11b.h" #include "hal/gr/zbc/zbc_gp10b.h" #include "hal/gr/zbc/zbc_gv11b.h" #include "hal/gr/init/gr_init_gm20b.h" @@ -66,8 +68,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gv11b.h" #include "common/gr/config/gr_config_gm20b.h" -#include "common/gr/fecs_trace/fecs_trace_gm20b.h" -#include "common/gr/fecs_trace/fecs_trace_gv11b.h" #include "common/mc/mc_gm20b.h" #include "common/mc/mc_gp10b.h" #include "common/mc/mc_gv11b.h"