diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-04-18 15:59:00 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-06-15 20:47:31 -0400 |
commit | 2a2c16af5f9f1ccfc93a13e820d5381e5c881e92 (patch) | |
tree | 2e5d7b042270a649978e5bb540857012c85fb5b5 /drivers/gpu/nvgpu | |
parent | 98d996f4ffb0137d119b5849cae46d7b7e5693e1 (diff) |
gpu: nvgpu: Move Linux files away from common
Move all Linux source code files to drivers/gpu/nvgpu/os/linux from
drivers/gpu/nvgpu/common/linux. This changes the meaning of common
to be OS independent.
JIRA NVGPU-598
JIRA NVGPU-601
Change-Id: Ib7f2a43d3688bb0d0b7dcc48469a6783fd988ce9
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1747714
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 213 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/clk_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/mclk_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/therm_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/nvhost.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/cde.c (renamed from drivers/gpu/nvgpu/common/linux/cde.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/cde.h (renamed from drivers/gpu/nvgpu/common/linux/cde.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/cde_gm20b.c (renamed from drivers/gpu/nvgpu/common/linux/cde_gm20b.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/cde_gm20b.h (renamed from drivers/gpu/nvgpu/common/linux/cde_gm20b.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/cde_gp10b.c (renamed from drivers/gpu/nvgpu/common/linux/cde_gp10b.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/cde_gp10b.h (renamed from drivers/gpu/nvgpu/common/linux/cde_gp10b.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ce2.c (renamed from drivers/gpu/nvgpu/common/linux/ce2.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/channel.c (renamed from drivers/gpu/nvgpu/common/linux/channel.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/channel.h (renamed from drivers/gpu/nvgpu/common/linux/channel.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/clk.c (renamed from drivers/gpu/nvgpu/common/linux/clk.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/clk.h (renamed from drivers/gpu/nvgpu/common/linux/clk.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/comptags.c (renamed from drivers/gpu/nvgpu/common/linux/comptags.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/cond.c (renamed from drivers/gpu/nvgpu/common/linux/cond.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ctxsw_trace.c (renamed from drivers/gpu/nvgpu/common/linux/ctxsw_trace.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ctxsw_trace.h (renamed from drivers/gpu/nvgpu/common/linux/ctxsw_trace.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug.c (renamed from drivers/gpu/nvgpu/common/linux/debug.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_allocator.c (renamed from drivers/gpu/nvgpu/common/linux/debug_allocator.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_allocator.h (renamed from drivers/gpu/nvgpu/common/linux/debug_allocator.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_cde.c (renamed from drivers/gpu/nvgpu/common/linux/debug_cde.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_cde.h (renamed from drivers/gpu/nvgpu/common/linux/debug_cde.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_ce.c (renamed from drivers/gpu/nvgpu/common/linux/debug_ce.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_ce.h (renamed from drivers/gpu/nvgpu/common/linux/debug_ce.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_clk.c (renamed from drivers/gpu/nvgpu/common/linux/debug_clk.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_fifo.c (renamed from drivers/gpu/nvgpu/common/linux/debug_fifo.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_fifo.h (renamed from drivers/gpu/nvgpu/common/linux/debug_fifo.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_gr.c (renamed from drivers/gpu/nvgpu/common/linux/debug_gr.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_gr.h (renamed from drivers/gpu/nvgpu/common/linux/debug_gr.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_hal.c (renamed from drivers/gpu/nvgpu/common/linux/debug_hal.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_hal.h (renamed from drivers/gpu/nvgpu/common/linux/debug_hal.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_kmem.c (renamed from drivers/gpu/nvgpu/common/linux/debug_kmem.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_kmem.h (renamed from drivers/gpu/nvgpu/common/linux/debug_kmem.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_pmu.c (renamed from drivers/gpu/nvgpu/common/linux/debug_pmu.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_pmu.h (renamed from drivers/gpu/nvgpu/common/linux/debug_pmu.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_sched.c (renamed from drivers/gpu/nvgpu/common/linux/debug_sched.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_sched.h (renamed from drivers/gpu/nvgpu/common/linux/debug_sched.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_xve.c (renamed from drivers/gpu/nvgpu/common/linux/debug_xve.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_xve.h (renamed from drivers/gpu/nvgpu/common/linux/debug_xve.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/dma.c (renamed from drivers/gpu/nvgpu/common/linux/dma.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/dmabuf.c (renamed from drivers/gpu/nvgpu/common/linux/dmabuf.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/dmabuf.h (renamed from drivers/gpu/nvgpu/common/linux/dmabuf.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/driver_common.c (renamed from drivers/gpu/nvgpu/common/linux/driver_common.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/driver_common.h (renamed from drivers/gpu/nvgpu/common/linux/driver_common.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/dt.c (renamed from drivers/gpu/nvgpu/common/linux/dt.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/firmware.c (renamed from drivers/gpu/nvgpu/common/linux/firmware.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/fuse.c (renamed from drivers/gpu/nvgpu/common/linux/fuse.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/intr.c (renamed from drivers/gpu/nvgpu/common/linux/intr.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/intr.h (renamed from drivers/gpu/nvgpu/common/linux/intr.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/io.c (renamed from drivers/gpu/nvgpu/common/linux/io.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/io_usermode.c (renamed from drivers/gpu/nvgpu/common/linux/io_usermode.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl.c (renamed from drivers/gpu/nvgpu/common/linux/ioctl.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl.h (renamed from drivers/gpu/nvgpu/common/linux/ioctl.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_as.c (renamed from drivers/gpu/nvgpu/common/linux/ioctl_as.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_as.h (renamed from drivers/gpu/nvgpu/common/linux/ioctl_as.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_channel.c (renamed from drivers/gpu/nvgpu/common/linux/ioctl_channel.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_channel.h (renamed from drivers/gpu/nvgpu/common/linux/ioctl_channel.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c (renamed from drivers/gpu/nvgpu/common/linux/ioctl_clk_arb.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c (renamed from drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_ctrl.h (renamed from drivers/gpu/nvgpu/common/linux/ioctl_ctrl.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_dbg.c (renamed from drivers/gpu/nvgpu/common/linux/ioctl_dbg.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_dbg.h (renamed from drivers/gpu/nvgpu/common/linux/ioctl_dbg.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_tsg.c (renamed from drivers/gpu/nvgpu/common/linux/ioctl_tsg.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_tsg.h (renamed from drivers/gpu/nvgpu/common/linux/ioctl_tsg.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/kmem.c (renamed from drivers/gpu/nvgpu/common/linux/kmem.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/kmem_priv.h (renamed from drivers/gpu/nvgpu/common/linux/kmem_priv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/log.c (renamed from drivers/gpu/nvgpu/common/linux/log.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/module.c (renamed from drivers/gpu/nvgpu/common/linux/module.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/module.h (renamed from drivers/gpu/nvgpu/common/linux/module.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/module_usermode.c (renamed from drivers/gpu/nvgpu/common/linux/module_usermode.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/module_usermode.h (renamed from drivers/gpu/nvgpu/common/linux/module_usermode.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/nvgpu_mem.c (renamed from drivers/gpu/nvgpu/common/linux/nvgpu_mem.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/nvhost.c (renamed from drivers/gpu/nvgpu/common/linux/nvhost.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/nvhost_priv.h (renamed from drivers/gpu/nvgpu/common/linux/nvhost_priv.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/nvlink.c (renamed from drivers/gpu/nvgpu/common/linux/nvlink.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_fence_android.c (renamed from drivers/gpu/nvgpu/common/linux/os_fence_android.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c (renamed from drivers/gpu/nvgpu/common/linux/os_fence_android_sema.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c (renamed from drivers/gpu/nvgpu/common/linux/os_fence_android_syncpt.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_linux.h (renamed from drivers/gpu/nvgpu/common/linux/os_linux.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_sched.c (renamed from drivers/gpu/nvgpu/common/linux/os_sched.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/pci.c (renamed from drivers/gpu/nvgpu/common/linux/pci.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/pci.h (renamed from drivers/gpu/nvgpu/common/linux/pci.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/pci_usermode.c (renamed from drivers/gpu/nvgpu/common/linux/pci_usermode.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/pci_usermode.h (renamed from drivers/gpu/nvgpu/common/linux/pci_usermode.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/platform_ecc_sysfs.c (renamed from drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/platform_ecc_sysfs.h (renamed from drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/platform_gk20a.h (renamed from drivers/gpu/nvgpu/common/linux/platform_gk20a.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c (renamed from drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.h (renamed from drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/platform_gp10b.h (renamed from drivers/gpu/nvgpu/gp10b/platform_gp10b.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c (renamed from drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.h (renamed from drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c (renamed from drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/rwsem.c (renamed from drivers/gpu/nvgpu/common/linux/rwsem.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/scale.c (renamed from drivers/gpu/nvgpu/common/linux/scale.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/scale.h (renamed from drivers/gpu/nvgpu/common/linux/scale.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/sched.c (renamed from drivers/gpu/nvgpu/common/linux/sched.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/sched.h (renamed from drivers/gpu/nvgpu/common/linux/sched.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/sim.c (renamed from drivers/gpu/nvgpu/common/linux/sim.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/sim_pci.c (renamed from drivers/gpu/nvgpu/common/linux/sim_pci.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/soc.c (renamed from drivers/gpu/nvgpu/common/linux/soc.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/sync_sema_android.c (renamed from drivers/gpu/nvgpu/common/linux/sync_sema_android.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/sync_sema_android.h (renamed from drivers/gpu/nvgpu/common/linux/sync_sema_android.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/sysfs.c (renamed from drivers/gpu/nvgpu/common/linux/sysfs.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/sysfs.h (renamed from drivers/gpu/nvgpu/common/linux/sysfs.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/thread.c (renamed from drivers/gpu/nvgpu/common/linux/thread.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/timers.c (renamed from drivers/gpu/nvgpu/common/linux/timers.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.c (renamed from drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.h (renamed from drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu.c (renamed from drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c (renamed from drivers/gpu/nvgpu/common/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c) | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c (renamed from drivers/gpu/nvgpu/common/linux/vgpu/platform_vgpu_tegra.c) | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/sysfs_vgpu.c (renamed from drivers/gpu/nvgpu/common/linux/vgpu/sysfs_vgpu.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivc.c (renamed from drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivc.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivm.c (renamed from drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivm.c) | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c (renamed from drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c) | 12 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.h (renamed from drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.h) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vidmem.c (renamed from drivers/gpu/nvgpu/common/linux/vidmem.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vm.c (renamed from drivers/gpu/nvgpu/common/linux/vm.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/pmgr/pmgr.c | 2 |
124 files changed, 146 insertions, 133 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index 5c7bb767..42d9855f 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -30,39 +30,118 @@ nvgpu-y += common/bus/bus_gk20a.o \ | |||
30 | common/ptimer/ptimer.o \ | 30 | common/ptimer/ptimer.o \ |
31 | common/ptimer/ptimer_gk20a.o | 31 | common/ptimer/ptimer_gk20a.o |
32 | 32 | ||
33 | # Linux specific parts of nvgpu. | ||
34 | nvgpu-y += \ | ||
35 | os/linux/kmem.o \ | ||
36 | os/linux/timers.o \ | ||
37 | os/linux/ioctl.o \ | ||
38 | os/linux/ioctl_ctrl.o \ | ||
39 | os/linux/ioctl_as.o \ | ||
40 | os/linux/ioctl_channel.o \ | ||
41 | os/linux/ioctl_tsg.o \ | ||
42 | os/linux/ioctl_dbg.o \ | ||
43 | os/linux/ioctl_clk_arb.o \ | ||
44 | os/linux/log.o \ | ||
45 | os/linux/cond.o \ | ||
46 | os/linux/nvgpu_mem.o \ | ||
47 | os/linux/dma.o \ | ||
48 | os/linux/driver_common.o \ | ||
49 | os/linux/firmware.o \ | ||
50 | os/linux/thread.o \ | ||
51 | os/linux/vm.o \ | ||
52 | os/linux/intr.o \ | ||
53 | os/linux/sysfs.o \ | ||
54 | os/linux/io.o \ | ||
55 | os/linux/io_usermode.o \ | ||
56 | os/linux/rwsem.o \ | ||
57 | os/linux/comptags.o \ | ||
58 | os/linux/dmabuf.o \ | ||
59 | os/linux/sched.o \ | ||
60 | os/linux/channel.o \ | ||
61 | os/linux/ce2.o \ | ||
62 | os/linux/sim.o \ | ||
63 | os/linux/sim_pci.o \ | ||
64 | os/linux/os_sched.o \ | ||
65 | os/linux/nvlink.o \ | ||
66 | os/linux/dt.o | ||
67 | |||
68 | nvgpu-$(CONFIG_GK20A_VIDMEM) += \ | ||
69 | os/linux/vidmem.o | ||
70 | |||
71 | nvgpu-$(CONFIG_DEBUG_FS) += \ | ||
72 | os/linux/debug.o \ | ||
73 | os/linux/debug_gr.o \ | ||
74 | os/linux/debug_fifo.o \ | ||
75 | os/linux/debug_ce.o \ | ||
76 | os/linux/debug_pmu.o \ | ||
77 | os/linux/debug_sched.o \ | ||
78 | os/linux/debug_allocator.o \ | ||
79 | os/linux/debug_hal.o \ | ||
80 | os/linux/debug_clk.o \ | ||
81 | os/linux/debug_xve.o | ||
82 | |||
83 | ifeq ($(CONFIG_NVGPU_TRACK_MEM_USAGE),y) | ||
84 | nvgpu-$(CONFIG_DEBUG_FS) += \ | ||
85 | os/linux/debug_kmem.o | ||
86 | endif | ||
87 | |||
88 | nvgpu-$(CONFIG_GK20A_CTXSW_TRACE) += \ | ||
89 | os/linux/ctxsw_trace.o | ||
90 | |||
91 | nvgpu-$(CONFIG_TEGRA_GK20A) += \ | ||
92 | os/linux/module.o \ | ||
93 | os/linux/module_usermode.o \ | ||
94 | os/linux/soc.o \ | ||
95 | os/linux/fuse.o \ | ||
96 | os/linux/platform_ecc_sysfs.o \ | ||
97 | os/linux/platform_gk20a_tegra.o \ | ||
98 | os/linux/platform_gp10b_tegra.o \ | ||
99 | os/linux/platform_gv11b_tegra.o | ||
100 | |||
101 | nvgpu-$(CONFIG_SYNC) += \ | ||
102 | os/linux/sync_sema_android.o \ | ||
103 | os/linux/os_fence_android.o \ | ||
104 | os/linux/os_fence_android_sema.o | ||
105 | |||
106 | ifeq ($(CONFIG_TEGRA_GK20A_NVHOST), y) | ||
107 | nvgpu-$(CONFIG_SYNC) += \ | ||
108 | os/linux/os_fence_android_syncpt.o | ||
109 | endif | ||
110 | |||
111 | nvgpu-$(CONFIG_GK20A_PCI) += \ | ||
112 | os/linux/pci.o \ | ||
113 | os/linux/pci_usermode.o | ||
114 | |||
115 | nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += \ | ||
116 | os/linux/nvhost.o | ||
117 | |||
118 | nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ | ||
119 | os/linux/vgpu/platform_vgpu_tegra.o \ | ||
120 | os/linux/vgpu/fecs_trace_vgpu.o \ | ||
121 | os/linux/vgpu/clk_vgpu.o \ | ||
122 | os/linux/vgpu/sysfs_vgpu.o \ | ||
123 | os/linux/vgpu/vgpu_ivc.o \ | ||
124 | os/linux/vgpu/vgpu_ivm.o \ | ||
125 | os/linux/vgpu/vgpu_linux.o \ | ||
126 | os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.o | ||
127 | |||
128 | nvgpu-$(CONFIG_COMMON_CLK) += \ | ||
129 | os/linux/clk.o | ||
130 | |||
131 | nvgpu-$(CONFIG_GK20A_DEVFREQ) += \ | ||
132 | os/linux/scale.o | ||
133 | |||
134 | nvgpu-$(CONFIG_NVGPU_SUPPORT_CDE) += \ | ||
135 | os/linux/cde.o \ | ||
136 | os/linux/cde_gm20b.o \ | ||
137 | os/linux/cde_gp10b.o | ||
138 | |||
139 | ifeq ($(CONFIG_DEBUG_FS),y) | ||
140 | nvgpu-$(CONFIG_NVGPU_SUPPORT_CDE) += \ | ||
141 | os/linux/debug_cde.o | ||
142 | endif | ||
143 | |||
33 | nvgpu-y += \ | 144 | nvgpu-y += \ |
34 | common/linux/kmem.o \ | ||
35 | common/linux/timers.o \ | ||
36 | common/linux/ioctl.o \ | ||
37 | common/linux/ioctl_ctrl.o \ | ||
38 | common/linux/ioctl_as.o \ | ||
39 | common/linux/ioctl_channel.o \ | ||
40 | common/linux/ioctl_tsg.o \ | ||
41 | common/linux/ioctl_dbg.o \ | ||
42 | common/linux/ioctl_clk_arb.o \ | ||
43 | common/linux/log.o \ | ||
44 | common/linux/cond.o \ | ||
45 | common/linux/nvgpu_mem.o \ | ||
46 | common/linux/dma.o \ | ||
47 | common/linux/driver_common.o \ | ||
48 | common/linux/firmware.o \ | ||
49 | common/linux/thread.o \ | ||
50 | common/linux/vm.o \ | ||
51 | common/linux/intr.o \ | ||
52 | common/linux/sysfs.o \ | ||
53 | common/linux/io.o \ | ||
54 | common/linux/io_usermode.o \ | ||
55 | common/linux/rwsem.o \ | ||
56 | common/linux/comptags.o \ | ||
57 | common/linux/dmabuf.o \ | ||
58 | common/linux/sched.o \ | ||
59 | common/linux/channel.o \ | ||
60 | common/linux/ce2.o \ | ||
61 | common/linux/sim.o \ | ||
62 | common/linux/sim_pci.o \ | ||
63 | common/linux/os_sched.o \ | ||
64 | common/linux/nvlink.o \ | ||
65 | common/linux/dt.o \ | ||
66 | common/mm/nvgpu_allocator.o \ | 145 | common/mm/nvgpu_allocator.o \ |
67 | common/mm/bitmap_allocator.o \ | 146 | common/mm/bitmap_allocator.o \ |
68 | common/mm/buddy_allocator.o \ | 147 | common/mm/buddy_allocator.o \ |
@@ -138,51 +217,7 @@ nvgpu-y += \ | |||
138 | boardobj/boardobjgrp_e32.o | 217 | boardobj/boardobjgrp_e32.o |
139 | 218 | ||
140 | nvgpu-$(CONFIG_GK20A_VIDMEM) += \ | 219 | nvgpu-$(CONFIG_GK20A_VIDMEM) += \ |
141 | common/mm/vidmem.o \ | 220 | common/mm/vidmem.o |
142 | common/linux/vidmem.o | ||
143 | |||
144 | nvgpu-$(CONFIG_DEBUG_FS) += \ | ||
145 | common/linux/debug.o \ | ||
146 | common/linux/debug_gr.o \ | ||
147 | common/linux/debug_fifo.o \ | ||
148 | common/linux/debug_ce.o \ | ||
149 | common/linux/debug_pmu.o \ | ||
150 | common/linux/debug_sched.o \ | ||
151 | common/linux/debug_allocator.o \ | ||
152 | common/linux/debug_hal.o \ | ||
153 | common/linux/debug_clk.o \ | ||
154 | common/linux/debug_xve.o | ||
155 | |||
156 | ifeq ($(CONFIG_NVGPU_TRACK_MEM_USAGE),y) | ||
157 | nvgpu-$(CONFIG_DEBUG_FS) += \ | ||
158 | common/linux/debug_kmem.o | ||
159 | endif | ||
160 | |||
161 | nvgpu-$(CONFIG_GK20A_CTXSW_TRACE) += \ | ||
162 | common/linux/ctxsw_trace.o | ||
163 | |||
164 | nvgpu-$(CONFIG_TEGRA_GK20A) += \ | ||
165 | common/linux/module.o \ | ||
166 | common/linux/module_usermode.o \ | ||
167 | common/linux/soc.o \ | ||
168 | common/linux/fuse.o \ | ||
169 | common/linux/platform_ecc_sysfs.o \ | ||
170 | common/linux/platform_gk20a_tegra.o \ | ||
171 | common/linux/platform_gp10b_tegra.o \ | ||
172 | common/linux/platform_gv11b_tegra.o | ||
173 | |||
174 | nvgpu-$(CONFIG_SYNC) += common/linux/sync_sema_android.o \ | ||
175 | common/linux/os_fence_android.o \ | ||
176 | common/linux/os_fence_android_sema.o | ||
177 | |||
178 | ifeq ($(CONFIG_TEGRA_GK20A_NVHOST), y) | ||
179 | nvgpu-$(CONFIG_SYNC) += common/linux/os_fence_android_syncpt.o | ||
180 | endif | ||
181 | |||
182 | nvgpu-$(CONFIG_GK20A_PCI) += common/linux/pci.o \ | ||
183 | common/linux/pci_usermode.o \ | ||
184 | |||
185 | nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += common/linux/nvhost.o | ||
186 | 221 | ||
187 | nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ | 222 | nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ |
188 | vgpu/ltc_vgpu.o \ | 223 | vgpu/ltc_vgpu.o \ |
@@ -205,20 +240,6 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \ | |||
205 | vgpu/gv11b/vgpu_fifo_gv11b.o \ | 240 | vgpu/gv11b/vgpu_fifo_gv11b.o \ |
206 | vgpu/gv11b/vgpu_subctx_gv11b.o \ | 241 | vgpu/gv11b/vgpu_subctx_gv11b.o \ |
207 | vgpu/gv11b/vgpu_tsg_gv11b.o \ | 242 | vgpu/gv11b/vgpu_tsg_gv11b.o \ |
208 | common/linux/vgpu/platform_vgpu_tegra.o \ | ||
209 | common/linux/vgpu/fecs_trace_vgpu.o \ | ||
210 | common/linux/vgpu/clk_vgpu.o \ | ||
211 | common/linux/vgpu/sysfs_vgpu.o \ | ||
212 | common/linux/vgpu/vgpu_ivc.o \ | ||
213 | common/linux/vgpu/vgpu_ivm.o \ | ||
214 | common/linux/vgpu/vgpu_linux.o \ | ||
215 | common/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.o | ||
216 | |||
217 | nvgpu-$(CONFIG_COMMON_CLK) += \ | ||
218 | common/linux/clk.o | ||
219 | |||
220 | nvgpu-$(CONFIG_GK20A_DEVFREQ) += \ | ||
221 | common/linux/scale.o | ||
222 | 243 | ||
223 | nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \ | 244 | nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \ |
224 | gk20a/css_gr_gk20a.o | 245 | gk20a/css_gr_gk20a.o |
@@ -316,13 +337,3 @@ nvgpu-y += \ | |||
316 | therm/thrmpmu.o \ | 337 | therm/thrmpmu.o \ |
317 | lpwr/rppg.o \ | 338 | lpwr/rppg.o \ |
318 | lpwr/lpwr.o | 339 | lpwr/lpwr.o |
319 | |||
320 | nvgpu-$(CONFIG_NVGPU_SUPPORT_CDE) += \ | ||
321 | common/linux/cde.o \ | ||
322 | common/linux/cde_gm20b.o \ | ||
323 | common/linux/cde_gp10b.o | ||
324 | |||
325 | ifeq ($(CONFIG_DEBUG_FS),y) | ||
326 | nvgpu-$(CONFIG_NVGPU_SUPPORT_CDE) += \ | ||
327 | common/linux/debug_cde.o | ||
328 | endif | ||
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c index 117920da..7e0aee11 100644 --- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #include "fecs_trace_gk20a.h" | 41 | #include "fecs_trace_gk20a.h" |
42 | #include "gk20a.h" | 42 | #include "gk20a.h" |
43 | #include "gr_gk20a.h" | 43 | #include "gr_gk20a.h" |
44 | #include "common/linux/os_linux.h" | 44 | #include "os/linux/os_linux.h" |
45 | 45 | ||
46 | #include <nvgpu/log.h> | 46 | #include <nvgpu/log.h> |
47 | 47 | ||
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.c b/drivers/gpu/nvgpu/gp106/clk_gp106.c index 057527a9..07e281a5 100644 --- a/drivers/gpu/nvgpu/gp106/clk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/clk_gp106.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #ifdef CONFIG_DEBUG_FS | 25 | #ifdef CONFIG_DEBUG_FS |
26 | #include <linux/debugfs.h> | 26 | #include <linux/debugfs.h> |
27 | #include "common/linux/os_linux.h" | 27 | #include "os/linux/os_linux.h" |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | #include <nvgpu/kmem.h> | 30 | #include <nvgpu/kmem.h> |
diff --git a/drivers/gpu/nvgpu/gp106/mclk_gp106.c b/drivers/gpu/nvgpu/gp106/mclk_gp106.c index 074aec92..4ea9e6f6 100644 --- a/drivers/gpu/nvgpu/gp106/mclk_gp106.c +++ b/drivers/gpu/nvgpu/gp106/mclk_gp106.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
29 | #ifdef CONFIG_DEBUG_FS | 29 | #ifdef CONFIG_DEBUG_FS |
30 | #include <linux/debugfs.h> | 30 | #include <linux/debugfs.h> |
31 | #include "common/linux/os_linux.h" | 31 | #include "os/linux/os_linux.h" |
32 | #endif | 32 | #endif |
33 | #include "gp106/mclk_gp106.h" | 33 | #include "gp106/mclk_gp106.h" |
34 | 34 | ||
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c index b3862abe..b1f6fefb 100644 --- a/drivers/gpu/nvgpu/gp106/therm_gp106.c +++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | #ifdef CONFIG_DEBUG_FS | 28 | #ifdef CONFIG_DEBUG_FS |
29 | #include <linux/debugfs.h> | 29 | #include <linux/debugfs.h> |
30 | #include "common/linux/os_linux.h" | 30 | #include "os/linux/os_linux.h" |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | #include <nvgpu/hw/gp106/hw_therm_gp106.h> | 33 | #include <nvgpu/hw/gp106/hw_therm_gp106.h> |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h index ba6012ec..7d50d222 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h | |||
@@ -25,6 +25,8 @@ | |||
25 | 25 | ||
26 | #ifdef CONFIG_TEGRA_GK20A_NVHOST | 26 | #ifdef CONFIG_TEGRA_GK20A_NVHOST |
27 | 27 | ||
28 | #include <nvgpu/types.h> | ||
29 | |||
28 | struct nvgpu_nvhost_dev; | 30 | struct nvgpu_nvhost_dev; |
29 | struct gk20a; | 31 | struct gk20a; |
30 | struct sync_pt; | 32 | struct sync_pt; |
diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/os/linux/cde.c index 32b333f1..32b333f1 100644 --- a/drivers/gpu/nvgpu/common/linux/cde.c +++ b/drivers/gpu/nvgpu/os/linux/cde.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/cde.h b/drivers/gpu/nvgpu/os/linux/cde.h index 5928b624..5928b624 100644 --- a/drivers/gpu/nvgpu/common/linux/cde.h +++ b/drivers/gpu/nvgpu/os/linux/cde.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/cde_gm20b.c b/drivers/gpu/nvgpu/os/linux/cde_gm20b.c index 1cd15c54..1cd15c54 100644 --- a/drivers/gpu/nvgpu/common/linux/cde_gm20b.c +++ b/drivers/gpu/nvgpu/os/linux/cde_gm20b.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/cde_gm20b.h b/drivers/gpu/nvgpu/os/linux/cde_gm20b.h index 640d6ab6..640d6ab6 100644 --- a/drivers/gpu/nvgpu/common/linux/cde_gm20b.h +++ b/drivers/gpu/nvgpu/os/linux/cde_gm20b.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/cde_gp10b.c b/drivers/gpu/nvgpu/os/linux/cde_gp10b.c index 5c0e79a7..5c0e79a7 100644 --- a/drivers/gpu/nvgpu/common/linux/cde_gp10b.c +++ b/drivers/gpu/nvgpu/os/linux/cde_gp10b.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/cde_gp10b.h b/drivers/gpu/nvgpu/os/linux/cde_gp10b.h index 52e9f292..52e9f292 100644 --- a/drivers/gpu/nvgpu/common/linux/cde_gp10b.h +++ b/drivers/gpu/nvgpu/os/linux/cde_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ce2.c b/drivers/gpu/nvgpu/os/linux/ce2.c index 165f33db..165f33db 100644 --- a/drivers/gpu/nvgpu/common/linux/ce2.c +++ b/drivers/gpu/nvgpu/os/linux/ce2.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/channel.c b/drivers/gpu/nvgpu/os/linux/channel.c index 7810bc21..7810bc21 100644 --- a/drivers/gpu/nvgpu/common/linux/channel.c +++ b/drivers/gpu/nvgpu/os/linux/channel.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/channel.h b/drivers/gpu/nvgpu/os/linux/channel.h index 4a58b10c..4a58b10c 100644 --- a/drivers/gpu/nvgpu/common/linux/channel.h +++ b/drivers/gpu/nvgpu/os/linux/channel.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/clk.c b/drivers/gpu/nvgpu/os/linux/clk.c index 414b17c4..414b17c4 100644 --- a/drivers/gpu/nvgpu/common/linux/clk.c +++ b/drivers/gpu/nvgpu/os/linux/clk.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/clk.h b/drivers/gpu/nvgpu/os/linux/clk.h index 614a7fd7..614a7fd7 100644 --- a/drivers/gpu/nvgpu/common/linux/clk.h +++ b/drivers/gpu/nvgpu/os/linux/clk.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/comptags.c b/drivers/gpu/nvgpu/os/linux/comptags.c index 353f6363..353f6363 100644 --- a/drivers/gpu/nvgpu/common/linux/comptags.c +++ b/drivers/gpu/nvgpu/os/linux/comptags.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/cond.c b/drivers/gpu/nvgpu/os/linux/cond.c index 633c34fd..633c34fd 100644 --- a/drivers/gpu/nvgpu/common/linux/cond.c +++ b/drivers/gpu/nvgpu/os/linux/cond.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c index a335988a..a335988a 100644 --- a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.c +++ b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.h b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.h index 88ca7f25..88ca7f25 100644 --- a/drivers/gpu/nvgpu/common/linux/ctxsw_trace.h +++ b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug.c b/drivers/gpu/nvgpu/os/linux/debug.c index 8738f3e7..8738f3e7 100644 --- a/drivers/gpu/nvgpu/common/linux/debug.c +++ b/drivers/gpu/nvgpu/os/linux/debug.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_allocator.c b/drivers/gpu/nvgpu/os/linux/debug_allocator.c index d63a9030..d63a9030 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_allocator.c +++ b/drivers/gpu/nvgpu/os/linux/debug_allocator.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_allocator.h b/drivers/gpu/nvgpu/os/linux/debug_allocator.h index 1b21cfc5..1b21cfc5 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_allocator.h +++ b/drivers/gpu/nvgpu/os/linux/debug_allocator.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_cde.c b/drivers/gpu/nvgpu/os/linux/debug_cde.c index f0afa6ee..f0afa6ee 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_cde.c +++ b/drivers/gpu/nvgpu/os/linux/debug_cde.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_cde.h b/drivers/gpu/nvgpu/os/linux/debug_cde.h index 4895edd6..4895edd6 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_cde.h +++ b/drivers/gpu/nvgpu/os/linux/debug_cde.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_ce.c b/drivers/gpu/nvgpu/os/linux/debug_ce.c index cea0bb47..cea0bb47 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_ce.c +++ b/drivers/gpu/nvgpu/os/linux/debug_ce.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_ce.h b/drivers/gpu/nvgpu/os/linux/debug_ce.h index 2a8750c4..2a8750c4 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_ce.h +++ b/drivers/gpu/nvgpu/os/linux/debug_ce.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_clk.c b/drivers/gpu/nvgpu/os/linux/debug_clk.c index 2484d44b..2484d44b 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_clk.c +++ b/drivers/gpu/nvgpu/os/linux/debug_clk.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_fifo.c b/drivers/gpu/nvgpu/os/linux/debug_fifo.c index 2b5674c0..2b5674c0 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_fifo.c +++ b/drivers/gpu/nvgpu/os/linux/debug_fifo.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_fifo.h b/drivers/gpu/nvgpu/os/linux/debug_fifo.h index 46ac853e..46ac853e 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_fifo.h +++ b/drivers/gpu/nvgpu/os/linux/debug_fifo.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_gr.c b/drivers/gpu/nvgpu/os/linux/debug_gr.c index d54c6d63..d54c6d63 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_gr.c +++ b/drivers/gpu/nvgpu/os/linux/debug_gr.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_gr.h b/drivers/gpu/nvgpu/os/linux/debug_gr.h index 4b46acbb..4b46acbb 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_gr.h +++ b/drivers/gpu/nvgpu/os/linux/debug_gr.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_hal.c b/drivers/gpu/nvgpu/os/linux/debug_hal.c index 031e335e..031e335e 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_hal.c +++ b/drivers/gpu/nvgpu/os/linux/debug_hal.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_hal.h b/drivers/gpu/nvgpu/os/linux/debug_hal.h index eee6f234..eee6f234 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_hal.h +++ b/drivers/gpu/nvgpu/os/linux/debug_hal.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_kmem.c b/drivers/gpu/nvgpu/os/linux/debug_kmem.c index a0c7d47d..a0c7d47d 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_kmem.c +++ b/drivers/gpu/nvgpu/os/linux/debug_kmem.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_kmem.h b/drivers/gpu/nvgpu/os/linux/debug_kmem.h index 44322b53..44322b53 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_kmem.h +++ b/drivers/gpu/nvgpu/os/linux/debug_kmem.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_pmu.c b/drivers/gpu/nvgpu/os/linux/debug_pmu.c index f4ed992d..f4ed992d 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_pmu.c +++ b/drivers/gpu/nvgpu/os/linux/debug_pmu.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_pmu.h b/drivers/gpu/nvgpu/os/linux/debug_pmu.h index c4e3243d..c4e3243d 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_pmu.h +++ b/drivers/gpu/nvgpu/os/linux/debug_pmu.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_sched.c b/drivers/gpu/nvgpu/os/linux/debug_sched.c index 5b7cbddf..5b7cbddf 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_sched.c +++ b/drivers/gpu/nvgpu/os/linux/debug_sched.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_sched.h b/drivers/gpu/nvgpu/os/linux/debug_sched.h index 34a8f55f..34a8f55f 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_sched.h +++ b/drivers/gpu/nvgpu/os/linux/debug_sched.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_xve.c b/drivers/gpu/nvgpu/os/linux/debug_xve.c index 743702a2..743702a2 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_xve.c +++ b/drivers/gpu/nvgpu/os/linux/debug_xve.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/debug_xve.h b/drivers/gpu/nvgpu/os/linux/debug_xve.h index f3b1ac54..f3b1ac54 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_xve.h +++ b/drivers/gpu/nvgpu/os/linux/debug_xve.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/os/linux/dma.c index f513dcd6..f513dcd6 100644 --- a/drivers/gpu/nvgpu/common/linux/dma.c +++ b/drivers/gpu/nvgpu/os/linux/dma.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/dmabuf.c b/drivers/gpu/nvgpu/os/linux/dmabuf.c index 129739f0..129739f0 100644 --- a/drivers/gpu/nvgpu/common/linux/dmabuf.c +++ b/drivers/gpu/nvgpu/os/linux/dmabuf.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/dmabuf.h b/drivers/gpu/nvgpu/os/linux/dmabuf.h index 8399eaaf..8399eaaf 100644 --- a/drivers/gpu/nvgpu/common/linux/dmabuf.h +++ b/drivers/gpu/nvgpu/os/linux/dmabuf.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/os/linux/driver_common.c index 8f33c5d2..8f33c5d2 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.c +++ b/drivers/gpu/nvgpu/os/linux/driver_common.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.h b/drivers/gpu/nvgpu/os/linux/driver_common.h index 6f42f775..6f42f775 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.h +++ b/drivers/gpu/nvgpu/os/linux/driver_common.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/dt.c b/drivers/gpu/nvgpu/os/linux/dt.c index 88e391e3..88e391e3 100644 --- a/drivers/gpu/nvgpu/common/linux/dt.c +++ b/drivers/gpu/nvgpu/os/linux/dt.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/firmware.c b/drivers/gpu/nvgpu/os/linux/firmware.c index 9a4dc653..9a4dc653 100644 --- a/drivers/gpu/nvgpu/common/linux/firmware.c +++ b/drivers/gpu/nvgpu/os/linux/firmware.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/fuse.c b/drivers/gpu/nvgpu/os/linux/fuse.c index 27851f92..27851f92 100644 --- a/drivers/gpu/nvgpu/common/linux/fuse.c +++ b/drivers/gpu/nvgpu/os/linux/fuse.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/intr.c b/drivers/gpu/nvgpu/os/linux/intr.c index 7ffc7e87..7ffc7e87 100644 --- a/drivers/gpu/nvgpu/common/linux/intr.c +++ b/drivers/gpu/nvgpu/os/linux/intr.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/intr.h b/drivers/gpu/nvgpu/os/linux/intr.h index d43cdccb..d43cdccb 100644 --- a/drivers/gpu/nvgpu/common/linux/intr.h +++ b/drivers/gpu/nvgpu/os/linux/intr.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/io.c b/drivers/gpu/nvgpu/os/linux/io.c index c06512a5..c06512a5 100644 --- a/drivers/gpu/nvgpu/common/linux/io.c +++ b/drivers/gpu/nvgpu/os/linux/io.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/io_usermode.c b/drivers/gpu/nvgpu/os/linux/io_usermode.c index a7b728dd..ce7c9e75 100644 --- a/drivers/gpu/nvgpu/common/linux/io_usermode.c +++ b/drivers/gpu/nvgpu/os/linux/io_usermode.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <nvgpu/io.h> | 14 | #include <nvgpu/io.h> |
15 | #include <nvgpu/types.h> | 15 | #include <nvgpu/types.h> |
16 | 16 | ||
17 | #include "common/linux/os_linux.h" | 17 | #include "os_linux.h" |
18 | #include "gk20a/gk20a.h" | 18 | #include "gk20a/gk20a.h" |
19 | 19 | ||
20 | #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h> | 20 | #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h> |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl.c b/drivers/gpu/nvgpu/os/linux/ioctl.c index 359e5103..359e5103 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl.h b/drivers/gpu/nvgpu/os/linux/ioctl.h index 7bf16711..7bf16711 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl.h +++ b/drivers/gpu/nvgpu/os/linux/ioctl.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.c b/drivers/gpu/nvgpu/os/linux/ioctl_as.c index 47f612cc..47f612cc 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_as.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_as.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.h b/drivers/gpu/nvgpu/os/linux/ioctl_as.h index b3de3782..b3de3782 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_as.h +++ b/drivers/gpu/nvgpu/os/linux/ioctl_as.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c index b04bb9de..b04bb9de 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_channel.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.h b/drivers/gpu/nvgpu/os/linux/ioctl_channel.h index 48cff1ea..48cff1ea 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.h +++ b/drivers/gpu/nvgpu/os/linux/ioctl_channel.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_clk_arb.c b/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c index a7c6a607..501b5f93 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_clk_arb.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_clk_arb.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include "volt/volt.h" | 43 | #include "volt/volt.h" |
44 | 44 | ||
45 | #ifdef CONFIG_DEBUG_FS | 45 | #ifdef CONFIG_DEBUG_FS |
46 | #include "common/linux/os_linux.h" | 46 | #include "os_linux.h" |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | static int nvgpu_clk_arb_release_completion_dev(struct inode *inode, | 49 | static int nvgpu_clk_arb_release_completion_dev(struct inode *inode, |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c index 73a8131d..73a8131d 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.h b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.h index 8b4a5e59..8b4a5e59 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.h +++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c index 31e7e2cb..31e7e2cb 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.h b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.h index bd76045b..bd76045b 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_dbg.h +++ b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c index 4ef99ded..4ef99ded 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.h b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.h index 67399fd4..67399fd4 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.h +++ b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/kmem.c b/drivers/gpu/nvgpu/os/linux/kmem.c index 10946a08..10946a08 100644 --- a/drivers/gpu/nvgpu/common/linux/kmem.c +++ b/drivers/gpu/nvgpu/os/linux/kmem.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/kmem_priv.h b/drivers/gpu/nvgpu/os/linux/kmem_priv.h index a41762af..a41762af 100644 --- a/drivers/gpu/nvgpu/common/linux/kmem_priv.h +++ b/drivers/gpu/nvgpu/os/linux/kmem_priv.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/log.c b/drivers/gpu/nvgpu/os/linux/log.c index ca29e0f3..ca29e0f3 100644 --- a/drivers/gpu/nvgpu/common/linux/log.c +++ b/drivers/gpu/nvgpu/os/linux/log.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c index af71cc81..af71cc81 100644 --- a/drivers/gpu/nvgpu/common/linux/module.c +++ b/drivers/gpu/nvgpu/os/linux/module.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/module.h b/drivers/gpu/nvgpu/os/linux/module.h index ab4bca03..ab4bca03 100644 --- a/drivers/gpu/nvgpu/common/linux/module.h +++ b/drivers/gpu/nvgpu/os/linux/module.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/module_usermode.c b/drivers/gpu/nvgpu/os/linux/module_usermode.c index 61cb4e87..ea01c1b2 100644 --- a/drivers/gpu/nvgpu/common/linux/module_usermode.c +++ b/drivers/gpu/nvgpu/os/linux/module_usermode.c | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h> | 19 | #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h> |
20 | 20 | ||
21 | #include "common/linux/os_linux.h" | 21 | #include "os_linux.h" |
22 | 22 | ||
23 | /* | 23 | /* |
24 | * Locks out the driver from accessing GPU registers. This prevents access to | 24 | * Locks out the driver from accessing GPU registers. This prevents access to |
diff --git a/drivers/gpu/nvgpu/common/linux/module_usermode.h b/drivers/gpu/nvgpu/os/linux/module_usermode.h index b17053ca..b17053ca 100644 --- a/drivers/gpu/nvgpu/common/linux/module_usermode.h +++ b/drivers/gpu/nvgpu/os/linux/module_usermode.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c index 93925803..93925803 100644 --- a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/os/linux/nvgpu_mem.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost.c b/drivers/gpu/nvgpu/os/linux/nvhost.c index 6ab60248..6ab60248 100644 --- a/drivers/gpu/nvgpu/common/linux/nvhost.c +++ b/drivers/gpu/nvgpu/os/linux/nvhost.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost_priv.h b/drivers/gpu/nvgpu/os/linux/nvhost_priv.h index c03390a7..c03390a7 100644 --- a/drivers/gpu/nvgpu/common/linux/nvhost_priv.h +++ b/drivers/gpu/nvgpu/os/linux/nvhost_priv.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/nvlink.c b/drivers/gpu/nvgpu/os/linux/nvlink.c index c93514c0..c93514c0 100644 --- a/drivers/gpu/nvgpu/common/linux/nvlink.c +++ b/drivers/gpu/nvgpu/os/linux/nvlink.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/os_fence_android.c b/drivers/gpu/nvgpu/os/linux/os_fence_android.c index 9be8c6c0..9be8c6c0 100644 --- a/drivers/gpu/nvgpu/common/linux/os_fence_android.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/os_fence_android_sema.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c index 25832417..25832417 100644 --- a/drivers/gpu/nvgpu/common/linux/os_fence_android_sema.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/os_fence_android_syncpt.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c index d7a72fcd..d7a72fcd 100644 --- a/drivers/gpu/nvgpu/common/linux/os_fence_android_syncpt.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/os_linux.h b/drivers/gpu/nvgpu/os/linux/os_linux.h index 4dcce322..4dcce322 100644 --- a/drivers/gpu/nvgpu/common/linux/os_linux.h +++ b/drivers/gpu/nvgpu/os/linux/os_linux.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/os_sched.c b/drivers/gpu/nvgpu/os/linux/os_sched.c index 586b35eb..586b35eb 100644 --- a/drivers/gpu/nvgpu/common/linux/os_sched.c +++ b/drivers/gpu/nvgpu/os/linux/os_sched.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/pci.c b/drivers/gpu/nvgpu/os/linux/pci.c index 1011b441..1011b441 100644 --- a/drivers/gpu/nvgpu/common/linux/pci.c +++ b/drivers/gpu/nvgpu/os/linux/pci.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/pci.h b/drivers/gpu/nvgpu/os/linux/pci.h index cc6b77b1..cc6b77b1 100644 --- a/drivers/gpu/nvgpu/common/linux/pci.h +++ b/drivers/gpu/nvgpu/os/linux/pci.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/pci_usermode.c b/drivers/gpu/nvgpu/os/linux/pci_usermode.c index f474bd10..270b834b 100644 --- a/drivers/gpu/nvgpu/common/linux/pci_usermode.c +++ b/drivers/gpu/nvgpu/os/linux/pci_usermode.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h> | 16 | #include <nvgpu/hw/gv11b/hw_usermode_gv11b.h> |
17 | 17 | ||
18 | #include "common/linux/os_linux.h" | 18 | #include "os_linux.h" |
19 | 19 | ||
20 | void nvgpu_pci_init_usermode_support(struct nvgpu_os_linux *l) | 20 | void nvgpu_pci_init_usermode_support(struct nvgpu_os_linux *l) |
21 | { | 21 | { |
diff --git a/drivers/gpu/nvgpu/common/linux/pci_usermode.h b/drivers/gpu/nvgpu/os/linux/pci_usermode.h index 25a08d28..25a08d28 100644 --- a/drivers/gpu/nvgpu/common/linux/pci_usermode.h +++ b/drivers/gpu/nvgpu/os/linux/pci_usermode.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.c b/drivers/gpu/nvgpu/os/linux/platform_ecc_sysfs.c index 0fe1c8d2..2a6ace37 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.c +++ b/drivers/gpu/nvgpu/os/linux/platform_ecc_sysfs.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #include "platform_gk20a.h" | 27 | #include "platform_gk20a.h" |
28 | #include "platform_gk20a_tegra.h" | 28 | #include "platform_gk20a_tegra.h" |
29 | #include "gp10b/platform_gp10b.h" | 29 | #include "platform_gp10b.h" |
30 | #include "platform_gp10b_tegra.h" | 30 | #include "platform_gp10b_tegra.h" |
31 | #include "platform_ecc_sysfs.h" | 31 | #include "platform_ecc_sysfs.h" |
32 | 32 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.h b/drivers/gpu/nvgpu/os/linux/platform_ecc_sysfs.h index d29f7bd3..d29f7bd3 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_ecc_sysfs.h +++ b/drivers/gpu/nvgpu/os/linux/platform_ecc_sysfs.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a.h b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h index 9a99b7fe..9a99b7fe 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gk20a.h +++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c index af55e5b6..af55e5b6 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.h b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.h index f7d50406..f7d50406 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.h +++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.h | |||
diff --git a/drivers/gpu/nvgpu/gp10b/platform_gp10b.h b/drivers/gpu/nvgpu/os/linux/platform_gp10b.h index d256d126..d256d126 100644 --- a/drivers/gpu/nvgpu/gp10b/platform_gp10b.h +++ b/drivers/gpu/nvgpu/os/linux/platform_gp10b.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c index fce16653..5cb82687 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include "platform_gk20a.h" | 43 | #include "platform_gk20a.h" |
44 | #include "platform_ecc_sysfs.h" | 44 | #include "platform_ecc_sysfs.h" |
45 | #include "platform_gk20a_tegra.h" | 45 | #include "platform_gk20a_tegra.h" |
46 | #include "gp10b/platform_gp10b.h" | 46 | #include "platform_gp10b.h" |
47 | #include "platform_gp10b_tegra.h" | 47 | #include "platform_gp10b_tegra.h" |
48 | #include "scale.h" | 48 | #include "scale.h" |
49 | 49 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.h b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.h index 6de90275..6de90275 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.h +++ b/drivers/gpu/nvgpu/os/linux/platform_gp10b_tegra.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c index bf66762b..d62e7932 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gv11b_tegra.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include "clk.h" | 37 | #include "clk.h" |
38 | #include "scale.h" | 38 | #include "scale.h" |
39 | 39 | ||
40 | #include "gp10b/platform_gp10b.h" | 40 | #include "platform_gp10b.h" |
41 | #include "platform_gp10b_tegra.h" | 41 | #include "platform_gp10b_tegra.h" |
42 | #include "platform_ecc_sysfs.h" | 42 | #include "platform_ecc_sysfs.h" |
43 | 43 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/rwsem.c b/drivers/gpu/nvgpu/os/linux/rwsem.c index 297ddf11..297ddf11 100644 --- a/drivers/gpu/nvgpu/common/linux/rwsem.c +++ b/drivers/gpu/nvgpu/os/linux/rwsem.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/scale.c b/drivers/gpu/nvgpu/os/linux/scale.c index 84ac1cfd..84ac1cfd 100644 --- a/drivers/gpu/nvgpu/common/linux/scale.c +++ b/drivers/gpu/nvgpu/os/linux/scale.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/scale.h b/drivers/gpu/nvgpu/os/linux/scale.h index c1e6fe86..c1e6fe86 100644 --- a/drivers/gpu/nvgpu/common/linux/scale.h +++ b/drivers/gpu/nvgpu/os/linux/scale.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/sched.c b/drivers/gpu/nvgpu/os/linux/sched.c index 2ad5aabf..2ad5aabf 100644 --- a/drivers/gpu/nvgpu/common/linux/sched.c +++ b/drivers/gpu/nvgpu/os/linux/sched.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/sched.h b/drivers/gpu/nvgpu/os/linux/sched.h index a699bbea..a699bbea 100644 --- a/drivers/gpu/nvgpu/common/linux/sched.h +++ b/drivers/gpu/nvgpu/os/linux/sched.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/sim.c b/drivers/gpu/nvgpu/os/linux/sim.c index 8e964f39..8e964f39 100644 --- a/drivers/gpu/nvgpu/common/linux/sim.c +++ b/drivers/gpu/nvgpu/os/linux/sim.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/sim_pci.c b/drivers/gpu/nvgpu/os/linux/sim_pci.c index d37767b7..d37767b7 100644 --- a/drivers/gpu/nvgpu/common/linux/sim_pci.c +++ b/drivers/gpu/nvgpu/os/linux/sim_pci.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/soc.c b/drivers/gpu/nvgpu/os/linux/soc.c index 1b27d6f1..1b27d6f1 100644 --- a/drivers/gpu/nvgpu/common/linux/soc.c +++ b/drivers/gpu/nvgpu/os/linux/soc.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/sync_sema_android.c b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c index fad21351..4dd10e6e 100644 --- a/drivers/gpu/nvgpu/common/linux/sync_sema_android.c +++ b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <nvgpu/semaphore.h> | 26 | #include <nvgpu/semaphore.h> |
27 | #include <nvgpu/bug.h> | 27 | #include <nvgpu/bug.h> |
28 | #include <nvgpu/kref.h> | 28 | #include <nvgpu/kref.h> |
29 | #include "../common/linux/channel.h" | 29 | #include "../linux/channel.h" |
30 | 30 | ||
31 | #include "../drivers/staging/android/sync.h" | 31 | #include "../drivers/staging/android/sync.h" |
32 | 32 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/sync_sema_android.h b/drivers/gpu/nvgpu/os/linux/sync_sema_android.h index 4fca7bed..4fca7bed 100644 --- a/drivers/gpu/nvgpu/common/linux/sync_sema_android.h +++ b/drivers/gpu/nvgpu/os/linux/sync_sema_android.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/sysfs.c b/drivers/gpu/nvgpu/os/linux/sysfs.c index e5995bb8..e5995bb8 100644 --- a/drivers/gpu/nvgpu/common/linux/sysfs.c +++ b/drivers/gpu/nvgpu/os/linux/sysfs.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/sysfs.h b/drivers/gpu/nvgpu/os/linux/sysfs.h index 80925844..80925844 100644 --- a/drivers/gpu/nvgpu/common/linux/sysfs.h +++ b/drivers/gpu/nvgpu/os/linux/sysfs.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/thread.c b/drivers/gpu/nvgpu/os/linux/thread.c index 92c556f2..92c556f2 100644 --- a/drivers/gpu/nvgpu/common/linux/thread.c +++ b/drivers/gpu/nvgpu/os/linux/thread.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/timers.c b/drivers/gpu/nvgpu/os/linux/timers.c index d1aa641f..d1aa641f 100644 --- a/drivers/gpu/nvgpu/common/linux/timers.c +++ b/drivers/gpu/nvgpu/os/linux/timers.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.c b/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.c index 0858e6b1..9f6017d3 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include "gk20a/gk20a.h" | 21 | #include "gk20a/gk20a.h" |
22 | #include "clk_vgpu.h" | 22 | #include "clk_vgpu.h" |
23 | #include "ctrl/ctrlclk.h" | 23 | #include "ctrl/ctrlclk.h" |
24 | #include "common/linux/platform_gk20a.h" | 24 | #include "os/linux/platform_gk20a.h" |
25 | 25 | ||
26 | static unsigned long | 26 | static unsigned long |
27 | vgpu_freq_table[TEGRA_VGPU_GPU_FREQ_TABLE_SIZE]; | 27 | vgpu_freq_table[TEGRA_VGPU_GPU_FREQ_TABLE_SIZE]; |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.h b/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.h index 8d477643..8d477643 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/clk_vgpu.h +++ b/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu.c index 499a8eb4..6339aef9 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/fecs_trace_vgpu.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/fecs_trace_vgpu.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <nvgpu/vgpu/vgpu.h> | 25 | #include <nvgpu/vgpu/vgpu.h> |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | #include "common/linux/os_linux.h" | 28 | #include "os/linux/os_linux.h" |
29 | #include "vgpu/fecs_trace_vgpu.h" | 29 | #include "vgpu/fecs_trace_vgpu.h" |
30 | 30 | ||
31 | struct vgpu_fecs_trace { | 31 | struct vgpu_fecs_trace { |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c index 054b019b..66911626 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c | |||
@@ -14,14 +14,14 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "gk20a/gk20a.h" | 17 | #include <linux/platform_device.h> |
18 | #include "common/linux/vgpu/clk_vgpu.h" | ||
19 | #include "common/linux/platform_gk20a.h" | ||
20 | #include "common/linux/os_linux.h" | ||
21 | 18 | ||
22 | #include <nvgpu/nvhost.h> | 19 | #include <nvgpu/nvhost.h> |
23 | 20 | ||
24 | #include <linux/platform_device.h> | 21 | #include "gk20a/gk20a.h" |
22 | #include "os/linux/vgpu/clk_vgpu.h" | ||
23 | #include "os/linux/platform_gk20a.h" | ||
24 | #include "os/linux/os_linux.h" | ||
25 | 25 | ||
26 | static int gv11b_vgpu_probe(struct device *dev) | 26 | static int gv11b_vgpu_probe(struct device *dev) |
27 | { | 27 | { |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/platform_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c index 830b04ac..e4819e7d 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/platform_vgpu_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c | |||
@@ -16,12 +16,12 @@ | |||
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include <nvgpu/nvhost.h> | ||
20 | |||
19 | #include "gk20a/gk20a.h" | 21 | #include "gk20a/gk20a.h" |
20 | #include "common/linux/platform_gk20a.h" | 22 | #include "os/linux/platform_gk20a.h" |
21 | #include "clk_vgpu.h" | 23 | #include "clk_vgpu.h" |
22 | 24 | ||
23 | #include <nvgpu/nvhost.h> | ||
24 | |||
25 | static int gk20a_tegra_probe(struct device *dev) | 25 | static int gk20a_tegra_probe(struct device *dev) |
26 | { | 26 | { |
27 | #ifdef CONFIG_TEGRA_GK20A_NVHOST | 27 | #ifdef CONFIG_TEGRA_GK20A_NVHOST |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/sysfs_vgpu.c b/drivers/gpu/nvgpu/os/linux/vgpu/sysfs_vgpu.c index 5a8ed9fd..57aad4b4 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/sysfs_vgpu.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/sysfs_vgpu.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/device.h> | 17 | #include <linux/device.h> |
18 | #include <nvgpu/vgpu/vgpu.h> | 18 | #include <nvgpu/vgpu/vgpu.h> |
19 | 19 | ||
20 | #include "common/linux/platform_gk20a.h" | 20 | #include "os/linux/platform_gk20a.h" |
21 | 21 | ||
22 | static ssize_t vgpu_load_show(struct device *dev, | 22 | static ssize_t vgpu_load_show(struct device *dev, |
23 | struct device_attribute *attr, | 23 | struct device_attribute *attr, |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivc.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivc.c index b28b5013..950f0d49 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivc.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivc.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <nvgpu/types.h> | 17 | #include <nvgpu/types.h> |
18 | #include <linux/tegra_gr_comm.h> | 18 | #include <linux/tegra_gr_comm.h> |
19 | 19 | ||
20 | #include "common/linux/os_linux.h" | 20 | #include "os/linux/os_linux.h" |
21 | 21 | ||
22 | int vgpu_ivc_init(struct gk20a *g, u32 elems, | 22 | int vgpu_ivc_init(struct gk20a *g, u32 elems, |
23 | const size_t *queue_sizes, u32 queue_start, u32 num_queues) | 23 | const size_t *queue_sizes, u32 queue_start, u32 num_queues) |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivm.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivm.c index 90089de8..bbd444da 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_ivm.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_ivm.c | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | #include <linux/tegra-ivc.h> | 19 | #include <linux/tegra-ivc.h> |
20 | 20 | ||
21 | #include "common/linux/os_linux.h" | 21 | #include "os/linux/os_linux.h" |
22 | 22 | ||
23 | struct tegra_hv_ivm_cookie *vgpu_ivm_mempool_reserve(unsigned int id) | 23 | struct tegra_hv_ivm_cookie *vgpu_ivm_mempool_reserve(unsigned int id) |
24 | { | 24 | { |
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c index 0d224eb9..a7612e54 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | |||
@@ -40,12 +40,12 @@ | |||
40 | #include "gk20a/regops_gk20a.h" | 40 | #include "gk20a/regops_gk20a.h" |
41 | #include "gm20b/hal_gm20b.h" | 41 | #include "gm20b/hal_gm20b.h" |
42 | 42 | ||
43 | #include "common/linux/module.h" | 43 | #include "os/linux/module.h" |
44 | #include "common/linux/os_linux.h" | 44 | #include "os/linux/os_linux.h" |
45 | #include "common/linux/ioctl.h" | 45 | #include "os/linux/ioctl.h" |
46 | #include "common/linux/scale.h" | 46 | #include "os/linux/scale.h" |
47 | #include "common/linux/driver_common.h" | 47 | #include "os/linux/driver_common.h" |
48 | #include "common/linux/platform_gk20a.h" | 48 | #include "os/linux/platform_gk20a.h" |
49 | 49 | ||
50 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | 50 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
51 | 51 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.h b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.h index 38379cf2..38379cf2 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu_linux.h +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.h | |||
diff --git a/drivers/gpu/nvgpu/common/linux/vidmem.c b/drivers/gpu/nvgpu/os/linux/vidmem.c index 136d4a10..136d4a10 100644 --- a/drivers/gpu/nvgpu/common/linux/vidmem.c +++ b/drivers/gpu/nvgpu/os/linux/vidmem.c | |||
diff --git a/drivers/gpu/nvgpu/common/linux/vm.c b/drivers/gpu/nvgpu/os/linux/vm.c index baa77515..baa77515 100644 --- a/drivers/gpu/nvgpu/common/linux/vm.c +++ b/drivers/gpu/nvgpu/os/linux/vm.c | |||
diff --git a/drivers/gpu/nvgpu/pmgr/pmgr.c b/drivers/gpu/nvgpu/pmgr/pmgr.c index 2a9f9673..3d028c98 100644 --- a/drivers/gpu/nvgpu/pmgr/pmgr.c +++ b/drivers/gpu/nvgpu/pmgr/pmgr.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #ifdef CONFIG_DEBUG_FS | 27 | #ifdef CONFIG_DEBUG_FS |
28 | #include <linux/debugfs.h> | 28 | #include <linux/debugfs.h> |
29 | #include "common/linux/os_linux.h" | 29 | #include "os/linux/os_linux.h" |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | int pmgr_pwr_devices_get_power(struct gk20a *g, u32 *val) | 32 | int pmgr_pwr_devices_get_power(struct gk20a *g, u32 *val) |