From cd7c4331453af7751a19bd96150715b86b8ca2ca Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Fri, 29 Jun 2018 12:05:38 +0300 Subject: gpu: nvgpu: remove gk20a_channel_sync::incr_wfi This explicit incr_wfi has not been used since commit 06be77da376f ("gpu: nvgpu: Do not send WFI when finishing channel"). Change-Id: I0213b0f728f83b483a7dbbef252912555b06815f Signed-off-by: Konsta Holtta Reviewed-on: https://git-master.nvidia.com/r/1765407 Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c | 22 ---------------------- drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h | 9 --------- 2 files changed, 31 deletions(-) (limited to 'drivers') 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: return err; } -static int gk20a_channel_syncpt_incr_wfi(struct gk20a_channel_sync *s, - struct priv_cmd_entry *entry, - struct gk20a_fence *fence) -{ - return __gk20a_channel_syncpt_incr(s, - true /* wfi */, - false /* no irq handler */, - entry, fence, true); -} - static int gk20a_channel_syncpt_incr(struct gk20a_channel_sync *s, struct priv_cmd_entry *entry, struct gk20a_fence *fence, @@ -328,7 +318,6 @@ gk20a_channel_syncpt_create(struct channel_gk20a *c, bool user_managed) sp->ops.wait_syncpt = gk20a_channel_syncpt_wait_syncpt; sp->ops.wait_fd = gk20a_channel_syncpt_wait_fd; sp->ops.incr = gk20a_channel_syncpt_incr; - sp->ops.incr_wfi = gk20a_channel_syncpt_incr_wfi; sp->ops.incr_user = gk20a_channel_syncpt_incr_user; sp->ops.set_min_eq_max = gk20a_channel_syncpt_set_min_eq_max; sp->ops.set_safe_state = gk20a_channel_syncpt_set_safe_state; @@ -498,16 +487,6 @@ clean_up_sema: return err; } -static int gk20a_channel_semaphore_incr_wfi( - struct gk20a_channel_sync *s, - struct priv_cmd_entry *entry, - struct gk20a_fence *fence) -{ - return __gk20a_channel_semaphore_incr(s, - true /* wfi */, - entry, fence, true); -} - static int gk20a_channel_semaphore_incr( struct gk20a_channel_sync *s, struct priv_cmd_entry *entry, @@ -636,7 +615,6 @@ gk20a_channel_semaphore_create(struct channel_gk20a *c, bool user_managed) sema->ops.wait_syncpt = gk20a_channel_semaphore_wait_syncpt; sema->ops.wait_fd = gk20a_channel_semaphore_wait_fd; sema->ops.incr = gk20a_channel_semaphore_incr; - sema->ops.incr_wfi = gk20a_channel_semaphore_incr_wfi; sema->ops.incr_user = gk20a_channel_semaphore_incr_user; sema->ops.set_min_eq_max = gk20a_channel_semaphore_set_min_eq_max; 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 { bool need_sync_fence, bool register_irq); - /* Increment syncpoint/semaphore, preceded by a wfi. - * Returns - * - a gpu cmdbuf that performs the increment when executed, - * - a fence that can be passed to wait_cpu() and is_expired(). - */ - int (*incr_wfi)(struct gk20a_channel_sync *s, - struct priv_cmd_entry *entry, - struct gk20a_fence *fence); - /* Increment syncpoint/semaphore, so that the returned fence represents * work completion (may need wfi) and can be returned to user space. * Returns -- cgit v1.2.2