diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 22 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h | 9 |
2 files changed, 0 insertions, 31 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c index 7a664bf8..09668d49 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | |||
@@ -206,16 +206,6 @@ clean_up_priv_cmd: | |||
206 | return err; | 206 | return err; |
207 | } | 207 | } |
208 | 208 | ||
209 | static int gk20a_channel_syncpt_incr_wfi(struct gk20a_channel_sync *s, | ||
210 | struct priv_cmd_entry *entry, | ||
211 | struct gk20a_fence *fence) | ||
212 | { | ||
213 | return __gk20a_channel_syncpt_incr(s, | ||
214 | true /* wfi */, | ||
215 | false /* no irq handler */, | ||
216 | entry, fence, true); | ||
217 | } | ||
218 | |||
219 | static int gk20a_channel_syncpt_incr(struct gk20a_channel_sync *s, | 209 | static int gk20a_channel_syncpt_incr(struct gk20a_channel_sync *s, |
220 | struct priv_cmd_entry *entry, | 210 | struct priv_cmd_entry *entry, |
221 | struct gk20a_fence *fence, | 211 | struct gk20a_fence *fence, |
@@ -328,7 +318,6 @@ gk20a_channel_syncpt_create(struct channel_gk20a *c, bool user_managed) | |||
328 | sp->ops.wait_syncpt = gk20a_channel_syncpt_wait_syncpt; | 318 | sp->ops.wait_syncpt = gk20a_channel_syncpt_wait_syncpt; |
329 | sp->ops.wait_fd = gk20a_channel_syncpt_wait_fd; | 319 | sp->ops.wait_fd = gk20a_channel_syncpt_wait_fd; |
330 | sp->ops.incr = gk20a_channel_syncpt_incr; | 320 | sp->ops.incr = gk20a_channel_syncpt_incr; |
331 | sp->ops.incr_wfi = gk20a_channel_syncpt_incr_wfi; | ||
332 | sp->ops.incr_user = gk20a_channel_syncpt_incr_user; | 321 | sp->ops.incr_user = gk20a_channel_syncpt_incr_user; |
333 | sp->ops.set_min_eq_max = gk20a_channel_syncpt_set_min_eq_max; | 322 | sp->ops.set_min_eq_max = gk20a_channel_syncpt_set_min_eq_max; |
334 | sp->ops.set_safe_state = gk20a_channel_syncpt_set_safe_state; | 323 | sp->ops.set_safe_state = gk20a_channel_syncpt_set_safe_state; |
@@ -498,16 +487,6 @@ clean_up_sema: | |||
498 | return err; | 487 | return err; |
499 | } | 488 | } |
500 | 489 | ||
501 | static int gk20a_channel_semaphore_incr_wfi( | ||
502 | struct gk20a_channel_sync *s, | ||
503 | struct priv_cmd_entry *entry, | ||
504 | struct gk20a_fence *fence) | ||
505 | { | ||
506 | return __gk20a_channel_semaphore_incr(s, | ||
507 | true /* wfi */, | ||
508 | entry, fence, true); | ||
509 | } | ||
510 | |||
511 | static int gk20a_channel_semaphore_incr( | 490 | static int gk20a_channel_semaphore_incr( |
512 | struct gk20a_channel_sync *s, | 491 | struct gk20a_channel_sync *s, |
513 | struct priv_cmd_entry *entry, | 492 | struct priv_cmd_entry *entry, |
@@ -636,7 +615,6 @@ gk20a_channel_semaphore_create(struct channel_gk20a *c, bool user_managed) | |||
636 | sema->ops.wait_syncpt = gk20a_channel_semaphore_wait_syncpt; | 615 | sema->ops.wait_syncpt = gk20a_channel_semaphore_wait_syncpt; |
637 | sema->ops.wait_fd = gk20a_channel_semaphore_wait_fd; | 616 | sema->ops.wait_fd = gk20a_channel_semaphore_wait_fd; |
638 | sema->ops.incr = gk20a_channel_semaphore_incr; | 617 | sema->ops.incr = gk20a_channel_semaphore_incr; |
639 | sema->ops.incr_wfi = gk20a_channel_semaphore_incr_wfi; | ||
640 | sema->ops.incr_user = gk20a_channel_semaphore_incr_user; | 618 | sema->ops.incr_user = gk20a_channel_semaphore_incr_user; |
641 | sema->ops.set_min_eq_max = gk20a_channel_semaphore_set_min_eq_max; | 619 | sema->ops.set_min_eq_max = gk20a_channel_semaphore_set_min_eq_max; |
642 | sema->ops.set_safe_state = gk20a_channel_semaphore_set_safe_state; | 620 | sema->ops.set_safe_state = gk20a_channel_semaphore_set_safe_state; |
diff --git a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h index 5c6e91c9..cb155d6d 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h | |||
@@ -60,15 +60,6 @@ struct gk20a_channel_sync { | |||
60 | bool need_sync_fence, | 60 | bool need_sync_fence, |
61 | bool register_irq); | 61 | bool register_irq); |
62 | 62 | ||
63 | /* Increment syncpoint/semaphore, preceded by a wfi. | ||
64 | * Returns | ||
65 | * - a gpu cmdbuf that performs the increment when executed, | ||
66 | * - a fence that can be passed to wait_cpu() and is_expired(). | ||
67 | */ | ||
68 | int (*incr_wfi)(struct gk20a_channel_sync *s, | ||
69 | struct priv_cmd_entry *entry, | ||
70 | struct gk20a_fence *fence); | ||
71 | |||
72 | /* Increment syncpoint/semaphore, so that the returned fence represents | 63 | /* Increment syncpoint/semaphore, so that the returned fence represents |
73 | * work completion (may need wfi) and can be returned to user space. | 64 | * work completion (may need wfi) and can be returned to user space. |
74 | * Returns | 65 | * Returns |