diff options
Diffstat (limited to 'drivers/gpu/nvgpu/os/linux')
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/cde.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ctxsw_trace.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/debug_fifo.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_as.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_dbg.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/ioctl_tsg.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/linux-channel.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/module.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_fence_android.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/sync_sema_android.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | 2 |
14 files changed, 14 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/os/linux/cde.c b/drivers/gpu/nvgpu/os/linux/cde.c index 30cd0bff..7aac8e01 100644 --- a/drivers/gpu/nvgpu/os/linux/cde.c +++ b/drivers/gpu/nvgpu/os/linux/cde.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <nvgpu/linux/vm.h> | 38 | #include <nvgpu/linux/vm.h> |
39 | 39 | ||
40 | #include "gk20a/gk20a.h" | 40 | #include "gk20a/gk20a.h" |
41 | #include "gk20a/channel_gk20a.h" | ||
42 | #include "gk20a/mm_gk20a.h" | 41 | #include "gk20a/mm_gk20a.h" |
43 | #include "gk20a/fence_gk20a.h" | 42 | #include "gk20a/fence_gk20a.h" |
44 | #include "gk20a/gr_gk20a.h" | 43 | #include "gk20a/gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c index 16b040da..aa5ed250 100644 --- a/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c +++ b/drivers/gpu/nvgpu/os/linux/ctxsw_trace.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <trace/events/gk20a.h> | 21 | #include <trace/events/gk20a.h> |
22 | #include <uapi/linux/nvgpu.h> | 22 | #include <uapi/linux/nvgpu.h> |
23 | #include <nvgpu/ctxsw_trace.h> | 23 | #include <nvgpu/ctxsw_trace.h> |
24 | #include <nvgpu/channel.h> | ||
24 | 25 | ||
25 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
26 | #include "gk20a/gr_gk20a.h" | 27 | #include "gk20a/gr_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/debug_fifo.c b/drivers/gpu/nvgpu/os/linux/debug_fifo.c index 2b5674c0..0c791a42 100644 --- a/drivers/gpu/nvgpu/os/linux/debug_fifo.c +++ b/drivers/gpu/nvgpu/os/linux/debug_fifo.c | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #include <nvgpu/sort.h> | 21 | #include <nvgpu/sort.h> |
22 | #include <nvgpu/timers.h> | 22 | #include <nvgpu/timers.h> |
23 | #include <nvgpu/channel.h> | ||
23 | 24 | ||
24 | void __gk20a_fifo_profile_free(struct nvgpu_ref *ref); | 25 | void __gk20a_fifo_profile_free(struct nvgpu_ref *ref); |
25 | 26 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_as.c b/drivers/gpu/nvgpu/os/linux/ioctl_as.c index 7d1d618e..4e479e8e 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_as.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_as.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <nvgpu/gmmu.h> | 24 | #include <nvgpu/gmmu.h> |
25 | #include <nvgpu/vm_area.h> | 25 | #include <nvgpu/vm_area.h> |
26 | #include <nvgpu/log2.h> | 26 | #include <nvgpu/log2.h> |
27 | #include <nvgpu/channel.h> | ||
27 | 28 | ||
28 | #include <nvgpu/linux/vm.h> | 29 | #include <nvgpu/linux/vm.h> |
29 | 30 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c index 2f013029..19b4286d 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <nvgpu/sizes.h> | 31 | #include <nvgpu/sizes.h> |
32 | #include <nvgpu/list.h> | 32 | #include <nvgpu/list.h> |
33 | #include <nvgpu/clk_arb.h> | 33 | #include <nvgpu/clk_arb.h> |
34 | #include <nvgpu/channel.h> | ||
34 | 35 | ||
35 | #include "ioctl_ctrl.h" | 36 | #include "ioctl_ctrl.h" |
36 | #include "ioctl_dbg.h" | 37 | #include "ioctl_dbg.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c index 3931ab12..e4e7394e 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_dbg.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <nvgpu/atomic.h> | 30 | #include <nvgpu/atomic.h> |
31 | #include <nvgpu/cond.h> | 31 | #include <nvgpu/cond.h> |
32 | #include <nvgpu/utils.h> | 32 | #include <nvgpu/utils.h> |
33 | #include <nvgpu/channel.h> | ||
33 | 34 | ||
34 | #include <nvgpu/linux/vm.h> | 35 | #include <nvgpu/linux/vm.h> |
35 | 36 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c index 6c68ca58..6dd96d6b 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_tsg.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/kmem.h> | 25 | #include <nvgpu/kmem.h> |
26 | #include <nvgpu/log.h> | 26 | #include <nvgpu/log.h> |
27 | #include <nvgpu/os_sched.h> | 27 | #include <nvgpu/os_sched.h> |
28 | #include <nvgpu/channel.h> | ||
28 | 29 | ||
29 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
30 | #include "gk20a/tsg_gk20a.h" | 31 | #include "gk20a/tsg_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/linux-channel.c b/drivers/gpu/nvgpu/os/linux/linux-channel.c index fef44f2b..77c14b56 100644 --- a/drivers/gpu/nvgpu/os/linux/linux-channel.c +++ b/drivers/gpu/nvgpu/os/linux/linux-channel.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <nvgpu/debug.h> | 18 | #include <nvgpu/debug.h> |
19 | #include <nvgpu/error_notifier.h> | 19 | #include <nvgpu/error_notifier.h> |
20 | #include <nvgpu/os_sched.h> | 20 | #include <nvgpu/os_sched.h> |
21 | #include <nvgpu/channel.h> | ||
21 | 22 | ||
22 | /* | 23 | /* |
23 | * This is required for nvgpu_vm_find_buf() which is used in the tracing | 24 | * This is required for nvgpu_vm_find_buf() which is used in the tracing |
diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c index 55f55f00..85439b88 100644 --- a/drivers/gpu/nvgpu/os/linux/module.c +++ b/drivers/gpu/nvgpu/os/linux/module.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <nvgpu/sim.h> | 44 | #include <nvgpu/sim.h> |
45 | #include <nvgpu/clk_arb.h> | 45 | #include <nvgpu/clk_arb.h> |
46 | #include <nvgpu/timers.h> | 46 | #include <nvgpu/timers.h> |
47 | #include <nvgpu/channel.h> | ||
47 | 48 | ||
48 | #include "platform_gk20a.h" | 49 | #include "platform_gk20a.h" |
49 | #include "sysfs.h" | 50 | #include "sysfs.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android.c b/drivers/gpu/nvgpu/os/linux/os_fence_android.c index 9be8c6c0..297b3b20 100644 --- a/drivers/gpu/nvgpu/os/linux/os_fence_android.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <nvgpu/types.h> | 16 | #include <nvgpu/types.h> |
17 | #include <nvgpu/os_fence.h> | 17 | #include <nvgpu/os_fence.h> |
18 | #include <nvgpu/linux/os_fence_android.h> | 18 | #include <nvgpu/linux/os_fence_android.h> |
19 | #include <nvgpu/channel.h> | ||
19 | 20 | ||
20 | #include "gk20a/gk20a.h" | 21 | #include "gk20a/gk20a.h" |
21 | 22 | ||
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c index e7070612..ec3ccf0d 100644 --- a/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_sema.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <nvgpu/os_fence.h> | 20 | #include <nvgpu/os_fence.h> |
21 | #include <nvgpu/linux/os_fence_android.h> | 21 | #include <nvgpu/linux/os_fence_android.h> |
22 | #include <nvgpu/semaphore.h> | 22 | #include <nvgpu/semaphore.h> |
23 | #include <nvgpu/channel.h> | ||
23 | 24 | ||
24 | #include "gk20a/channel_sync_gk20a.h" | 25 | #include "gk20a/channel_sync_gk20a.h" |
25 | #include "gk20a/mm_gk20a.h" | 26 | #include "gk20a/mm_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c index 103ad243..b15dba19 100644 --- a/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c +++ b/drivers/gpu/nvgpu/os/linux/os_fence_android_syncpt.c | |||
@@ -22,9 +22,9 @@ | |||
22 | #include <nvgpu/linux/os_fence_android.h> | 22 | #include <nvgpu/linux/os_fence_android.h> |
23 | #include <nvgpu/nvhost.h> | 23 | #include <nvgpu/nvhost.h> |
24 | #include <nvgpu/atomic.h> | 24 | #include <nvgpu/atomic.h> |
25 | #include <nvgpu/channel.h> | ||
25 | 26 | ||
26 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
27 | #include "gk20a/channel_gk20a.h" | ||
28 | #include "gk20a/channel_sync_gk20a.h" | 28 | #include "gk20a/channel_sync_gk20a.h" |
29 | #include "gk20a/mm_gk20a.h" | 29 | #include "gk20a/mm_gk20a.h" |
30 | 30 | ||
@@ -120,4 +120,4 @@ int nvgpu_os_fence_syncpt_fdget(struct nvgpu_os_fence *fence_out, | |||
120 | nvgpu_os_fence_init(fence_out, c->g, &syncpt_ops, fence); | 120 | nvgpu_os_fence_init(fence_out, c->g, &syncpt_ops, fence); |
121 | 121 | ||
122 | return 0; | 122 | return 0; |
123 | } \ No newline at end of file | 123 | } |
diff --git a/drivers/gpu/nvgpu/os/linux/sync_sema_android.c b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c index 9598f2df..50465d0c 100644 --- a/drivers/gpu/nvgpu/os/linux/sync_sema_android.c +++ b/drivers/gpu/nvgpu/os/linux/sync_sema_android.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/semaphore.h> | 25 | #include <nvgpu/semaphore.h> |
26 | #include <nvgpu/bug.h> | 26 | #include <nvgpu/bug.h> |
27 | #include <nvgpu/kref.h> | 27 | #include <nvgpu/kref.h> |
28 | #include <nvgpu/channel.h> | ||
28 | #include "../linux/channel.h" | 29 | #include "../linux/channel.h" |
29 | 30 | ||
30 | #include "../drivers/staging/android/sync.h" | 31 | #include "../drivers/staging/android/sync.h" |
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c index 33c067c6..5b7a5c07 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | |||
@@ -31,12 +31,12 @@ | |||
31 | #include <nvgpu/ctxsw_trace.h> | 31 | #include <nvgpu/ctxsw_trace.h> |
32 | #include <nvgpu/defaults.h> | 32 | #include <nvgpu/defaults.h> |
33 | #include <nvgpu/ltc.h> | 33 | #include <nvgpu/ltc.h> |
34 | #include <nvgpu/channel.h> | ||
34 | 35 | ||
35 | #include "vgpu_linux.h" | 36 | #include "vgpu_linux.h" |
36 | #include "vgpu/fecs_trace_vgpu.h" | 37 | #include "vgpu/fecs_trace_vgpu.h" |
37 | #include "clk_vgpu.h" | 38 | #include "clk_vgpu.h" |
38 | #include "gk20a/tsg_gk20a.h" | 39 | #include "gk20a/tsg_gk20a.h" |
39 | #include "gk20a/channel_gk20a.h" | ||
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 | ||