diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index b14d97023..0ab05f674 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -46,10 +46,6 @@ nvgpu-y += \ common/perf/perfbuf.o \ common/xve/xve_gp106.o \ common/therm/therm.o \ - common/therm/therm_gm20b.o \ - common/therm/therm_gp10b.o \ - common/therm/therm_gp106.o \ - common/therm/therm_gv11b.o \ common/top/top_gm20b.o \ common/top/top_gp10b.o \ common/top/top_gv100.o \ @@ -186,6 +182,10 @@ nvgpu-y += \ hal/cbc/cbc_gp10b.o \ hal/cbc/cbc_gv11b.o \ hal/cbc/cbc_tu104.o \ + hal/therm/therm_gm20b.o \ + hal/therm/therm_gp10b.o \ + hal/therm/therm_gp106.o \ + hal/therm/therm_gv11b.o \ hal/fuse/fuse_gm20b.o \ hal/fuse/fuse_gp10b.o \ hal/fuse/fuse_gp106.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 7c50c406e..dc824e595 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -85,10 +85,6 @@ srcs += common/sim.c \ common/init/hal_init.c \ common/xve/xve_gp106.c \ common/therm/therm.c \ - common/therm/therm_gm20b.c \ - common/therm/therm_gp10b.c \ - common/therm/therm_gv11b.c \ - common/therm/therm_gp106.c \ common/perf/perf_gm20b.c \ common/perf/perf_gv11b.c \ common/perf/perfbuf.c \ @@ -350,6 +346,10 @@ srcs += common/sim.c \ hal/cbc/cbc_gp10b.c \ hal/cbc/cbc_gv11b.c \ hal/cbc/cbc_tu104.c \ + hal/therm/therm_gm20b.c \ + hal/therm/therm_gp10b.c \ + hal/therm/therm_gv11b.c \ + hal/therm/therm_gp106.c \ hal/fuse/fuse_gm20b.c \ hal/fuse/fuse_gp10b.c \ hal/fuse/fuse_gp106.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 ab1453f70..a61859fac 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -23,6 +23,8 @@ #include "hal/bus/bus_gk20a.h" #include "hal/bus/bus_gm20b.h" #include "hal/fifo/engines_gm20b.h" +#include "hal/therm/therm_gm20b.h" +#include "hal/therm/therm_gp10b.h" #include "common/fb/fb_gm20b.h" #include "common/fb/fb_gp10b.h" @@ -31,8 +33,6 @@ #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/therm/therm_gm20b.h" -#include "common/therm/therm_gp10b.h" #include "common/perf/perf_gm20b.h" #include "common/ltc/ltc_gm20b.h" #include "common/ltc/ltc_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 0aaf9f212..5b6cfeb96 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -23,6 +23,9 @@ #include "hal/bus/bus_gk20a.h" #include "hal/bus/bus_gm20b.h" #include "hal/fifo/engines_gv11b.h" +#include "hal/therm/therm_gm20b.h" +#include "hal/therm/therm_gp10b.h" +#include "hal/therm/therm_gv11b.h" #include "common/fb/fb_gm20b.h" #include "common/fb/fb_gp10b.h" @@ -33,9 +36,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gv11b.h" #include "common/gr/fecs_trace/fecs_trace_gv11b.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h" -#include "common/therm/therm_gm20b.h" -#include "common/therm/therm_gp10b.h" -#include "common/therm/therm_gv11b.h" #include "common/perf/perf_gv11b.h" #include "common/ltc/ltc_gm20b.h" #include "common/ltc/ltc_gp10b.h" diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index a2adef41d..119193c91 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -42,6 +42,7 @@ #include "hal/priv_ring/priv_ring_gm20b.h" #include "hal/power_features/cg/gm20b_gating_reglist.h" #include "hal/cbc/cbc_gm20b.h" +#include "hal/therm/therm_gm20b.h" #include "hal/fuse/fuse_gm20b.h" #include "hal/fifo/engines_gm20b.h" #include "hal/gr/init/gr_init_gm20b.h" @@ -52,7 +53,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #include "common/gr/config/gr_config_gm20b.h" #include "common/gr/zbc/gr_zbc_gm20b.h" -#include "common/therm/therm_gm20b.h" #include "common/ltc/ltc_gm20b.h" #include "common/mc/mc_gm20b.h" #include "common/perf/perf_gm20b.h" diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index abcaaee09..feb5868de 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -47,6 +47,8 @@ #include "hal/power_features/cg/gp10b_gating_reglist.h" #include "hal/cbc/cbc_gm20b.h" #include "hal/cbc/cbc_gp10b.h" +#include "hal/therm/therm_gm20b.h" +#include "hal/therm/therm_gp10b.h" #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" #include "hal/fifo/engines_gm20b.h" @@ -62,8 +64,6 @@ #include "common/gr/zbc/gr_zbc_gp10b.h" #include "common/gr/fecs_trace/fecs_trace_gm20b.h" #include "common/gr/fecs_trace/fecs_trace_gp10b.h" -#include "common/therm/therm_gm20b.h" -#include "common/therm/therm_gp10b.h" #include "common/ltc/ltc_gm20b.h" #include "common/ltc/ltc_gp10b.h" #include "common/mc/mc_gm20b.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 3f679e32e..1006a7f01 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -30,6 +30,10 @@ #include "hal/power_features/cg/gv100_gating_reglist.h" #include "hal/cbc/cbc_gm20b.h" #include "hal/cbc/cbc_gp10b.h" +#include "hal/therm/therm_gm20b.h" +#include "hal/therm/therm_gp106.h" +#include "hal/therm/therm_gp10b.h" +#include "hal/therm/therm_gv11b.h" #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" #include "hal/fuse/fuse_gp106.h" @@ -52,10 +56,6 @@ #include "common/gr/zbc/gr_zbc_gp10b.h" #include "common/gr/zbc/gr_zbc_gv11b.h" #include "common/gr/fecs_trace/fecs_trace_gm20b.h" -#include "common/therm/therm_gm20b.h" -#include "common/therm/therm_gp106.h" -#include "common/therm/therm_gp10b.h" -#include "common/therm/therm_gv11b.h" #include "common/ltc/ltc_gm20b.h" #include "common/ltc/ltc_gp10b.h" #include "common/ltc/ltc_gv11b.h" diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index cfb3465a4..067416077 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -34,6 +34,9 @@ #include "hal/cbc/cbc_gm20b.h" #include "hal/cbc/cbc_gp10b.h" #include "hal/cbc/cbc_gv11b.h" +#include "hal/therm/therm_gm20b.h" +#include "hal/therm/therm_gp10b.h" +#include "hal/therm/therm_gv11b.h" #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" #include "hal/fifo/engines_gv11b.h" @@ -53,9 +56,6 @@ #include "common/gr/zbc/gr_zbc_gv11b.h" #include "common/gr/fecs_trace/fecs_trace_gm20b.h" #include "common/gr/fecs_trace/fecs_trace_gv11b.h" -#include "common/therm/therm_gm20b.h" -#include "common/therm/therm_gp10b.h" -#include "common/therm/therm_gv11b.h" #include "common/ltc/ltc_gm20b.h" #include "common/ltc/ltc_gp10b.h" #include "common/ltc/ltc_gv11b.h" diff --git a/drivers/gpu/nvgpu/common/therm/therm_gm20b.c b/drivers/gpu/nvgpu/hal/therm/therm_gm20b.c similarity index 100% rename from drivers/gpu/nvgpu/common/therm/therm_gm20b.c rename to drivers/gpu/nvgpu/hal/therm/therm_gm20b.c diff --git a/drivers/gpu/nvgpu/common/therm/therm_gm20b.h b/drivers/gpu/nvgpu/hal/therm/therm_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/common/therm/therm_gm20b.h rename to drivers/gpu/nvgpu/hal/therm/therm_gm20b.h diff --git a/drivers/gpu/nvgpu/common/therm/therm_gp106.c b/drivers/gpu/nvgpu/hal/therm/therm_gp106.c similarity index 100% rename from drivers/gpu/nvgpu/common/therm/therm_gp106.c rename to drivers/gpu/nvgpu/hal/therm/therm_gp106.c diff --git a/drivers/gpu/nvgpu/common/therm/therm_gp106.h b/drivers/gpu/nvgpu/hal/therm/therm_gp106.h similarity index 100% rename from drivers/gpu/nvgpu/common/therm/therm_gp106.h rename to drivers/gpu/nvgpu/hal/therm/therm_gp106.h diff --git a/drivers/gpu/nvgpu/common/therm/therm_gp10b.c b/drivers/gpu/nvgpu/hal/therm/therm_gp10b.c similarity index 100% rename from drivers/gpu/nvgpu/common/therm/therm_gp10b.c rename to drivers/gpu/nvgpu/hal/therm/therm_gp10b.c diff --git a/drivers/gpu/nvgpu/common/therm/therm_gp10b.h b/drivers/gpu/nvgpu/hal/therm/therm_gp10b.h similarity index 100% rename from drivers/gpu/nvgpu/common/therm/therm_gp10b.h rename to drivers/gpu/nvgpu/hal/therm/therm_gp10b.h diff --git a/drivers/gpu/nvgpu/common/therm/therm_gv11b.c b/drivers/gpu/nvgpu/hal/therm/therm_gv11b.c similarity index 100% rename from drivers/gpu/nvgpu/common/therm/therm_gv11b.c rename to drivers/gpu/nvgpu/hal/therm/therm_gv11b.c diff --git a/drivers/gpu/nvgpu/common/therm/therm_gv11b.h b/drivers/gpu/nvgpu/hal/therm/therm_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/common/therm/therm_gv11b.h rename to drivers/gpu/nvgpu/hal/therm/therm_gv11b.h diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index 7bee7bd29..4d0dddfab 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -32,6 +32,10 @@ #include "hal/cbc/cbc_gm20b.h" #include "hal/cbc/cbc_gp10b.h" #include "hal/cbc/cbc_tu104.h" +#include "hal/therm/therm_gm20b.h" +#include "hal/therm/therm_gp10b.h" +#include "hal/therm/therm_gp106.h" +#include "hal/therm/therm_gv11b.h" #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" #include "hal/fuse/fuse_gp106.h" @@ -56,10 +60,6 @@ #include "common/gr/zbc/gr_zbc_gv11b.h" #include "common/gr/fecs_trace/fecs_trace_gm20b.h" #include "common/gr/fecs_trace/fecs_trace_gv11b.h" -#include "common/therm/therm_gm20b.h" -#include "common/therm/therm_gp10b.h" -#include "common/therm/therm_gp106.h" -#include "common/therm/therm_gv11b.h" #include "common/ltc/ltc_gm20b.h" #include "common/ltc/ltc_gp10b.h" #include "common/ltc/ltc_gv11b.h"