From 88c8baa29fc845e9373e70c66e37dc0e6eebf512 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Wed, 10 Apr 2019 18:00:53 +0530 Subject: [PATCH] gpu: nvgpu: create common.hal.regops unit Create common.hal.regops unit by moving all regops chip files under hal/ directory Update Makefiles and include paths accordingly Jira NVGPU-2037 Change-Id: Iac1833b8916d919f7d448d17f5dd7a853760f55c Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/2094288 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 10 +++++----- drivers/gpu/nvgpu/Makefile.sources | 10 +++++----- drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c | 2 +- drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c | 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 +- .../gpu/nvgpu/{common => hal}/regops/regops_gm20b.c | 0 .../gpu/nvgpu/{common => hal}/regops/regops_gm20b.h | 0 .../gpu/nvgpu/{common => hal}/regops/regops_gp10b.c | 0 .../gpu/nvgpu/{common => hal}/regops/regops_gp10b.h | 0 .../gpu/nvgpu/{common => hal}/regops/regops_gv100.c | 0 .../gpu/nvgpu/{common => hal}/regops/regops_gv100.h | 0 .../gpu/nvgpu/{common => hal}/regops/regops_gv11b.c | 0 .../gpu/nvgpu/{common => hal}/regops/regops_gv11b.h | 0 .../gpu/nvgpu/{common => hal}/regops/regops_tu104.c | 0 .../gpu/nvgpu/{common => hal}/regops/regops_tu104.h | 0 drivers/gpu/nvgpu/tu104/hal_tu104.c | 2 +- 19 files changed, 17 insertions(+), 17 deletions(-) rename drivers/gpu/nvgpu/{common => hal}/regops/regops_gm20b.c (100%) rename drivers/gpu/nvgpu/{common => hal}/regops/regops_gm20b.h (100%) rename drivers/gpu/nvgpu/{common => hal}/regops/regops_gp10b.c (100%) rename drivers/gpu/nvgpu/{common => hal}/regops/regops_gp10b.h (100%) rename drivers/gpu/nvgpu/{common => hal}/regops/regops_gv100.c (100%) rename drivers/gpu/nvgpu/{common => hal}/regops/regops_gv100.h (100%) rename drivers/gpu/nvgpu/{common => hal}/regops/regops_gv11b.c (100%) rename drivers/gpu/nvgpu/{common => hal}/regops/regops_gv11b.h (100%) rename drivers/gpu/nvgpu/{common => hal}/regops/regops_tu104.c (100%) rename drivers/gpu/nvgpu/{common => hal}/regops/regops_tu104.h (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index afc3ef7e1..5a6aaf4c2 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -57,11 +57,6 @@ nvgpu-y += \ common/boardobj/boardobjgrp_e255.o \ common/boardobj/boardobjgrp_e32.o \ common/regops/regops.o \ - common/regops/regops_gm20b.o \ - common/regops/regops_gp10b.o \ - common/regops/regops_gv100.o \ - common/regops/regops_gv11b.o \ - common/regops/regops_tu104.o \ common/ltc/ltc.o \ common/cbc/cbc.o \ common/gr/gr.o \ @@ -206,6 +201,11 @@ nvgpu-y += \ hal/cbc/cbc_gp10b.o \ hal/cbc/cbc_gv11b.o \ hal/cbc/cbc_tu104.o \ + hal/regops/regops_gm20b.o \ + hal/regops/regops_gp10b.o \ + hal/regops/regops_gv100.o \ + hal/regops/regops_gv11b.o \ + hal/regops/regops_tu104.o \ hal/therm/therm_gm20b.o \ hal/therm/therm_gp10b.o \ hal/therm/therm_gp106.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index b029a1e53..e3171fe57 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -196,11 +196,6 @@ srcs += common/sim.c \ common/boardobj/boardobjgrp_e255.c \ common/boardobj/boardobjgrp_e32.c \ common/regops/regops.c \ - common/regops/regops_gm20b.c \ - common/regops/regops_gp10b.c \ - common/regops/regops_gv100.c \ - common/regops/regops_gv11b.c \ - common/regops/regops_tu104.c \ common/pmu/super_surface/super_surface.c \ common/pmu/lsfm/lsfm.c \ common/pmu/lsfm/lsfm_sw_gm20b.c \ @@ -338,6 +333,11 @@ srcs += common/sim.c \ hal/cbc/cbc_gp10b.c \ hal/cbc/cbc_gv11b.c \ hal/cbc/cbc_tu104.c \ + hal/regops/regops_gm20b.c \ + hal/regops/regops_gp10b.c \ + hal/regops/regops_gv100.c \ + hal/regops/regops_gv11b.c \ + hal/regops/regops_tu104.c \ hal/therm/therm_gm20b.c \ hal/therm/therm_gp10b.c \ hal/therm/therm_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 07c3f339b..b5d7f94b4 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -22,6 +22,7 @@ #include "hal/bus/bus_gk20a.h" #include "hal/bus/bus_gm20b.h" +#include "hal/regops/regops_gp10b.h" #include "hal/fifo/engines_gm20b.h" #include "hal/fifo/pbdma_gm20b.h" #include "hal/fifo/pbdma_gp10b.h" @@ -47,7 +48,6 @@ #include "hal/netlist/netlist_gp10b.h" #include "hal/perf/perf_gm20b.h" -#include "common/regops/regops_gp10b.h" #include "common/fifo/channel_gm20b.h" #include "common/clk_arb/clk_arb_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 db36f352c..9640cbb16 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -22,6 +22,7 @@ #include "hal/bus/bus_gk20a.h" #include "hal/bus/bus_gm20b.h" +#include "hal/regops/regops_gv11b.h" #include "hal/fifo/engines_gv11b.h" #include "hal/fifo/pbdma_gm20b.h" #include "hal/fifo/pbdma_gp10b.h" @@ -62,7 +63,6 @@ #include "common/sync/syncpt_cmdbuf_gv11b.h" #include "common/sync/sema_cmdbuf_gv11b.h" -#include "common/regops/regops_gv11b.h" #include "common/fifo/channel_gv11b.h" #include "common/clk_arb/clk_arb_gp10b.h" diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 7f813456e..a6388f306 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/regops/regops_gm20b.h" #include "hal/fifo/pbdma_gm20b.h" #include "hal/fifo/engines_gm20b.h" #include "hal/fifo/engine_status_gm20b.h" @@ -88,7 +89,6 @@ #include "common/top/top_gm20b.h" #include "common/sync/syncpt_cmdbuf_gk20a.h" #include "common/sync/sema_cmdbuf_gk20a.h" -#include "common/regops/regops_gm20b.h" #include "common/fifo/channel_gk20a.h" #include "common/fifo/channel_gm20b.h" diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index f42e86c3d..c35912426 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/regops/regops_gp10b.h" #include "hal/fifo/pbdma_gm20b.h" #include "hal/fifo/pbdma_gp10b.h" #include "hal/fifo/engines_gm20b.h" @@ -110,7 +111,6 @@ #include "common/top/top_gp10b.h" #include "common/sync/syncpt_cmdbuf_gk20a.h" #include "common/sync/sema_cmdbuf_gk20a.h" -#include "common/regops/regops_gp10b.h" #include "common/fifo/channel_gk20a.h" #include "common/fifo/channel_gm20b.h" #include "common/clk_arb/clk_arb_gp10b.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index b81b762cb..99419fa29 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/regops/regops_gv100.h" #include "hal/fifo/pbdma_gm20b.h" #include "hal/fifo/pbdma_gp10b.h" #include "hal/fifo/pbdma_gv11b.h" @@ -122,7 +123,6 @@ #include "common/pmu/perf/perf_gv100.h" #include "common/sync/syncpt_cmdbuf_gv11b.h" #include "common/sync/sema_cmdbuf_gv11b.h" -#include "common/regops/regops_gv100.h" #include "common/fifo/channel_gk20a.h" #include "common/fifo/channel_gm20b.h" #include "common/fifo/channel_gv11b.h" diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 411a19b47..9d49068b1 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/regops/regops_gv11b.h" #include "hal/fifo/pbdma_gm20b.h" #include "hal/fifo/pbdma_gp10b.h" #include "hal/fifo/pbdma_gv11b.h" @@ -112,7 +113,6 @@ #include "common/top/top_gp10b.h" #include "common/sync/syncpt_cmdbuf_gv11b.h" #include "common/sync/sema_cmdbuf_gv11b.h" -#include "common/regops/regops_gv11b.h" #include "common/fifo/channel_gk20a.h" #include "common/fifo/channel_gm20b.h" #include "common/fifo/channel_gv11b.h" diff --git a/drivers/gpu/nvgpu/common/regops/regops_gm20b.c b/drivers/gpu/nvgpu/hal/regops/regops_gm20b.c similarity index 100% rename from drivers/gpu/nvgpu/common/regops/regops_gm20b.c rename to drivers/gpu/nvgpu/hal/regops/regops_gm20b.c diff --git a/drivers/gpu/nvgpu/common/regops/regops_gm20b.h b/drivers/gpu/nvgpu/hal/regops/regops_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/common/regops/regops_gm20b.h rename to drivers/gpu/nvgpu/hal/regops/regops_gm20b.h diff --git a/drivers/gpu/nvgpu/common/regops/regops_gp10b.c b/drivers/gpu/nvgpu/hal/regops/regops_gp10b.c similarity index 100% rename from drivers/gpu/nvgpu/common/regops/regops_gp10b.c rename to drivers/gpu/nvgpu/hal/regops/regops_gp10b.c diff --git a/drivers/gpu/nvgpu/common/regops/regops_gp10b.h b/drivers/gpu/nvgpu/hal/regops/regops_gp10b.h similarity index 100% rename from drivers/gpu/nvgpu/common/regops/regops_gp10b.h rename to drivers/gpu/nvgpu/hal/regops/regops_gp10b.h diff --git a/drivers/gpu/nvgpu/common/regops/regops_gv100.c b/drivers/gpu/nvgpu/hal/regops/regops_gv100.c similarity index 100% rename from drivers/gpu/nvgpu/common/regops/regops_gv100.c rename to drivers/gpu/nvgpu/hal/regops/regops_gv100.c diff --git a/drivers/gpu/nvgpu/common/regops/regops_gv100.h b/drivers/gpu/nvgpu/hal/regops/regops_gv100.h similarity index 100% rename from drivers/gpu/nvgpu/common/regops/regops_gv100.h rename to drivers/gpu/nvgpu/hal/regops/regops_gv100.h diff --git a/drivers/gpu/nvgpu/common/regops/regops_gv11b.c b/drivers/gpu/nvgpu/hal/regops/regops_gv11b.c similarity index 100% rename from drivers/gpu/nvgpu/common/regops/regops_gv11b.c rename to drivers/gpu/nvgpu/hal/regops/regops_gv11b.c diff --git a/drivers/gpu/nvgpu/common/regops/regops_gv11b.h b/drivers/gpu/nvgpu/hal/regops/regops_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/common/regops/regops_gv11b.h rename to drivers/gpu/nvgpu/hal/regops/regops_gv11b.h diff --git a/drivers/gpu/nvgpu/common/regops/regops_tu104.c b/drivers/gpu/nvgpu/hal/regops/regops_tu104.c similarity index 100% rename from drivers/gpu/nvgpu/common/regops/regops_tu104.c rename to drivers/gpu/nvgpu/hal/regops/regops_tu104.c diff --git a/drivers/gpu/nvgpu/common/regops/regops_tu104.h b/drivers/gpu/nvgpu/hal/regops/regops_tu104.h similarity index 100% rename from drivers/gpu/nvgpu/common/regops/regops_tu104.h rename to drivers/gpu/nvgpu/hal/regops/regops_tu104.h diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index 25a825839..bd099e8c5 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/regops/regops_tu104.h" #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" #include "hal/fuse/fuse_gp106.h" @@ -130,7 +131,6 @@ #include "common/nvlink/nvlink_tu104.h" #include "common/sync/syncpt_cmdbuf_gv11b.h" #include "common/sync/sema_cmdbuf_gv11b.h" -#include "common/regops/regops_tu104.h" #include "common/fifo/channel_gk20a.h" #include "common/fifo/channel_gm20b.h" #include "common/fifo/channel_gv11b.h"