nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Move bus HAL to common

Browse Source 
Move implementation of bus HAL to common/bus.

Change-Id: Ia89350f9d94f3ccfd5500a340e6a677cd7d4cfaa
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1726337
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:
Terje Bergstrom
2018-04-06 14:16:10 -07:00
committed by mobile promotions
parent 775c69af8c
commit 2dbf961365
16 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/nvgpu/Makefile
View File

@@ -21,7 +21,14 @@ ccflags-y += -D__NVGPU_PREVENT_UNTRUSTED_SPECULATION
obj-$(CONFIG_GK20A) := nvgpu.o
nvgpu-y := \
# OS independent parts of nvgpu. The work to collect files here
# is in progress.
nvgpu-y += common/bus/bus.o \
common/bus/bus_gk20a.o \
common/bus/bus_gm20b.o
nvgpu-y += \
common/linux/kmem.o \
common/linux/timers.o \
common/linux/ioctl.o \
@@ -65,7 +72,6 @@ nvgpu-y := \
common/mm/nvgpu_mem.o \
common/mm/comptags.o \
common/mm/mm.o \
common/bus.o \
common/enabled.o \
common/nvlink.o \
common/pramin.o \
@@ -87,7 +93,6 @@ nvgpu-y := \
common/clock_gating/gv100_gating_reglist.o \
common/clock_gating/gv11b_gating_reglist.o \
gk20a/gk20a.o \
gk20a/bus_gk20a.o \
gk20a/pramin_gk20a.o \
gk20a/ce2_gk20a.o \
gk20a/fifo_gk20a.o \
@@ -110,7 +115,6 @@ nvgpu-y := \
gk20a/fecs_trace_gk20a.o \
gk20a/mc_gk20a.o \
gm20b/hal_gm20b.o \
gm20b/bus_gm20b.o \
gm20b/ltc_gm20b.o \
gm20b/gr_gm20b.o \
gm20b/clk_gm20b.o \

6
drivers/gpu/nvgpu/Makefile.sources
View File

@@ -32,7 +32,7 @@ srcs := common/mm/nvgpu_allocator.c \
common/mm/nvgpu_mem.c \
common/mm/comptags.c \
common/mm/mm.c \
common/bus.c \
common/bus/bus.c \
common/enabled.c \
common/pramin.c \
common/semaphore.c \
@@ -108,7 +108,7 @@ srcs := common/mm/nvgpu_allocator.c \
lpwr/lpwr.c \
lpwr/rppg.c \
gk20a/gk20a.c \
gk20a/bus_gk20a.c \
common/bus/bus_gk20a.c \
gk20a/pramin_gk20a.c \
gk20a/ce2_gk20a.c \
gk20a/fifo_gk20a.c \
@@ -130,7 +130,7 @@ srcs := common/mm/nvgpu_allocator.c \
gk20a/tsg_gk20a.c \
gk20a/mc_gk20a.c \
gm20b/hal_gm20b.c \
gm20b/bus_gm20b.c \
common/bus/bus_gm20b.c \
gm20b/ltc_gm20b.c \
gm20b/gr_gm20b.c \
gm20b/clk_gm20b.c \

0
drivers/gpu/nvgpu/common/bus.c → drivers/gpu/nvgpu/common/bus/bus.c
View File

2
drivers/gpu/nvgpu/gk20a/bus_gk20a.c → drivers/gpu/nvgpu/common/bus/bus_gk20a.c
View File

@@ -27,7 +27,7 @@
#include <nvgpu/bus.h>
#include <nvgpu/mm.h>
#include "gk20a.h"
#include "gk20a/gk20a.h"
#include "bus_gk20a.h"
#include <nvgpu/hw/gk20a/hw_bus_gk20a.h>

0
drivers/gpu/nvgpu/gk20a/bus_gk20a.h → drivers/gpu/nvgpu/common/bus/bus_gk20a.h
View File

5
drivers/gpu/nvgpu/gm20b/bus_gm20b.c → drivers/gpu/nvgpu/common/bus/bus_gm20b.c
View File

@@ -27,9 +27,10 @@
#include <nvgpu/mm.h>
#include <nvgpu/enabled.h>
#include "bus_gm20b.h"
#include "gk20a/gk20a.h"
#include "gk20a/bus_gk20a.h"
#include "bus_gk20a.h"
#include "bus_gm20b.h"
#include <nvgpu/hw/gm20b/hw_bus_gm20b.h>

0
drivers/gpu/nvgpu/gm20b/bus_gm20b.h → drivers/gpu/nvgpu/common/bus/bus_gm20b.h
View File

2
drivers/gpu/nvgpu/gk20a/gk20a.c
View File

@@ -44,7 +44,7 @@
#include "dbg_gpu_gk20a.h"
#include "mc_gk20a.h"
#include "hal.h"
#include "bus_gk20a.h"
#include "common/bus/bus_gk20a.h"
#include "pstate/pstate.h"
void __nvgpu_check_gpu_state(struct gk20a *g)

2
drivers/gpu/nvgpu/gk20a/mm_gk20a.c
View File

