diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 3c221d636..385baf3ec 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -166,6 +166,8 @@ nvgpu-y += \ hal/class/class_gp10b.o \ hal/class/class_gv11b.o \ hal/class/class_tu104.o \ + hal/clk/clk_gm20b.o \ + hal/clk/clk_gv100.o \ hal/gr/ecc/ecc_gp10b.o \ hal/gr/ecc/ecc_gv11b.o \ hal/gr/ecc/ecc_tu104.o \ @@ -507,7 +509,6 @@ nvgpu-y += \ gk20a/gr_gk20a.o \ gk20a/mm_gk20a.o \ gm20b/gr_gm20b.o \ - gm20b/clk_gm20b.o \ gm20b/mm_gm20b.o nvgpu-$(CONFIG_GK20A_VIDMEM) += \ @@ -562,7 +563,6 @@ nvgpu-y += \ gv100/bios_gv100.o \ gv100/fifo_gv100.o \ gv100/gr_gv100.o \ - gv100/clk_gv100.o \ tu104/mm_tu104.o \ tu104/fifo_tu104.o \ tu104/gr_tu104.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index ecbeaa5af..be52e22c6 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -244,7 +244,6 @@ srcs += common/sim/sim.c \ gk20a/gr_gk20a.c \ gk20a/mm_gk20a.c \ gm20b/gr_gm20b.c \ - gm20b/clk_gm20b.c \ gm20b/mm_gm20b.c \ gp10b/gr_gp10b.c \ gp10b/mm_gp10b.c \ @@ -256,7 +255,6 @@ srcs += common/sim/sim.c \ gv100/bios_gv100.c \ gv100/fifo_gv100.c \ gv100/gr_gv100.c \ - gv100/clk_gv100.c \ tu104/bios_tu104.c \ tu104/fbpa_tu104.c \ tu104/fifo_tu104.c \ @@ -279,6 +277,8 @@ srcs += common/sim/sim.c \ hal/class/class_gp10b.c \ hal/class/class_gv11b.c \ hal/class/class_tu104.c \ + hal/clk/clk_gm20b.c \ + hal/clk/clk_gv100.c \ hal/gr/ecc/ecc_gp10b.c \ hal/gr/ecc/ecc_gv11b.c \ hal/gr/ecc/ecc_tu104.c \ diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.h b/drivers/gpu/nvgpu/hal/clk/clk_gk20a.h similarity index 100% rename from drivers/gpu/nvgpu/gk20a/clk_gk20a.h rename to drivers/gpu/nvgpu/hal/clk/clk_gk20a.h diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/hal/clk/clk_gm20b.c similarity index 100% rename from drivers/gpu/nvgpu/gm20b/clk_gm20b.c rename to drivers/gpu/nvgpu/hal/clk/clk_gm20b.c diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.h b/drivers/gpu/nvgpu/hal/clk/clk_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/gm20b/clk_gm20b.h rename to drivers/gpu/nvgpu/hal/clk/clk_gm20b.h diff --git a/drivers/gpu/nvgpu/gv100/clk_gv100.c b/drivers/gpu/nvgpu/hal/clk/clk_gv100.c similarity index 100% rename from drivers/gpu/nvgpu/gv100/clk_gv100.c rename to drivers/gpu/nvgpu/hal/clk/clk_gv100.c diff --git a/drivers/gpu/nvgpu/gv100/clk_gv100.h b/drivers/gpu/nvgpu/hal/clk/clk_gv100.h similarity index 100% rename from drivers/gpu/nvgpu/gv100/clk_gv100.h rename to drivers/gpu/nvgpu/hal/clk/clk_gv100.h diff --git a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c index 1e07dc989..0f419efcc 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c @@ -85,6 +85,7 @@ #include "hal/falcon/falcon_gk20a.h" #include "hal/perf/perf_gm20b.h" #include "hal/netlist/netlist_gm20b.h" +#include "hal/clk/clk_gm20b.h" #include "common/top/top_gm20b.h" #include "common/sync/syncpt_cmdbuf_gk20a.h" @@ -95,7 +96,6 @@ #include "gm20b/gr_gm20b.h" #include "gm20b/mm_gm20b.h" -#include "gm20b/clk_gm20b.h" #include "hal_gm20b.h" #include diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv100.c b/drivers/gpu/nvgpu/hal/init/hal_gv100.c index 46ac72876..4151f4e59 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gv100.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gv100.c @@ -148,7 +148,7 @@ #include "gv100/fifo_gv100.h" #include "gv100/gr_gv100.h" #include "gv100/mm_gv100.h" -#include "gv100/clk_gv100.h" +#include "hal/clk/clk_gv100.h" #include #include diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c index 0fae7bf4e..d8e2aafd6 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c +++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c @@ -147,7 +147,7 @@ #include "gm20b/gr_gm20b.h" #include "gm20b/mm_gm20b.h" -#include "gv100/clk_gv100.h" +#include "hal/clk/clk_gv100.h" #include "gp10b/gr_gp10b.h" diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h index f66b1b7aa..99f2be9a6 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h @@ -108,7 +108,7 @@ typedef void (*global_ctx_mem_destroy_fn)(struct gk20a *g, #include #include -#include "gk20a/clk_gk20a.h" +#include "hal/clk/clk_gk20a.h" #include "gk20a/fifo_gk20a.h" #include "gk20a/gr_gk20a.h" diff --git a/drivers/gpu/nvgpu/os/linux/debug_clk_gm20b.c b/drivers/gpu/nvgpu/os/linux/debug_clk_gm20b.c index b8b95fd7e..a9139ed8a 100644 --- a/drivers/gpu/nvgpu/os/linux/debug_clk_gm20b.c +++ b/drivers/gpu/nvgpu/os/linux/debug_clk_gm20b.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 NVIDIA Corporation. All rights reserved. + * Copyright (C) 2017-2019 NVIDIA Corporation. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -19,7 +19,7 @@ #include #include -#include "gm20b/clk_gm20b.h" +#include "hal/clk/clk_gm20b.h" #include "os_linux.h" #include "platform_gk20a.h" diff --git a/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.c b/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.c index 6b9176798..0ba8b0c0a 100644 --- a/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.c +++ b/drivers/gpu/nvgpu/os/linux/debug_clk_gv100.c @@ -28,7 +28,7 @@ #include #include -#include "gv100/clk_gv100.h" +#include "hal/clk/clk_gv100.h" #include "common/pmu/clk/clk_freq_controller.h" void nvgpu_clk_arb_pstate_change_lock(struct gk20a *g, bool lock); diff --git a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c index 390a1a71e..02acb96f5 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c @@ -47,7 +47,7 @@ #include #include -#include "gm20b/clk_gm20b.h" +#include "hal/clk/clk_gm20b.h" #include "scale.h" #include "platform_gk20a.h"