diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ce2.c | 13 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/vidmem.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ce2_gk20a.h | 4 |
4 files changed, 3 insertions, 20 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/ce2.c b/drivers/gpu/nvgpu/common/linux/ce2.c index f172cede..97dc6678 100644 --- a/drivers/gpu/nvgpu/common/linux/ce2.c +++ b/drivers/gpu/nvgpu/common/linux/ce2.c | |||
@@ -43,7 +43,6 @@ int gk20a_ce_execute_ops(struct gk20a *g, | |||
43 | unsigned int payload, | 43 | unsigned int payload, |
44 | int launch_flags, | 44 | int launch_flags, |
45 | int request_operation, | 45 | int request_operation, |
46 | struct gk20a_fence *gk20a_fence_in, | ||
47 | u32 submit_flags, | 46 | u32 submit_flags, |
48 | struct gk20a_fence **gk20a_fence_out) | 47 | struct gk20a_fence **gk20a_fence_out) |
49 | { | 48 | { |
@@ -135,19 +134,9 @@ int gk20a_ce_execute_ops(struct gk20a *g, | |||
135 | payload, | 134 | payload, |
136 | gk20a_get_valid_launch_flags(g, launch_flags), | 135 | gk20a_get_valid_launch_flags(g, launch_flags), |
137 | request_operation, | 136 | request_operation, |
138 | dma_copy_class, | 137 | dma_copy_class); |
139 | gk20a_fence_in); | ||
140 | 138 | ||
141 | if (methodSize) { | 139 | if (methodSize) { |
142 | /* TODO: Remove CPU pre-fence wait */ | ||
143 | if (gk20a_fence_in) { | ||
144 | ret = gk20a_fence_wait(g, gk20a_fence_in, | ||
145 | gk20a_get_gr_idle_timeout(g)); | ||
146 | gk20a_fence_put(gk20a_fence_in); | ||
147 | if (ret) | ||
148 | goto noop; | ||
149 | } | ||
150 | |||
151 | /* store the element into gpfifo */ | 140 | /* store the element into gpfifo */ |
152 | gpfifo.entry0 = | 141 | gpfifo.entry0 = |
153 | u64_lo32(cmd_buf_gpu_va); | 142 | u64_lo32(cmd_buf_gpu_va); |
diff --git a/drivers/gpu/nvgpu/common/mm/vidmem.c b/drivers/gpu/nvgpu/common/mm/vidmem.c index 7c3b8589..a55b3a2b 100644 --- a/drivers/gpu/nvgpu/common/mm/vidmem.c +++ b/drivers/gpu/nvgpu/common/mm/vidmem.c | |||
@@ -97,7 +97,6 @@ static int __nvgpu_vidmem_do_clear_all(struct gk20a *g) | |||
97 | 0x00000000, | 97 | 0x00000000, |
98 | NVGPU_CE_DST_LOCATION_LOCAL_FB, | 98 | NVGPU_CE_DST_LOCATION_LOCAL_FB, |
99 | NVGPU_CE_MEMSET, | 99 | NVGPU_CE_MEMSET, |
100 | NULL, | ||
101 | 0, | 100 | 0, |
102 | NULL); | 101 | NULL); |
103 | if (err) { | 102 | if (err) { |
@@ -116,7 +115,6 @@ static int __nvgpu_vidmem_do_clear_all(struct gk20a *g) | |||
116 | 0x00000000, | 115 | 0x00000000, |
117 | NVGPU_CE_DST_LOCATION_LOCAL_FB, | 116 | NVGPU_CE_DST_LOCATION_LOCAL_FB, |
118 | NVGPU_CE_MEMSET, | 117 | NVGPU_CE_MEMSET, |
119 | NULL, | ||
120 | 0, | 118 | 0, |
121 | &gk20a_fence_out); | 119 | &gk20a_fence_out); |
122 | if (err) { | 120 | if (err) { |
@@ -437,7 +435,6 @@ int nvgpu_vidmem_clear(struct gk20a *g, struct nvgpu_mem *mem) | |||
437 | 0x00000000, | 435 | 0x00000000, |
438 | NVGPU_CE_DST_LOCATION_LOCAL_FB, | 436 | NVGPU_CE_DST_LOCATION_LOCAL_FB, |
439 | NVGPU_CE_MEMSET, | 437 | NVGPU_CE_MEMSET, |
440 | NULL, | ||
441 | 0, | 438 | 0, |
442 | &gk20a_fence_out); | 439 | &gk20a_fence_out); |
443 | 440 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c index a3afa7c1..c4fcca3c 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | |||
@@ -208,8 +208,7 @@ int gk20a_ce_prepare_submit(u64 src_buf, | |||
208 | unsigned int payload, | 208 | unsigned int payload, |
209 | int launch_flags, | 209 | int launch_flags, |
210 | int request_operation, | 210 | int request_operation, |
211 | u32 dma_copy_class, | 211 | u32 dma_copy_class) |
212 | struct gk20a_fence *gk20a_fence_in) | ||
213 | { | 212 | { |
214 | u32 launch = 0; | 213 | u32 launch = 0; |
215 | u32 methodSize = 0; | 214 | u32 methodSize = 0; |
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h index 1d9d8c72..0b475f65 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h | |||
@@ -138,7 +138,6 @@ int gk20a_ce_execute_ops(struct gk20a *g, | |||
138 | unsigned int payload, | 138 | unsigned int payload, |
139 | int launch_flags, | 139 | int launch_flags, |
140 | int request_operation, | 140 | int request_operation, |
141 | struct gk20a_fence *gk20a_fence_in, | ||
142 | u32 submit_flags, | 141 | u32 submit_flags, |
143 | struct gk20a_fence **gk20a_fence_out); | 142 | struct gk20a_fence **gk20a_fence_out); |
144 | void gk20a_ce_delete_context_priv(struct gk20a *g, | 143 | void gk20a_ce_delete_context_priv(struct gk20a *g, |
@@ -153,7 +152,6 @@ int gk20a_ce_prepare_submit(u64 src_buf, | |||
153 | unsigned int payload, | 152 | unsigned int payload, |
154 | int launch_flags, | 153 | int launch_flags, |
155 | int request_operation, | 154 | int request_operation, |
156 | u32 dma_copy_class, | 155 | u32 dma_copy_class); |
157 | struct gk20a_fence *gk20a_fence_in); | ||
158 | 156 | ||
159 | #endif /*__CE2_GK20A_H__*/ | 157 | #endif /*__CE2_GK20A_H__*/ |