diff options
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_channel.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/sync_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/gr_gm20b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/gr_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/regops_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/regops_gv11b.c | 1 |
16 files changed, 6 insertions, 24 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c index 3a2f7b5e..b0d1ccff 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c | |||
@@ -564,6 +564,9 @@ static u32 nvgpu_gpfifo_user_flags_to_common_flags(u32 user_flags) | |||
564 | if (user_flags & NVGPU_ALLOC_GPFIFO_EX_FLAGS_DETERMINISTIC) | 564 | if (user_flags & NVGPU_ALLOC_GPFIFO_EX_FLAGS_DETERMINISTIC) |
565 | flags |= NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC; | 565 | flags |= NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC; |
566 | 566 | ||
567 | if (user_flags & NVGPU_ALLOC_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE) | ||
568 | flags |= NVGPU_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE; | ||
569 | |||
567 | return flags; | 570 | return flags; |
568 | } | 571 | } |
569 | 572 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 6d62d888..b8fe640c 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -23,7 +23,6 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <trace/events/gk20a.h> | 25 | #include <trace/events/gk20a.h> |
26 | #include <uapi/linux/nvgpu.h> | ||
27 | 26 | ||
28 | #if defined(CONFIG_DEBUG_FS) || defined(CONFIG_GK20A_CYCLE_STATS) | 27 | #if defined(CONFIG_DEBUG_FS) || defined(CONFIG_GK20A_CYCLE_STATS) |
29 | #include <linux/dma-buf.h> | 28 | #include <linux/dma-buf.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h index 9d294399..e6f73cf6 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |||
@@ -48,6 +48,7 @@ struct fifo_profile_gk20a; | |||
48 | /* Flags to be passed to gk20a_channel_alloc_gpfifo() */ | 48 | /* Flags to be passed to gk20a_channel_alloc_gpfifo() */ |
49 | #define NVGPU_GPFIFO_FLAGS_SUPPORT_VPR (1 << 0) | 49 | #define NVGPU_GPFIFO_FLAGS_SUPPORT_VPR (1 << 0) |
50 | #define NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC (1 << 1) | 50 | #define NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC (1 << 1) |
51 | #define NVGPU_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE (1 << 2) | ||
51 | 52 | ||
52 | /* Flags to be passed to g->ops.gr.alloc_obj_ctx() */ | 53 | /* Flags to be passed to g->ops.gr.alloc_obj_ctx() */ |
53 | #define NVGPU_OBJ_CTX_FLAGS_SUPPORT_GFXP (1 << 1) | 54 | #define NVGPU_OBJ_CTX_FLAGS_SUPPORT_GFXP (1 << 1) |
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c index cf04e116..fd31ab89 100644 --- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |||
@@ -22,8 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <uapi/linux/nvgpu.h> | ||
26 | |||
27 | #include <nvgpu/kmem.h> | 25 | #include <nvgpu/kmem.h> |
28 | #include <nvgpu/log.h> | 26 | #include <nvgpu/log.h> |
29 | #include <nvgpu/vm.h> | 27 | #include <nvgpu/vm.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 38aecc93..c3fd05d1 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -23,7 +23,6 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <trace/events/gk20a.h> | 25 | #include <trace/events/gk20a.h> |
26 | #include <uapi/linux/nvgpu.h> | ||
27 | 26 | ||
28 | #include <nvgpu/mm.h> | 27 | #include <nvgpu/mm.h> |
29 | #include <nvgpu/dma.h> | 28 | #include <nvgpu/dma.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 8a6db92c..64b54699 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -23,7 +23,6 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <trace/events/gk20a.h> | 25 | #include <trace/events/gk20a.h> |
26 | #include <uapi/linux/nvgpu.h> | ||
27 | 26 | ||
28 | #include <nvgpu/dma.h> | 27 | #include <nvgpu/dma.h> |
29 | #include <nvgpu/kmem.h> | 28 | #include <nvgpu/kmem.h> |
@@ -7892,7 +7891,7 @@ int __gr_gk20a_exec_ctx_ops(struct channel_gk20a *ch, | |||
7892 | "ctx op invalid offset: offset=0x%x", | 7891 | "ctx op invalid offset: offset=0x%x", |
7893 | ctx_ops[i].offset); | 7892 | ctx_ops[i].offset); |
7894 | ctx_ops[i].status = | 7893 | ctx_ops[i].status = |
7895 | NVGPU_DBG_GPU_REG_OP_STATUS_INVALID_OFFSET; | 7894 | REGOP(STATUS_INVALID_OFFSET); |
7896 | continue; | 7895 | continue; |
7897 | } | 7896 | } |
7898 | if (!pm_ctx_ready) { | 7897 | if (!pm_ctx_ready) { |
diff --git a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c index 277b3334..cd0c094f 100644 --- a/drivers/gpu/nvgpu/gk20a/sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/sync_gk20a.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/hrtimer.h> | 27 | #include <linux/hrtimer.h> |
28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
29 | #include <nvgpu/lock.h> | 29 | #include <nvgpu/lock.h> |
30 | #include <uapi/linux/nvgpu.h> | ||
31 | 30 | ||
32 | #include <nvgpu/kmem.h> | 31 | #include <nvgpu/kmem.h> |
33 | #include <nvgpu/semaphore.h> | 32 | #include <nvgpu/semaphore.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c index 636ee8a0..8906257f 100644 --- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | |||
@@ -20,8 +20,6 @@ | |||
20 | * DEALINGS IN THE SOFTWARE. | 20 | * DEALINGS IN THE SOFTWARE. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <uapi/linux/nvgpu.h> | ||
24 | |||
25 | #include <nvgpu/kmem.h> | 23 | #include <nvgpu/kmem.h> |
26 | #include <nvgpu/log.h> | 24 | #include <nvgpu/log.h> |
27 | 25 | ||
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c index 0d032be0..d7afcea2 100644 --- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c | |||
@@ -22,8 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <uapi/linux/nvgpu.h> | ||
26 | |||
27 | #include <nvgpu/kmem.h> | 25 | #include <nvgpu/kmem.h> |
28 | #include <nvgpu/log.h> | 26 | #include <nvgpu/log.h> |
29 | #include <nvgpu/enabled.h> | 27 | #include <nvgpu/enabled.h> |
diff --git a/drivers/gpu/nvgpu/gp106/gr_gp106.c b/drivers/gpu/nvgpu/gp106/gr_gp106.c index bed08fed..af08aa6c 100644 --- a/drivers/gpu/nvgpu/gp106/gr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/gr_gp106.c | |||
@@ -22,8 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <uapi/linux/nvgpu.h> | ||
26 | |||
27 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.h> |
28 | 26 | ||
29 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c index 1c9249d1..c82fb1cc 100644 --- a/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/fifo_gp10b.c | |||
@@ -22,8 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <uapi/linux/nvgpu.h> | ||
26 | |||
27 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.h> |
28 | #include <nvgpu/bug.h> | 26 | #include <nvgpu/bug.h> |
29 | #include <nvgpu/log2.h> | 27 | #include <nvgpu/log2.h> |
@@ -141,10 +139,9 @@ int channel_gp10b_setup_ramfc(struct channel_gk20a *c, | |||
141 | pbdma_runlist_timeslice_timescale_3_f() | | 139 | pbdma_runlist_timeslice_timescale_3_f() | |
142 | pbdma_runlist_timeslice_enable_true_f()); | 140 | pbdma_runlist_timeslice_enable_true_f()); |
143 | 141 | ||
144 | if ( flags & NVGPU_ALLOC_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE) | 142 | if (flags & NVGPU_GPFIFO_FLAGS_REPLAYABLE_FAULTS_ENABLE) |
145 | gp10b_set_pdb_fault_replay_flags(c->g, mem); | 143 | gp10b_set_pdb_fault_replay_flags(c->g, mem); |
146 | 144 | ||
147 | |||
148 | nvgpu_mem_wr32(g, mem, ram_fc_chid_w(), ram_fc_chid_id_f(c->chid)); | 145 | nvgpu_mem_wr32(g, mem, ram_fc_chid_w(), ram_fc_chid_id_f(c->chid)); |
149 | 146 | ||
150 | if (c->is_privileged_channel) { | 147 | if (c->is_privileged_channel) { |
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index da28134e..60341c6d 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <dt-bindings/soc/gm20b-fuse.h> | 25 | #include <dt-bindings/soc/gm20b-fuse.h> |
26 | #include <dt-bindings/soc/gp10b-fuse.h> | 26 | #include <dt-bindings/soc/gp10b-fuse.h> |
27 | #include <uapi/linux/nvgpu.h> | ||
28 | 27 | ||
29 | #include <nvgpu/timers.h> | 28 | #include <nvgpu/timers.h> |
30 | #include <nvgpu/kmem.h> | 29 | #include <nvgpu/kmem.h> |
diff --git a/drivers/gpu/nvgpu/gp10b/regops_gp10b.c b/drivers/gpu/nvgpu/gp10b/regops_gp10b.c index bf360d6f..60f36b6c 100644 --- a/drivers/gpu/nvgpu/gp10b/regops_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/regops_gp10b.c | |||
@@ -22,8 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <uapi/linux/nvgpu.h> | ||
26 | |||
27 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
28 | #include "gk20a/dbg_gpu_gk20a.h" | 26 | #include "gk20a/dbg_gpu_gk20a.h" |
29 | #include "gk20a/regops_gk20a.h" | 27 | #include "gk20a/regops_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c index a02c2ddd..e5d88e8c 100644 --- a/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/dbg_gpu_gv11b.c | |||
@@ -22,8 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <uapi/linux/nvgpu.h> | ||
26 | |||
27 | #include <nvgpu/log.h> | 25 | #include <nvgpu/log.h> |
28 | #include "gk20a/gk20a.h" | 26 | #include "gk20a/gk20a.h" |
29 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> | 27 | #include <nvgpu/hw/gv11b/hw_perf_gv11b.h> |
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 27fb7cb9..9c3c8b81 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/version.h> | 26 | #include <linux/version.h> |
27 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
28 | #include <linux/tegra_gpu_t19x.h> | 28 | #include <linux/tegra_gpu_t19x.h> |
29 | #include <uapi/linux/nvgpu.h> | ||
30 | 29 | ||
31 | #include <soc/tegra/fuse.h> | 30 | #include <soc/tegra/fuse.h> |
32 | 31 | ||
diff --git a/drivers/gpu/nvgpu/gv11b/regops_gv11b.c b/drivers/gpu/nvgpu/gv11b/regops_gv11b.c index eb2cd20a..262225f7 100644 --- a/drivers/gpu/nvgpu/gv11b/regops_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/regops_gv11b.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/err.h> | 26 | #include <linux/err.h> |
27 | #include <linux/bsearch.h> | 27 | #include <linux/bsearch.h> |
28 | #include <uapi/linux/nvgpu.h> | ||
29 | 28 | ||
30 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/dbg_gpu_gk20a.h" | 30 | #include "gk20a/dbg_gpu_gk20a.h" |