@@ -44,7 +44,7 @@
#include "gk20a.h"
#include "mm_gk20a.h"
#include "fence_gk20a.h"
#include "bus_gk20a.h"
#include "common/bus/bus_gk20a.h"
#include <nvgpu/hw/gk20a/hw_gmmu_gk20a.h>
#include <nvgpu/hw/gk20a/hw_ram_gk20a.h>

4
drivers/gpu/nvgpu/gm20b/hal_gm20b.c
View File

@@ -23,6 +23,8 @@
*/
#include "common/clock_gating/gm20b_gating_reglist.h"
#include "common/bus/bus_gm20b.h"
#include "common/bus/bus_gk20a.h"
#include "gk20a/gk20a.h"
#include "gk20a/ce2_gk20a.h"
@@ -33,7 +35,6 @@
#include "gk20a/mm_gk20a.h"
#include "gk20a/css_gr_gk20a.h"
#include "gk20a/mc_gk20a.h"
#include "gk20a/bus_gk20a.h"
#include "gk20a/flcn_gk20a.h"
#include "gk20a/priv_ring_gk20a.h"
#include "gk20a/regops_gk20a.h"
@@ -52,7 +53,6 @@
#include "clk_gm20b.h"
#include "regops_gm20b.h"
#include "therm_gm20b.h"
#include "bus_gm20b.h"
#include "hal_gm20b.h"
#include "acr_gm20b.h"
#include "fuse_gm20b.h"

3
drivers/gpu/nvgpu/gp106/hal_gp106.c
View File

@@ -22,13 +22,14 @@
* DEALINGS IN THE SOFTWARE.
*/
#include "common/bus/bus_gk20a.h"
#include "gk20a/gk20a.h"
#include "gk20a/fifo_gk20a.h"
#include "gk20a/fecs_trace_gk20a.h"
#include "gk20a/mm_gk20a.h"
#include "gk20a/dbg_gpu_gk20a.h"
#include "gk20a/css_gr_gk20a.h"
#include "gk20a/bus_gk20a.h"
#include "gk20a/pramin_gk20a.h"
#include "gk20a/flcn_gk20a.h"
#include "gk20a/regops_gk20a.h"

3
drivers/gpu/nvgpu/gp10b/hal_gp10b.c
View File

@@ -22,13 +22,14 @@
* DEALINGS IN THE SOFTWARE.
*/
#include "common/bus/bus_gk20a.h"
#include "gk20a/gk20a.h"
#include "gk20a/fifo_gk20a.h"
#include "gk20a/fecs_trace_gk20a.h"
#include "gk20a/mm_gk20a.h"
#include "gk20a/dbg_gpu_gk20a.h"
#include "gk20a/css_gr_gk20a.h"
#include "gk20a/bus_gk20a.h"
#include "gk20a/pramin_gk20a.h"
#include "gk20a/flcn_gk20a.h"
#include "gk20a/regops_gk20a.h"

3
drivers/gpu/nvgpu/gv100/hal_gv100.c
View File

@@ -22,13 +22,14 @@
* DEALINGS IN THE SOFTWARE.
*/
#include "common/bus/bus_gk20a.h"
#include "gk20a/gk20a.h"
#include "gk20a/fifo_gk20a.h"
#include "gk20a/fecs_trace_gk20a.h"
#include "gk20a/css_gr_gk20a.h"
#include "gk20a/mc_gk20a.h"
#include "gk20a/dbg_gpu_gk20a.h"
#include "gk20a/bus_gk20a.h"
#include "gk20a/pramin_gk20a.h"
#include "gk20a/flcn_gk20a.h"
#include "gk20a/regops_gk20a.h"

3
drivers/gpu/nvgpu/gv11b/hal_gv11b.c
View File

@@ -22,6 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#include "common/bus/bus_gk20a.h"
#include "gk20a/gk20a.h"
#include "gk20a/fifo_gk20a.h"
#include "gk20a/fecs_trace_gk20a.h"
@@ -29,7 +31,6 @@
#include "gk20a/mc_gk20a.h"
#include "gk20a/mm_gk20a.h"
#include "gk20a/dbg_gpu_gk20a.h"
#include "gk20a/bus_gk20a.h"
#include "gk20a/flcn_gk20a.h"
#include "gk20a/regops_gk20a.h"
#include "gk20a/fb_gk20a.h"

3
drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
View File

@@ -20,6 +20,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#include "common/bus/bus_gk20a.h"
#include "vgpu/fifo_vgpu.h"
#include "vgpu/gr_vgpu.h"
#include "vgpu/ltc_vgpu.h"
@@ -34,7 +36,6 @@
#include "vgpu_mm_gp10b.h"
#include "vgpu_fuse_gp10b.h"
#include "gk20a/bus_gk20a.h"
#include "gk20a/pramin_gk20a.h"
#include "gk20a/flcn_gk20a.h"
#include "gk20a/mc_gk20a.h"

3
drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
View File

@@ -20,6 +20,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#include "common/bus/bus_gk20a.h"
#include <gk20a/gk20a.h>
#include <gv11b/hal_gv11b.h>
#include <nvgpu/vgpu/vgpu.h>
@@ -38,7 +40,6 @@
#include <gk20a/fb_gk20a.h>
#include <gk20a/flcn_gk20a.h>
#include <gk20a/bus_gk20a.h>
#include <gk20a/mc_gk20a.h>
#include "gk20a/dbg_gpu_gk20a.h"