diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index baf14947a..fba51ec7c 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -72,9 +72,6 @@ nvgpu-y += \ common/ltc/ltc.o \ common/gr/gr.o \ common/cbc/cbc.o \ - common/gr/ctxsw_prog/ctxsw_prog_gm20b.o \ - common/gr/ctxsw_prog/ctxsw_prog_gp10b.o \ - common/gr/ctxsw_prog/ctxsw_prog_gv11b.o \ common/gr/global_ctx.o \ common/gr/ctx.o \ common/gr/gr_falcon.o \ @@ -173,6 +170,9 @@ nvgpu-y += \ hal/gr/fecs_trace/fecs_trace_gv11b.o \ hal/gr/zcull/zcull_gm20b.o \ hal/gr/zcull/zcull_gv11b.o \ + hal/gr/ctxsw_prog/ctxsw_prog_gm20b.o \ + hal/gr/ctxsw_prog/ctxsw_prog_gp10b.o \ + hal/gr/ctxsw_prog/ctxsw_prog_gv11b.o \ hal/gr/init/gr_init_gm20b.o \ hal/gr/init/gr_init_gp10b.o \ hal/gr/init/gr_init_gv100.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 3d2baad12..f26651e13 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -107,9 +107,6 @@ srcs += common/sim.c \ common/engine_queues/engine_emem_queue.c \ common/engine_queues/engine_fb_queue.c \ common/gr/gr.c \ - common/gr/ctxsw_prog/ctxsw_prog_gm20b.c \ - common/gr/ctxsw_prog/ctxsw_prog_gp10b.c \ - common/gr/ctxsw_prog/ctxsw_prog_gv11b.c \ common/gr/global_ctx.c \ common/gr/subctx.c \ common/gr/ctx.c \ @@ -304,6 +301,9 @@ srcs += common/sim.c \ hal/gr/fecs_trace/fecs_trace_gv11b.c \ hal/gr/zcull/zcull_gm20b.c \ hal/gr/zcull/zcull_gv11b.c \ + hal/gr/ctxsw_prog/ctxsw_prog_gm20b.c \ + hal/gr/ctxsw_prog/ctxsw_prog_gp10b.c \ + hal/gr/ctxsw_prog/ctxsw_prog_gv11b.c \ hal/gr/init/gr_init_gm20b.c \ hal/gr/init/gr_init_gp10b.c \ hal/gr/init/gr_init_gv100.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 a9b2c8408..66674fdd0 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -36,10 +36,10 @@ #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/init/gr_init_gp10b.h" #include "hal/gr/config/gr_config_gm20b.h" +#include "hal/gr/ctxsw_prog/ctxsw_prog_gm20b.h" +#include "hal/gr/ctxsw_prog/ctxsw_prog_gp10b.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/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 c656f91ec..fc47f6641 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -45,11 +45,11 @@ #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/init/gr_init_gp10b.h" #include "hal/gr/init/gr_init_gv11b.h" +#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 "common/netlist/netlist_gv11b.h" -#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/perf/perf_gv11b.h" #include "common/sync/syncpt_cmdbuf_gv11b.h" #include "common/sync/sema_cmdbuf_gv11b.h" diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 469f2170e..9116874a6 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -63,11 +63,11 @@ #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/intr/gr_intr_gm20b.h" #include "hal/gr/config/gr_config_gm20b.h" +#include "hal/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #include "hal/falcon/falcon_gk20a.h" #include "common/ptimer/ptimer_gk20a.h" #include "common/netlist/netlist_gm20b.h" -#include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #include "common/mc/mc_gm20b.h" #include "common/perf/perf_gm20b.h" #include "common/pmu/pmu_gk20a.h" diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index eba38f1f3..8e9dabb3e 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -76,12 +76,12 @@ #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/init/gr_init_gp10b.h" #include "hal/gr/intr/gr_intr_gm20b.h" +#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 "common/ptimer/ptimer_gk20a.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/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 492de6112..4a1f9d3de 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -74,15 +74,15 @@ #include "hal/gr/zcull/zcull_gv11b.h" #include "hal/gr/falcon/gr_falcon_gm20b.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h" +#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/falcon/falcon_gk20a.h" #include "hal/gsp/gsp_gv100.h" #include "common/ptimer/ptimer_gk20a.h" #include "common/xve/xve_gp106.h" #include "common/netlist/netlist_gv100.h" -#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/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 494fda930..d0eac8ac1 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -74,13 +74,13 @@ #include "hal/gr/intr/gr_intr_gm20b.h" #include "hal/gr/intr/gr_intr_gv11b.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h" +#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/falcon/falcon_gk20a.h" #include "common/ptimer/ptimer_gk20a.h" #include "common/netlist/netlist_gv11b.h" -#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/mc/mc_gm20b.h" #include "common/mc/mc_gp10b.h" #include "common/mc/mc_gv11b.h" diff --git a/drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gm20b.c b/drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gm20b.c similarity index 100% rename from drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gm20b.c rename to drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gm20b.c diff --git a/drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gm20b.h b/drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gm20b.h rename to drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gm20b.h diff --git a/drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gp10b.c b/drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gp10b.c similarity index 100% rename from drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gp10b.c rename to drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gp10b.c diff --git a/drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gp10b.h b/drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gp10b.h similarity index 100% rename from drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gp10b.h rename to drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gp10b.h diff --git a/drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gv11b.c b/drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gv11b.c similarity index 100% rename from drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gv11b.c rename to drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gv11b.c diff --git a/drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gv11b.h b/drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/common/gr/ctxsw_prog/ctxsw_prog_gv11b.h rename to drivers/gpu/nvgpu/hal/gr/ctxsw_prog/ctxsw_prog_gv11b.h diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index 1550f7ee2..efe616918 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -80,15 +80,15 @@ #include "hal/gr/intr/gr_intr_gv11b.h" #include "hal/gr/intr/gr_intr_tu104.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h" +#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/falcon/falcon_gk20a.h" #include "hal/gsp/gsp_gv100.h" #include "common/ptimer/ptimer_gk20a.h" #include "common/xve/xve_gp106.h" #include "common/netlist/netlist_tu104.h" -#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/mc/mc_gm20b.h" #include "common/mc/mc_gp10b.h" #include "common/mc/mc_gv11b.h"