From 10b8458f7b906eb42bb0b826ea201bd936632821 Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Fri, 26 Apr 2019 10:26:19 -0700 Subject: [PATCH] gpu: nvgpu: rename runlist HALs for mem access Renamed - runlist_gk20a.c -> runlist_ram_gk20a.c - runlist_gk20a.h -> runlist_ram_gk20a.h - runlist_gv11b.c -> runlist_ram_gv11b.c - runlist_gv11b.h -> runlist_ram_gv11b.h - runlist_tu104.c -> runlist_ram_tu104.c - runlist_tu104.h -> runlist_ram_tu104.h Updated makefiles and include files. Jira NVGPU-3198 Change-Id: Id65654990470bbf0bc79655d2f5efcb226dae220 Signed-off-by: Thomas Fleury Reviewed-on: https://git-master.nvidia.com/r/2107604 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 6 ++--- drivers/gpu/nvgpu/Makefile.sources | 6 ++--- .../nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c | 2 +- .../nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c | 2 +- .../{runlist_gk20a.c => runlist_ram_gk20a.c} | 2 +- .../{runlist_gk20a.h => runlist_ram_gk20a.h} | 6 ++--- .../{runlist_gv11b.c => runlist_ram_gv11b.c} | 25 +++++++++---------- .../{runlist_gv11b.h => runlist_ram_gv11b.h} | 6 ++--- .../{runlist_tu104.c => runlist_ram_tu104.c} | 2 +- .../{runlist_tu104.h => runlist_ram_tu104.h} | 6 ++--- drivers/gpu/nvgpu/hal/init/hal_gm20b.c | 2 +- drivers/gpu/nvgpu/hal/init/hal_gp10b.c | 2 +- drivers/gpu/nvgpu/hal/init/hal_gv100.c | 4 +-- drivers/gpu/nvgpu/hal/init/hal_gv11b.c | 4 +-- drivers/gpu/nvgpu/hal/init/hal_tu104.c | 6 ++--- userspace/units/fifo/runlist/nvgpu-runlist.c | 2 +- 16 files changed, 41 insertions(+), 42 deletions(-) rename drivers/gpu/nvgpu/hal/fifo/{runlist_gk20a.c => runlist_ram_gk20a.c} (98%) rename drivers/gpu/nvgpu/hal/fifo/{runlist_gk20a.h => runlist_ram_gk20a.h} (93%) rename drivers/gpu/nvgpu/hal/fifo/{runlist_gv11b.c => runlist_ram_gv11b.c} (85%) rename drivers/gpu/nvgpu/hal/fifo/{runlist_gv11b.h => runlist_ram_gv11b.h} (93%) rename drivers/gpu/nvgpu/hal/fifo/{runlist_tu104.c => runlist_ram_tu104.c} (97%) rename drivers/gpu/nvgpu/hal/fifo/{runlist_tu104.h => runlist_ram_tu104.h} (92%) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 9e2c05e87..5931016b3 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -283,9 +283,9 @@ nvgpu-y += \ hal/fifo/ramin_gp10b.o \ hal/fifo/ramin_gv11b.o \ hal/fifo/ramin_tu104.o \ - hal/fifo/runlist_gk20a.o \ - hal/fifo/runlist_gv11b.o \ - hal/fifo/runlist_tu104.o \ + hal/fifo/runlist_ram_gk20a.o \ + hal/fifo/runlist_ram_gv11b.o \ + hal/fifo/runlist_ram_tu104.o \ hal/fifo/runlist_fifo_gk20a.o \ hal/fifo/runlist_fifo_gv11b.o \ hal/fifo/runlist_fifo_gv100.o \ diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index d85a91ca9..d26d097ac 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -385,9 +385,9 @@ srcs += common/sim/sim.c \ hal/fifo/ramin_gp10b.c \ hal/fifo/ramin_gv11b.c \ hal/fifo/ramin_tu104.c \ - hal/fifo/runlist_gk20a.c \ - hal/fifo/runlist_gv11b.c \ - hal/fifo/runlist_tu104.c \ + hal/fifo/runlist_ram_gk20a.c \ + hal/fifo/runlist_ram_gv11b.c \ + hal/fifo/runlist_ram_tu104.c \ hal/fifo/runlist_fifo_gk20a.c \ hal/fifo/runlist_fifo_gv11b.c \ hal/fifo/runlist_fifo_gv100.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 c4ec8522e..77717e5cc 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gp10b/vgpu_hal_gp10b.c @@ -43,7 +43,7 @@ #include "hal/fifo/ramin_gk20a.h" #include "hal/fifo/ramin_gm20b.h" #include "hal/fifo/ramin_gp10b.h" -#include "hal/fifo/runlist_gk20a.h" +#include "hal/fifo/runlist_ram_gk20a.h" #include "hal/fifo/runlist_fifo_gk20a.h" #include "hal/fifo/userd_gk20a.h" #include "hal/fifo/mmu_fault_gm20b.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 c6ed44a62..a4714dd83 100644 --- a/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/common/vgpu/gv11b/vgpu_hal_gv11b.c @@ -36,7 +36,7 @@ #include "hal/fifo/ramin_gm20b.h" #include "hal/fifo/ramin_gp10b.h" #include "hal/fifo/ramin_gv11b.h" -#include "hal/fifo/runlist_gv11b.h" +#include "hal/fifo/runlist_ram_gv11b.h" #include "hal/fifo/runlist_fifo_gv11b.h" #include "hal/fifo/tsg_gv11b.h" #include "hal/fifo/userd_gk20a.h" diff --git a/drivers/gpu/nvgpu/hal/fifo/runlist_gk20a.c b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_gk20a.c similarity index 98% rename from drivers/gpu/nvgpu/hal/fifo/runlist_gk20a.c rename to drivers/gpu/nvgpu/hal/fifo/runlist_ram_gk20a.c index a3e8dd14b..0fc3dc72f 100644 --- a/drivers/gpu/nvgpu/hal/fifo/runlist_gk20a.c +++ b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_gk20a.c @@ -28,7 +28,7 @@ #include #include -#include "runlist_gk20a.h" +#include "runlist_ram_gk20a.h" #include diff --git a/drivers/gpu/nvgpu/hal/fifo/runlist_gk20a.h b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_gk20a.h similarity index 93% rename from drivers/gpu/nvgpu/hal/fifo/runlist_gk20a.h rename to drivers/gpu/nvgpu/hal/fifo/runlist_ram_gk20a.h index daccb0c6e..c0a0def5a 100644 --- a/drivers/gpu/nvgpu/hal/fifo/runlist_gk20a.h +++ b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_gk20a.h @@ -20,8 +20,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef NVGPU_RUNLIST_GK20A_H -#define NVGPU_RUNLIST_GK20A_H +#ifndef NVGPU_RUNLIST_RAM_GK20A_H +#define NVGPU_RUNLIST_RAM_GK20A_H #include @@ -34,4 +34,4 @@ void gk20a_runlist_get_tsg_entry(struct tsg_gk20a *tsg, u32 *runlist, u32 timeslice); void gk20a_runlist_get_ch_entry(struct channel_gk20a *ch, u32 *runlist); -#endif /* NVGPU_RUNLIST_GK20A_H */ +#endif /* NVGPU_RUNLIST_RAM_GK20A_H */ diff --git a/drivers/gpu/nvgpu/hal/fifo/runlist_gv11b.c b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_gv11b.c similarity index 85% rename from drivers/gpu/nvgpu/hal/fifo/runlist_gv11b.c rename to drivers/gpu/nvgpu/hal/fifo/runlist_ram_gv11b.c index fcd064c39..50a9ab235 100644 --- a/drivers/gpu/nvgpu/hal/fifo/runlist_gv11b.c +++ b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_gv11b.c @@ -24,7 +24,7 @@ #include #include -#include "runlist_gv11b.h" +#include "runlist_ram_gv11b.h" #include @@ -76,18 +76,17 @@ void gv11b_runlist_get_ch_entry(struct channel_gk20a *ch, u32 *runlist) /* Time being use 0 pbdma sequencer */ runlist_entry = ram_rl_entry_type_channel_v() | - ram_rl_entry_chan_runqueue_selector_f( - ch->runqueue_sel) | - ram_rl_entry_chan_userd_target_f( - nvgpu_aperture_mask(g, ch->userd_mem, - ram_rl_entry_chan_userd_target_sys_mem_ncoh_v(), - ram_rl_entry_chan_userd_target_sys_mem_coh_v(), - ram_rl_entry_chan_userd_target_vid_mem_v())) | - ram_rl_entry_chan_inst_target_f( - nvgpu_aperture_mask(g, &ch->inst_block, - ram_rl_entry_chan_inst_target_sys_mem_ncoh_v(), - ram_rl_entry_chan_inst_target_sys_mem_coh_v(), - ram_rl_entry_chan_inst_target_vid_mem_v())); + ram_rl_entry_chan_runqueue_selector_f(ch->runqueue_sel) | + ram_rl_entry_chan_userd_target_f( + nvgpu_aperture_mask(g, ch->userd_mem, + ram_rl_entry_chan_userd_target_sys_mem_ncoh_v(), + ram_rl_entry_chan_userd_target_sys_mem_coh_v(), + ram_rl_entry_chan_userd_target_vid_mem_v())) | + ram_rl_entry_chan_inst_target_f( + nvgpu_aperture_mask(g, &ch->inst_block, + ram_rl_entry_chan_inst_target_sys_mem_ncoh_v(), + ram_rl_entry_chan_inst_target_sys_mem_coh_v(), + ram_rl_entry_chan_inst_target_vid_mem_v())); addr_lo = u64_lo32(ch->userd_iova) >> ram_rl_entry_chan_userd_ptr_align_shift_v(); diff --git a/drivers/gpu/nvgpu/hal/fifo/runlist_gv11b.h b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_gv11b.h similarity index 93% rename from drivers/gpu/nvgpu/hal/fifo/runlist_gv11b.h rename to drivers/gpu/nvgpu/hal/fifo/runlist_ram_gv11b.h index 7af318025..c8b1ccfd0 100644 --- a/drivers/gpu/nvgpu/hal/fifo/runlist_gv11b.h +++ b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_gv11b.h @@ -20,8 +20,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef NVGPU_RUNLIST_GV11B_H -#define NVGPU_RUNLIST_GV11B_H +#ifndef NVGPU_RUNLIST_RAM_GV11B_H +#define NVGPU_RUNLIST_RAM_GV11B_H #include @@ -33,4 +33,4 @@ void gv11b_runlist_get_tsg_entry(struct tsg_gk20a *tsg, u32 *runlist, u32 timeslice); void gv11b_runlist_get_ch_entry(struct channel_gk20a *ch, u32 *runlist); -#endif /* NVGPU_RUNLIST_GV11B_H */ +#endif /* NVGPU_RUNLIST_RAM_GV11B_H */ diff --git a/drivers/gpu/nvgpu/hal/fifo/runlist_tu104.c b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_tu104.c similarity index 97% rename from drivers/gpu/nvgpu/hal/fifo/runlist_tu104.c rename to drivers/gpu/nvgpu/hal/fifo/runlist_ram_tu104.c index 21234e613..6694fc9ee 100644 --- a/drivers/gpu/nvgpu/hal/fifo/runlist_tu104.c +++ b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_tu104.c @@ -20,7 +20,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "runlist_tu104.h" +#include "runlist_ram_tu104.h" #include diff --git a/drivers/gpu/nvgpu/hal/fifo/runlist_tu104.h b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_tu104.h similarity index 92% rename from drivers/gpu/nvgpu/hal/fifo/runlist_tu104.h rename to drivers/gpu/nvgpu/hal/fifo/runlist_ram_tu104.h index 8b070eca9..64a5d2273 100644 --- a/drivers/gpu/nvgpu/hal/fifo/runlist_tu104.h +++ b/drivers/gpu/nvgpu/hal/fifo/runlist_ram_tu104.h @@ -20,8 +20,8 @@ * DEALINGS IN THE SOFTWARE. */ -#ifndef NVGPU_RUNLIST_TU104_H -#define NVGPU_RUNLIST_TU104_H +#ifndef NVGPU_RUNLIST_RAM_TU104_H +#define NVGPU_RUNLIST_RAM_TU104_H #include @@ -29,4 +29,4 @@ struct gk20a; u32 tu104_runlist_entry_size(struct gk20a *g); -#endif /* NVGPU_RUNLIST_TU104_H */ +#endif /* NVGPU_RUNLIST_RAM_TU104_H */ diff --git a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c index 6c83dce9a..e86c4b93f 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c @@ -67,7 +67,7 @@ #include "hal/fifo/ramfc_gk20a.h" #include "hal/fifo/ramin_gk20a.h" #include "hal/fifo/ramin_gm20b.h" -#include "hal/fifo/runlist_gk20a.h" +#include "hal/fifo/runlist_ram_gk20a.h" #include "hal/fifo/runlist_fifo_gk20a.h" #include "hal/fifo/tsg_gk20a.h" #include "hal/fifo/userd_gk20a.h" diff --git a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c index 4640516e9..c47970def 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c @@ -79,7 +79,7 @@ #include "hal/fifo/ramin_gk20a.h" #include "hal/fifo/ramin_gm20b.h" #include "hal/fifo/ramin_gp10b.h" -#include "hal/fifo/runlist_gk20a.h" +#include "hal/fifo/runlist_ram_gk20a.h" #include "hal/fifo/runlist_fifo_gk20a.h" #include "hal/fifo/tsg_gk20a.h" #include "hal/fifo/userd_gk20a.h" diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv100.c b/drivers/gpu/nvgpu/hal/init/hal_gv100.c index 8a78862ce..d63104706 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gv100.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gv100.c @@ -77,8 +77,8 @@ #include "hal/fifo/ramin_gm20b.h" #include "hal/fifo/ramin_gp10b.h" #include "hal/fifo/ramin_gv11b.h" -#include "hal/fifo/runlist_gk20a.h" -#include "hal/fifo/runlist_gv11b.h" +#include "hal/fifo/runlist_ram_gk20a.h" +#include "hal/fifo/runlist_ram_gv11b.h" #include "hal/fifo/runlist_fifo_gk20a.h" #include "hal/fifo/runlist_fifo_gv11b.h" #include "hal/fifo/runlist_fifo_gv100.h" diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c index 80f03e7a0..e37e365a6 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c +++ b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c @@ -80,8 +80,8 @@ #include "hal/fifo/ramin_gm20b.h" #include "hal/fifo/ramin_gp10b.h" #include "hal/fifo/ramin_gv11b.h" -#include "hal/fifo/runlist_gk20a.h" -#include "hal/fifo/runlist_gv11b.h" +#include "hal/fifo/runlist_ram_gk20a.h" +#include "hal/fifo/runlist_ram_gv11b.h" #include "hal/fifo/runlist_fifo_gk20a.h" #include "hal/fifo/runlist_fifo_gv11b.h" #include "hal/fifo/tsg_gv11b.h" diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c index 59825df31..447b20dd1 100644 --- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c +++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c @@ -82,9 +82,9 @@ #include "hal/fifo/ramin_gp10b.h" #include "hal/fifo/ramin_gv11b.h" #include "hal/fifo/ramin_tu104.h" -#include "hal/fifo/runlist_gk20a.h" -#include "hal/fifo/runlist_gv11b.h" -#include "hal/fifo/runlist_tu104.h" +#include "hal/fifo/runlist_ram_gk20a.h" +#include "hal/fifo/runlist_ram_gv11b.h" +#include "hal/fifo/runlist_ram_tu104.h" #include "hal/fifo/runlist_fifo_gk20a.h" #include "hal/fifo/runlist_fifo_gv11b.h" #include "hal/fifo/runlist_fifo_tu104.h" diff --git a/userspace/units/fifo/runlist/nvgpu-runlist.c b/userspace/units/fifo/runlist/nvgpu-runlist.c index d200feefc..110549d29 100644 --- a/userspace/units/fifo/runlist/nvgpu-runlist.c +++ b/userspace/units/fifo/runlist/nvgpu-runlist.c @@ -29,7 +29,7 @@ #include #include -#include "hal/fifo/runlist_gk20a.h" +#include "hal/fifo/runlist_ram_gk20a.h" #include "hal/fifo/tsg_gk20a.h" static void setup_fifo(struct gk20a *g, unsigned long *tsg_map,