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 <vinodg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2071962
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Vinod G
2019-03-13 11:05:22 -07:00
committed by mobile promotions
parent 08aaaecc61
commit bbb0caa42c
16 changed files with 22 additions and 22 deletions

View File

@@ -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 \

View File

@@ -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 \

View File

@@ -26,7 +26,7 @@
#include <nvgpu/string.h>
#include <nvgpu/power_features/pg.h>
#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)

View File

@@ -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 <nvgpu/gk20a.h>

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -24,7 +24,7 @@
#include <nvgpu/io.h>
#include <nvgpu/gr/zbc.h>
#include "gr_zbc_gm20b.h"
#include "zbc_gm20b.h"
#include <nvgpu/hw/gm20b/hw_gr_gm20b.h>

View File

@@ -24,7 +24,7 @@
#include <nvgpu/io.h>
#include <nvgpu/gr/zbc.h>
#include "gr_zbc_gp10b.h"
#include "zbc_gp10b.h"
#include <nvgpu/hw/gp10b/hw_gr_gp10b.h>

View File

@@ -24,7 +24,7 @@
#include <nvgpu/io.h>
#include <nvgpu/gr/zbc.h>
#include "gr_zbc_gv11b.h"
#include "zbc_gv11b.h"
#include <nvgpu/hw/gv11b/hw_gr_gv11b.h>

View File

@@ -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"