From e649d19c65f6612ee31e5c29f3bcf3275d1a799f Mon Sep 17 00:00:00 2001 From: Nitin Kumbhar Date: Mon, 18 Mar 2019 12:50:15 +0530 Subject: [PATCH] gpu: nvgpu: move gm20b common.hal.gr.config Move gr config unit's hal from common/gr/config to hal/gr/config. This will help consolidate all hals of common.hal.gr.config. JIRA NVGPU-1884 Change-Id: I0ad30830cbda42f4db6a46a9fb4ffe611a17a574 Signed-off-by: Nitin Kumbhar Reviewed-on: https://git-master.nvidia.com/r/2075680 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 4 +++- drivers/gpu/nvgpu/Makefile.sources | 3 ++- drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.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 +- drivers/gpu/nvgpu/{common => hal}/gr/config/gr_config_gm20b.c | 0 drivers/gpu/nvgpu/{common => hal}/gr/config/gr_config_gm20b.h | 0 drivers/gpu/nvgpu/tu104/hal_tu104.c | 2 +- 10 files changed, 11 insertions(+), 8 deletions(-) rename drivers/gpu/nvgpu/{common => hal}/gr/config/gr_config_gm20b.c (100%) rename drivers/gpu/nvgpu/{common => hal}/gr/config/gr_config_gm20b.h (100%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 99085dcf5..8301dfcab 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -79,7 +79,6 @@ nvgpu-y += \ common/gr/subctx.o \ common/gr/zcull.o \ common/gr/config/gr_config.o \ - common/gr/config/gr_config_gm20b.o \ common/gr/fecs_trace/fecs_trace.o \ common/gr/zbc.o \ common/gr/hwpm_map.o \ @@ -442,6 +441,9 @@ nvgpu-y += \ nvgpu-$(CONFIG_GK20A_VIDMEM) += \ common/mm/vidmem.o +nvgpu-y += \ + hal/gr/config/gr_config_gm20b.o + nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ common/vgpu/ltc/ltc_vgpu.o \ common/vgpu/cbc/cbc_vgpu.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index f409be0dc..de8f708a5 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -115,7 +115,6 @@ srcs += common/sim.c \ common/gr/ctx.c \ common/gr/zcull.c \ common/gr/config/gr_config.c \ - common/gr/config/gr_config_gm20b.c \ common/gr/fecs_trace/fecs_trace.c \ common/gr/zbc.c \ common/gr/hwpm_map.c \ @@ -388,6 +387,8 @@ ifeq ($(NVGPU_DEBUGGER),1) srcs += common/debugger.c endif +srcs += hal/gr/config/gr_config_gm20b.c + ifeq ($(NVGPU_LS_PMU),1) # Add LS PMU files which are required for normal build # TBD: currently LS PMU unit files are dependent on another unit, files can be 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 53c8d919c..d6875fad4 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -35,11 +35,11 @@ #include "hal/gr/fecs_trace/fecs_trace_gm20b.h" #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/init/gr_init_gp10b.h" +#include "hal/gr/config/gr_config_gm20b.h" #include "common/netlist/netlist_gp10b.h" #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/perf/perf_gm20b.h" #include "common/regops/regops_gp10b.h" #include "common/fifo/runlist_gk20a.h" diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 603b1ed5f..bee6cf985 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -58,12 +58,12 @@ #include "hal/gr/zcull/zcull_gm20b.h" #include "hal/gr/init/gr_init_gm20b.h" #include "hal/gr/intr/gr_intr_gm20b.h" +#include "hal/gr/config/gr_config_gm20b.h" #include "hal/falcon/falcon_gk20a.h" #include "common/ptimer/ptimer_gk20a.h" #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/mc/mc_gm20b.h" #include "common/perf/perf_gm20b.h" #include "common/pmu/pmu_gk20a.h" diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index c89eb735c..d0520684f 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -65,6 +65,7 @@ #include "hal/fifo/fifo_intr_gk20a.h" #include "hal/gr/fecs_trace/fecs_trace_gm20b.h" #include "hal/gr/fecs_trace/fecs_trace_gp10b.h" +#include "hal/gr/config/gr_config_gm20b.h" #include "hal/gr/zbc/zbc_gp10b.h" #include "hal/gr/zcull/zcull_gm20b.h" #include "hal/gr/init/gr_init_gm20b.h" @@ -76,7 +77,6 @@ #include "common/netlist/netlist_gp10b.h" #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/mc/mc_gm20b.h" #include "common/mc/mc_gp10b.h" #include "common/perf/perf_gm20b.h" diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 88010706a..58c21886a 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -56,6 +56,7 @@ #include "hal/fifo/fifo_intr_gk20a.h" #include "hal/fifo/fifo_intr_gv11b.h" #include "hal/gr/fecs_trace/fecs_trace_gm20b.h" +#include "hal/gr/config/gr_config_gm20b.h" #include "hal/gr/zbc/zbc_gp10b.h" #include "hal/gr/zbc/zbc_gv11b.h" #include "hal/gr/init/gr_init_gm20b.h" @@ -76,7 +77,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #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/top/top_gm20b.h" #include "common/top/top_gp10b.h" #include "common/top/top_gv100.h" diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index d939601da..5329b0b80 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -57,6 +57,7 @@ #include "hal/fifo/fifo_intr_gv11b.h" #include "hal/gr/fecs_trace/fecs_trace_gm20b.h" #include "hal/gr/fecs_trace/fecs_trace_gv11b.h" +#include "hal/gr/config/gr_config_gm20b.h" #include "hal/gr/zbc/zbc_gp10b.h" #include "hal/gr/zbc/zbc_gv11b.h" #include "hal/gr/zcull/zcull_gm20b.h" @@ -74,7 +75,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #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/mc/mc_gm20b.h" #include "common/mc/mc_gp10b.h" #include "common/mc/mc_gv11b.h" diff --git a/drivers/gpu/nvgpu/common/gr/config/gr_config_gm20b.c b/drivers/gpu/nvgpu/hal/gr/config/gr_config_gm20b.c similarity index 100% rename from drivers/gpu/nvgpu/common/gr/config/gr_config_gm20b.c rename to drivers/gpu/nvgpu/hal/gr/config/gr_config_gm20b.c diff --git a/drivers/gpu/nvgpu/common/gr/config/gr_config_gm20b.h b/drivers/gpu/nvgpu/hal/gr/config/gr_config_gm20b.h similarity index 100% rename from drivers/gpu/nvgpu/common/gr/config/gr_config_gm20b.h rename to drivers/gpu/nvgpu/hal/gr/config/gr_config_gm20b.h diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index f72866169..a7206b761 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -60,6 +60,7 @@ #include "hal/fifo/fifo_intr_gv11b.h" #include "hal/gr/fecs_trace/fecs_trace_gm20b.h" #include "hal/gr/fecs_trace/fecs_trace_gv11b.h" +#include "hal/gr/config/gr_config_gm20b.h" #include "hal/gr/zbc/zbc_gp10b.h" #include "hal/gr/zbc/zbc_gv11b.h" #include "hal/gr/zcull/zcull_gm20b.h" @@ -81,7 +82,6 @@ #include "common/gr/ctxsw_prog/ctxsw_prog_gm20b.h" #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/mc/mc_gm20b.h" #include "common/mc/mc_gp10b.h" #include "common/mc/mc_gv11b.h"