From c26ae849b5f837361d8ae9c9f236795d6a9451ef Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Wed, 10 Apr 2019 18:06:21 +0530 Subject: [PATCH] gpu: nvgpu: create common.hal.ptimer unit Create common.hal.ptimer unit by moving all ptimer chip files under hal/ directory Update Makefiles and include paths accordingly Jira NVGPU-2028 Change-Id: Ie5ce1cf4604ee26bc51bad8856a4141df085d451 Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/2094289 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 2 +- drivers/gpu/nvgpu/Makefile.sources | 2 +- drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 2 +- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 2 +- drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 +- drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 +- drivers/gpu/nvgpu/{common => hal}/ptimer/ptimer_gk20a.c | 0 drivers/gpu/nvgpu/{common => hal}/ptimer/ptimer_gk20a.h | 0 drivers/gpu/nvgpu/tu104/hal_tu104.c | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename drivers/gpu/nvgpu/{common => hal}/ptimer/ptimer_gk20a.c (100%) rename drivers/gpu/nvgpu/{common => hal}/ptimer/ptimer_gk20a.h (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 5a6aaf4c2..b450b0b7e 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -35,7 +35,6 @@ obj-$(CONFIG_GK20A) := nvgpu.o nvgpu-y += \ common/ptimer/ptimer.o \ - common/ptimer/ptimer_gk20a.o \ common/perf/perfbuf.o \ common/xve/xve_gp106.o \ common/therm/therm.o \ @@ -201,6 +200,7 @@ nvgpu-y += \ hal/cbc/cbc_gp10b.o \ hal/cbc/cbc_gv11b.o \ hal/cbc/cbc_tu104.o \ + hal/ptimer/ptimer_gk20a.o \ hal/regops/regops_gm20b.o \ hal/regops/regops_gp10b.o \ hal/regops/regops_gv100.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index e3171fe57..08ec50b14 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -232,7 +232,6 @@ srcs += common/sim.c \ common/pmu/pmgr/pwrpolicy.c \ common/pmu/lpwr/lpwr.c \ common/pmu/lpwr/rppg.c \ - common/ptimer/ptimer_gk20a.c \ common/clk_arb/clk_arb.c \ common/clk_arb/clk_arb_gp10b.c \ common/clk_arb/clk_arb_gv100.c \ @@ -333,6 +332,7 @@ srcs += common/sim.c \ hal/cbc/cbc_gp10b.c \ hal/cbc/cbc_gv11b.c \ hal/cbc/cbc_tu104.c \ + hal/ptimer/ptimer_gk20a.c \ hal/regops/regops_gm20b.c \ hal/regops/regops_gp10b.c \ hal/regops/regops_gv100.c \ diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index a6388f306..2edd2bf64 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -56,6 +56,7 @@ #include "hal/ltc/intr/ltc_intr_gm20b.h" #include "hal/fb/fb_gm20b.h" #include "hal/fuse/fuse_gm20b.h" +#include "hal/ptimer/ptimer_gk20a.h" #include "hal/regops/regops_gm20b.h" #include "hal/fifo/pbdma_gm20b.h" #include "hal/fifo/engines_gm20b.h" @@ -83,7 +84,6 @@ #include "hal/pmu/pmu_hal_gk20a.h" #include "hal/netlist/netlist_gm20b.h" -#include "common/ptimer/ptimer_gk20a.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 c35912426..fd7ecc3b2 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -65,6 +65,7 @@ #include "hal/fb/fb_gp10b.h" #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" +#include "hal/ptimer/ptimer_gk20a.h" #include "hal/regops/regops_gp10b.h" #include "hal/fifo/pbdma_gm20b.h" #include "hal/fifo/pbdma_gp10b.h" @@ -102,7 +103,6 @@ #include "hal/pmu/pmu_hal_gk20a.h" #include "hal/netlist/netlist_gp10b.h" -#include "common/ptimer/ptimer_gk20a.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 99419fa29..8f193c860 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -52,6 +52,7 @@ #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" #include "hal/fuse/fuse_gp106.h" +#include "hal/ptimer/ptimer_gk20a.h" #include "hal/regops/regops_gv100.h" #include "hal/fifo/pbdma_gm20b.h" #include "hal/fifo/pbdma_gp10b.h" @@ -103,7 +104,6 @@ #include "hal/sec2/sec2_gp106.h" #include "hal/netlist/netlist_gv100.h" -#include "common/ptimer/ptimer_gk20a.h" #include "common/xve/xve_gp106.h" #include "common/top/top_gm20b.h" #include "common/top/top_gp10b.h" diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 9d49068b1..82ab77bc7 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -55,6 +55,7 @@ #include "hal/fb/intr/fb_intr_gv11b.h" #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" +#include "hal/ptimer/ptimer_gk20a.h" #include "hal/regops/regops_gv11b.h" #include "hal/fifo/pbdma_gm20b.h" #include "hal/fifo/pbdma_gp10b.h" @@ -101,7 +102,6 @@ #include "hal/pmu/pmu_hal_gk20a.h" #include "hal/netlist/netlist_gv11b.h" -#include "common/ptimer/ptimer_gk20a.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/ptimer/ptimer_gk20a.c b/drivers/gpu/nvgpu/hal/ptimer/ptimer_gk20a.c similarity index 100% rename from drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.c rename to drivers/gpu/nvgpu/hal/ptimer/ptimer_gk20a.c diff --git a/drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.h b/drivers/gpu/nvgpu/hal/ptimer/ptimer_gk20a.h similarity index 100% rename from drivers/gpu/nvgpu/common/ptimer/ptimer_gk20a.h rename to drivers/gpu/nvgpu/hal/ptimer/ptimer_gk20a.h diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index bd099e8c5..f2d159190 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -53,6 +53,7 @@ #include "hal/fb/fb_gv100.h" #include "hal/fb/fb_tu104.h" #include "hal/fb/intr/fb_intr_tu104.h" +#include "hal/ptimer/ptimer_gk20a.h" #include "hal/regops/regops_tu104.h" #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" @@ -109,7 +110,6 @@ #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/pmu/pmu_gk20a.h" #include "common/pmu/pmu_gm20b.h"