From bbb0caa42c9760d40a1014ef3ef6803abf5cead4 Mon Sep 17 00:00:00 2001 From: Vinod G Date: Wed, 13 Mar 2019 11:05:22 -0700 Subject: [PATCH] gpu: nvgpu: rearrange gr/zbc files move zbc hal files from common/gr/zbc to hal/gr/zbc directory. rename gr/zbc/gr_zbc.c -> gr/zbc.c and gr/zbc/gr_zbc.h -> gr/zbc_priv.h JIRA NVGPU-1882 Change-Id: I58c98c0a494b600a35a576a9d717114023118ee6 Signed-off-by: Vinod G Reviewed-on: https://git-master.nvidia.com/r/2071962 GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 8 ++++---- drivers/gpu/nvgpu/Makefile.sources | 8 ++++---- drivers/gpu/nvgpu/common/gr/{zbc/gr_zbc.c => zbc.c} | 2 +- drivers/gpu/nvgpu/common/gr/{zbc/gr_zbc.h => zbc_priv.h} | 0 drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c | 4 ++-- drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 2 +- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 2 +- drivers/gpu/nvgpu/gv100/hal_gv100.c | 4 ++-- drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 4 ++-- .../gr/zbc/gr_zbc_gm20b.c => hal/gr/zbc/zbc_gm20b.c} | 2 +- .../gr/zbc/gr_zbc_gm20b.h => hal/gr/zbc/zbc_gm20b.h} | 0 .../gr/zbc/gr_zbc_gp10b.c => hal/gr/zbc/zbc_gp10b.c} | 2 +- .../gr/zbc/gr_zbc_gp10b.h => hal/gr/zbc/zbc_gp10b.h} | 0 .../gr/zbc/gr_zbc_gv11b.c => hal/gr/zbc/zbc_gv11b.c} | 2 +- .../gr/zbc/gr_zbc_gv11b.h => hal/gr/zbc/zbc_gv11b.h} | 0 drivers/gpu/nvgpu/tu104/hal_tu104.c | 4 ++-- 16 files changed, 22 insertions(+), 22 deletions(-) rename drivers/gpu/nvgpu/common/gr/{zbc/gr_zbc.c => zbc.c} (99%) rename drivers/gpu/nvgpu/common/gr/{zbc/gr_zbc.h => zbc_priv.h} (100%) rename drivers/gpu/nvgpu/{common/gr/zbc/gr_zbc_gm20b.c => hal/gr/zbc/zbc_gm20b.c} (99%) rename drivers/gpu/nvgpu/{common/gr/zbc/gr_zbc_gm20b.h => hal/gr/zbc/zbc_gm20b.h} (100%) rename drivers/gpu/nvgpu/{common/gr/zbc/gr_zbc_gp10b.c => hal/gr/zbc/zbc_gp10b.c} (99%) rename drivers/gpu/nvgpu/{common/gr/zbc/gr_zbc_gp10b.h => hal/gr/zbc/zbc_gp10b.h} (100%) rename drivers/gpu/nvgpu/{common/gr/zbc/gr_zbc_gv11b.c => hal/gr/zbc/zbc_gv11b.c} (98%) rename drivers/gpu/nvgpu/{common/gr/zbc/gr_zbc_gv11b.h => hal/gr/zbc/zbc_gv11b.h} (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 83fb39f50..ed4419cde 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -92,10 +92,7 @@ nvgpu-y += \ common/gr/fecs_trace/fecs_trace_gm20b.o \ common/gr/fecs_trace/fecs_trace_gp10b.o \ common/gr/fecs_trace/fecs_trace_gv11b.o \ - common/gr/zbc/gr_zbc.o \ - common/gr/zbc/gr_zbc_gm20b.o \ - common/gr/zbc/gr_zbc_gp10b.o \ - common/gr/zbc/gr_zbc_gv11b.o \ + common/gr/zbc.o \ common/gr/hwpm_map.o \ common/netlist/netlist.o \ common/netlist/netlist_sim.o \ @@ -171,6 +168,9 @@ nvgpu-y += \ hal/bus/bus_tu104.o \ hal/gr/init/gr_init_gm20b.o \ hal/gr/hwpm_map/hwpm_map_gv100.o \ + hal/gr/zbc/zbc_gm20b.o \ + hal/gr/zbc/zbc_gp10b.o \ + hal/gr/zbc/zbc_gv11b.o \ hal/priv_ring/priv_ring_gm20b.o \ hal/priv_ring/priv_ring_gp10b.o \ hal/power_features/cg/gm20b_gating_reglist.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 8f44f3612..422228a0d 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -126,10 +126,7 @@ srcs += common/sim.c \ common/gr/fecs_trace/fecs_trace_gm20b.c \ common/gr/fecs_trace/fecs_trace_gp10b.c \ common/gr/fecs_trace/fecs_trace_gv11b.c \ - common/gr/zbc/gr_zbc.c \ - common/gr/zbc/gr_zbc_gm20b.c \ - common/gr/zbc/gr_zbc_gp10b.c \ - common/gr/zbc/gr_zbc_gv11b.c \ + common/gr/zbc.c \ common/gr/hwpm_map.c \ common/netlist/netlist.c \ common/netlist/netlist_sim.c \ @@ -336,6 +333,9 @@ srcs += common/sim.c \ hal/bus/bus_tu104.c \ hal/gr/init/gr_init_gm20b.c \ hal/gr/hwpm_map/hwpm_map_gv100.c \ + hal/gr/zbc/zbc_gm20b.c \ + hal/gr/zbc/zbc_gp10b.c \ + hal/gr/zbc/zbc_gv11b.c \ hal/priv_ring/priv_ring_gm20b.c \ hal/priv_ring/priv_ring_gp10b.c \ hal/power_features/cg/gm20b_gating_reglist.c \ diff --git a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc.c b/drivers/gpu/nvgpu/common/gr/zbc.c similarity index 99% rename from drivers/gpu/nvgpu/common/gr/zbc/gr_zbc.c rename to drivers/gpu/nvgpu/common/gr/zbc.c index a177700ec..a44cd3779 100644 --- a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc.c +++ b/drivers/gpu/nvgpu/common/gr/zbc.c @@ -26,7 +26,7 @@ #include #include -#include "gr_zbc.h" +#include "zbc_priv.h" static int nvgpu_gr_zbc_add(struct gk20a *g, struct nvgpu_gr_zbc *zbc, struct nvgpu_gr_zbc_entry *zbc_val) diff --git a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc.h b/drivers/gpu/nvgpu/common/gr/zbc_priv.h similarity index 100% rename from drivers/gpu/nvgpu/common/gr/zbc/gr_zbc.h rename to drivers/gpu/nvgpu/common/gr/zbc_priv.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 c57b70030..867ac72a6 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -26,6 +26,8 @@ #include "hal/therm/therm_gm20b.h" #include "hal/therm/therm_gp10b.h" #include "hal/therm/therm_gv11b.h" +#include "hal/gr/zbc/zbc_gv11b.h" +#include "hal/gr/hwpm_map/hwpm_map_gv100.h" #include "common/fb/fb_gm20b.h" #include "common/fb/fb_gp10b.h" @@ -35,7 +37,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #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/perf/perf_gv11b.h" #include "common/ltc/ltc_gm20b.h" #include "common/ltc/ltc_gp10b.h" @@ -46,7 +47,6 @@ #include "common/fifo/runlist_gv11b.h" #include "common/fifo/channel_gv11b.h" #include "common/fifo/engine_status_gv100.h" -#include "common/gr/zbc/gr_zbc_gv11b.h" #include "common/clk_arb/clk_arb_gp10b.h" #include diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 9497c6555..17d93be44 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -45,6 +45,7 @@ #include "hal/therm/therm_gm20b.h" #include "hal/fuse/fuse_gm20b.h" #include "hal/fifo/engines_gm20b.h" +#include "hal/gr/zbc/zbc_gm20b.h" #include "hal/gr/init/gr_init_gm20b.h" #include "hal/falcon/falcon_gk20a.h" @@ -53,7 +54,6 @@ #include "common/netlist/netlist_gm20b.h" #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/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 bea43f128..dc3c5b7e2 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -52,6 +52,7 @@ #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" #include "hal/fifo/engines_gm20b.h" +#include "hal/gr/zbc/zbc_gp10b.h" #include "hal/gr/init/gr_init_gm20b.h" #include "hal/falcon/falcon_gk20a.h" @@ -62,7 +63,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "common/gr/config/gr_config_gm20b.h" -#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/ltc/ltc_gm20b.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index ced0c576f..78d7679eb 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -39,6 +39,8 @@ #include "hal/fuse/fuse_gp106.h" #include "hal/fifo/engines_gv11b.h" #include "hal/gr/init/gr_init_gm20b.h" +#include "hal/gr/zbc/zbc_gp10b.h" +#include "hal/gr/zbc/zbc_gv11b.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h" #include "hal/falcon/falcon_gk20a.h" @@ -54,8 +56,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gv11b.h" #include "common/gr/config/gr_config_gm20b.h" -#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/ltc/ltc_gm20b.h" #include "common/ltc/ltc_gp10b.h" diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 0785043e4..c13539346 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -40,6 +40,8 @@ #include "hal/fuse/fuse_gm20b.h" #include "hal/fuse/fuse_gp10b.h" #include "hal/fifo/engines_gv11b.h" +#include "hal/gr/zbc/zbc_gp10b.h" +#include "hal/gr/zbc/zbc_gv11b.h" #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h" #include "hal/falcon/falcon_gk20a.h" @@ -53,8 +55,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gv11b.h" #include "common/gr/config/gr_config_gm20b.h" -#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/gr/fecs_trace/fecs_trace_gv11b.h" #include "common/ltc/ltc_gm20b.h" diff --git a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gm20b.c b/drivers/gpu/nvgpu/hal/gr/zbc/zbc_gm20b.c similarity index 99% rename from drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gm20b.c rename to drivers/gpu/nvgpu/hal/gr/zbc/zbc_gm20b.c index ae1208714..d38e3738c 100644 --- a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gm20b.c +++ b/drivers/gpu/nvgpu/hal/gr/zbc/zbc_gm20b.c @@ -24,7 +24,7 @@ #include #include -#include "gr_zbc_gm20b.h" +#include "zbc_gm20b.h" #include diff --git a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gm20b.h b/drivers/gpu/nvgpu/hal/gr/zbc/zbc_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gm20b.h rename to drivers/gpu/nvgpu/hal/gr/zbc/zbc_gm20b.h diff --git a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gp10b.c b/drivers/gpu/nvgpu/hal/gr/zbc/zbc_gp10b.c similarity index 99% rename from drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gp10b.c rename to drivers/gpu/nvgpu/hal/gr/zbc/zbc_gp10b.c index 66fc7c9ed..6a3afdcb7 100644 --- a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gp10b.c +++ b/drivers/gpu/nvgpu/hal/gr/zbc/zbc_gp10b.c @@ -24,7 +24,7 @@ #include #include -#include "gr_zbc_gp10b.h" +#include "zbc_gp10b.h" #include diff --git a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gp10b.h b/drivers/gpu/nvgpu/hal/gr/zbc/zbc_gp10b.h similarity index 100% rename from drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gp10b.h rename to drivers/gpu/nvgpu/hal/gr/zbc/zbc_gp10b.h diff --git a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gv11b.c b/drivers/gpu/nvgpu/hal/gr/zbc/zbc_gv11b.c similarity index 98% rename from drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gv11b.c rename to drivers/gpu/nvgpu/hal/gr/zbc/zbc_gv11b.c index a5be3b835..614c3c138 100644 --- a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gv11b.c +++ b/drivers/gpu/nvgpu/hal/gr/zbc/zbc_gv11b.c @@ -24,7 +24,7 @@ #include #include -#include "gr_zbc_gv11b.h" +#include "zbc_gv11b.h" #include diff --git a/drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gv11b.h b/drivers/gpu/nvgpu/hal/gr/zbc/zbc_gv11b.h similarity index 100% rename from drivers/gpu/nvgpu/common/gr/zbc/gr_zbc_gv11b.h rename to drivers/gpu/nvgpu/hal/gr/zbc/zbc_gv11b.h diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index a9188794b..e6ac97df7 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -40,6 +40,8 @@ #include "hal/fuse/fuse_gp10b.h" #include "hal/fuse/fuse_gp106.h" #include "hal/fifo/engines_gv11b.h" +#include "hal/gr/zbc/zbc_gp10b.h" +#include "hal/gr/zbc/zbc_gv11b.h" #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/hwpm_map/hwpm_map_gv100.h" #include "hal/falcon/falcon_gk20a.h" @@ -57,8 +59,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gp10b.h" #include "common/gr/ctxsw_prog/ctxsw_prog_gv11b.h" #include "common/gr/config/gr_config_gm20b.h" -#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/gr/fecs_trace/fecs_trace_gv11b.h" #include "common/ltc/ltc_gm20b.h"