diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fence_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fence_gk20a.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c index e31770c3..f74afd6e 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c | |||
@@ -195,13 +195,12 @@ struct gk20a_fence *gk20a_alloc_fence(struct channel_gk20a *c) | |||
195 | 195 | ||
196 | void gk20a_init_fence(struct gk20a_fence *f, | 196 | void gk20a_init_fence(struct gk20a_fence *f, |
197 | const struct gk20a_fence_ops *ops, | 197 | const struct gk20a_fence_ops *ops, |
198 | struct sync_fence *sync_fence, bool wfi) | 198 | struct sync_fence *sync_fence) |
199 | { | 199 | { |
200 | if (!f) | 200 | if (!f) |
201 | return; | 201 | return; |
202 | f->ops = ops; | 202 | f->ops = ops; |
203 | f->sync_fence = sync_fence; | 203 | f->sync_fence = sync_fence; |
204 | f->wfi = wfi; | ||
205 | f->syncpt_id = -1; | 204 | f->syncpt_id = -1; |
206 | } | 205 | } |
207 | 206 | ||
@@ -235,7 +234,7 @@ int gk20a_fence_from_semaphore( | |||
235 | struct sync_timeline *timeline, | 234 | struct sync_timeline *timeline, |
236 | struct nvgpu_semaphore *semaphore, | 235 | struct nvgpu_semaphore *semaphore, |
237 | struct nvgpu_cond *semaphore_wq, | 236 | struct nvgpu_cond *semaphore_wq, |
238 | bool wfi, bool need_sync_fence) | 237 | bool need_sync_fence) |
239 | { | 238 | { |
240 | struct gk20a_fence *f = fence_out; | 239 | struct gk20a_fence *f = fence_out; |
241 | struct sync_fence *sync_fence = NULL; | 240 | struct sync_fence *sync_fence = NULL; |
@@ -250,7 +249,7 @@ int gk20a_fence_from_semaphore( | |||
250 | } | 249 | } |
251 | #endif | 250 | #endif |
252 | 251 | ||
253 | gk20a_init_fence(f, &nvgpu_semaphore_fence_ops, sync_fence, wfi); | 252 | gk20a_init_fence(f, &nvgpu_semaphore_fence_ops, sync_fence); |
254 | if (!f) { | 253 | if (!f) { |
255 | #ifdef CONFIG_SYNC | 254 | #ifdef CONFIG_SYNC |
256 | if (sync_fence) | 255 | if (sync_fence) |
@@ -310,7 +309,7 @@ static const struct gk20a_fence_ops gk20a_syncpt_fence_ops = { | |||
310 | int gk20a_fence_from_syncpt( | 309 | int gk20a_fence_from_syncpt( |
311 | struct gk20a_fence *fence_out, | 310 | struct gk20a_fence *fence_out, |
312 | struct nvgpu_nvhost_dev *nvhost_dev, | 311 | struct nvgpu_nvhost_dev *nvhost_dev, |
313 | u32 id, u32 value, bool wfi, | 312 | u32 id, u32 value, |
314 | bool need_sync_fence) | 313 | bool need_sync_fence) |
315 | { | 314 | { |
316 | struct gk20a_fence *f = fence_out; | 315 | struct gk20a_fence *f = fence_out; |
@@ -325,7 +324,7 @@ int gk20a_fence_from_syncpt( | |||
325 | } | 324 | } |
326 | #endif | 325 | #endif |
327 | 326 | ||
328 | gk20a_init_fence(f, &gk20a_syncpt_fence_ops, sync_fence, wfi); | 327 | gk20a_init_fence(f, &gk20a_syncpt_fence_ops, sync_fence); |
329 | if (!f) { | 328 | if (!f) { |
330 | #ifdef CONFIG_SYNC | 329 | #ifdef CONFIG_SYNC |
331 | if (sync_fence) | 330 | if (sync_fence) |
@@ -347,7 +346,7 @@ int gk20a_fence_from_syncpt( | |||
347 | int gk20a_fence_from_syncpt( | 346 | int gk20a_fence_from_syncpt( |
348 | struct gk20a_fence *fence_out, | 347 | struct gk20a_fence *fence_out, |
349 | struct nvgpu_nvhost_dev *nvhost_dev, | 348 | struct nvgpu_nvhost_dev *nvhost_dev, |
350 | u32 id, u32 value, bool wfi, | 349 | u32 id, u32 value, |
351 | bool need_sync_fence) | 350 | bool need_sync_fence) |
352 | { | 351 | { |
353 | return -EINVAL; | 352 | return -EINVAL; |