diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 18 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.h | 16 |
3 files changed, 18 insertions, 17 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h index 0ef63d18..51207552 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <nvgpu/cond.h> | 30 | #include <nvgpu/cond.h> |
31 | #include <nvgpu/atomic.h> | 31 | #include <nvgpu/atomic.h> |
32 | #include <nvgpu/nvgpu_mem.h> | 32 | #include <nvgpu/nvgpu_mem.h> |
33 | 33 | #include <nvgpu/allocator.h> | |
34 | 34 | ||
35 | struct gk20a; | 35 | struct gk20a; |
36 | struct dbg_session_gk20a; | 36 | struct dbg_session_gk20a; |
@@ -109,6 +109,22 @@ struct notification { | |||
109 | u16 status; | 109 | u16 status; |
110 | }; | 110 | }; |
111 | 111 | ||
112 | struct priv_cmd_queue { | ||
113 | struct nvgpu_mem mem; | ||
114 | u32 size; /* num of entries in words */ | ||
115 | u32 put; /* put for priv cmd queue */ | ||
116 | u32 get; /* get for priv cmd queue */ | ||
117 | }; | ||
118 | |||
119 | struct priv_cmd_entry { | ||
120 | bool valid; | ||
121 | struct nvgpu_mem *mem; | ||
122 | u32 off; /* offset in mem, in u32 entries */ | ||
123 | u64 gva; | ||
124 | u32 get; /* start of entry in queue */ | ||
125 | u32 size; /* in words */ | ||
126 | }; | ||
127 | |||
112 | struct channel_gk20a_job { | 128 | struct channel_gk20a_job { |
113 | struct nvgpu_mapped_buf **mapped_buffers; | 129 | struct nvgpu_mapped_buf **mapped_buffers; |
114 | int num_mapped_buffers; | 130 | int num_mapped_buffers; |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index e51d768b..8fc88677 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -45,6 +45,7 @@ struct nvgpu_clk_arb; | |||
45 | #ifdef CONFIG_GK20A_CTXSW_TRACE | 45 | #ifdef CONFIG_GK20A_CTXSW_TRACE |
46 | struct nvgpu_ctxsw_trace_filter; | 46 | struct nvgpu_ctxsw_trace_filter; |
47 | #endif | 47 | #endif |
48 | struct priv_cmd_entry; | ||
48 | 49 | ||
49 | #include <nvgpu/lock.h> | 50 | #include <nvgpu/lock.h> |
50 | #include <nvgpu/thread.h> | 51 | #include <nvgpu/thread.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h index 708dada3..76a16216 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h | |||
@@ -85,22 +85,6 @@ gk20a_buffer_state_from_list(struct nvgpu_list_node *node) | |||
85 | ((uintptr_t)node - offsetof(struct gk20a_buffer_state, list)); | 85 | ((uintptr_t)node - offsetof(struct gk20a_buffer_state, list)); |
86 | }; | 86 | }; |
87 | 87 | ||
88 | struct priv_cmd_queue { | ||
89 | struct nvgpu_mem mem; | ||
90 | u32 size; /* num of entries in words */ | ||
91 | u32 put; /* put for priv cmd queue */ | ||
92 | u32 get; /* get for priv cmd queue */ | ||
93 | }; | ||
94 | |||
95 | struct priv_cmd_entry { | ||
96 | bool valid; | ||
97 | struct nvgpu_mem *mem; | ||
98 | u32 off; /* offset in mem, in u32 entries */ | ||
99 | u64 gva; | ||
100 | u32 get; /* start of entry in queue */ | ||
101 | u32 size; /* in words */ | ||
102 | }; | ||
103 | |||
104 | struct gk20a; | 88 | struct gk20a; |
105 | struct channel_gk20a; | 89 | struct channel_gk20a; |
106 | 90 | ||