diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 7b5013ea..136c28d0 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -871,31 +871,6 @@ static void gk20a_free_error_notifiers(struct channel_gk20a *ch) | |||
871 | mutex_unlock(&ch->error_notifier_mutex); | 871 | mutex_unlock(&ch->error_notifier_mutex); |
872 | } | 872 | } |
873 | 873 | ||
874 | /* Returns delta of cyclic integers a and b. If a is ahead of b, delta | ||
875 | * is positive */ | ||
876 | static int cyclic_delta(int a, int b) | ||
877 | { | ||
878 | return a - b; | ||
879 | } | ||
880 | |||
881 | static void gk20a_wait_for_deferred_interrupts(struct gk20a *g) | ||
882 | { | ||
883 | int stall_irq_threshold = atomic_read(&g->hw_irq_stall_count); | ||
884 | int nonstall_irq_threshold = atomic_read(&g->hw_irq_nonstall_count); | ||
885 | |||
886 | /* wait until all stalling irqs are handled */ | ||
887 | wait_event(g->sw_irq_stall_last_handled_wq, | ||
888 | cyclic_delta(stall_irq_threshold, | ||
889 | atomic_read(&g->sw_irq_stall_last_handled)) | ||
890 | <= 0); | ||
891 | |||
892 | /* wait until all non-stalling irqs are handled */ | ||
893 | wait_event(g->sw_irq_nonstall_last_handled_wq, | ||
894 | cyclic_delta(nonstall_irq_threshold, | ||
895 | atomic_read(&g->sw_irq_nonstall_last_handled)) | ||
896 | <= 0); | ||
897 | } | ||
898 | |||
899 | static void gk20a_wait_until_counter_is_N( | 874 | static void gk20a_wait_until_counter_is_N( |
900 | struct channel_gk20a *ch, atomic_t *counter, int wait_value, | 875 | struct channel_gk20a *ch, atomic_t *counter, int wait_value, |
901 | wait_queue_head_t *wq, const char *caller, const char *counter_name) | 876 | wait_queue_head_t *wq, const char *caller, const char *counter_name) |
@@ -944,7 +919,7 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force) | |||
944 | 919 | ||
945 | /* wait until all pending interrupts for recently completed | 920 | /* wait until all pending interrupts for recently completed |
946 | * jobs are handled */ | 921 | * jobs are handled */ |
947 | gk20a_wait_for_deferred_interrupts(g); | 922 | nvgpu_wait_for_deferred_interrupts(g); |
948 | 923 | ||
949 | /* prevent new refs */ | 924 | /* prevent new refs */ |
950 | spin_lock(&ch->ref_obtain_lock); | 925 | spin_lock(&ch->ref_obtain_lock); |
@@ -1043,7 +1018,7 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force) | |||
1043 | 1018 | ||
1044 | /* make sure we don't have deferred interrupts pending that | 1019 | /* make sure we don't have deferred interrupts pending that |
1045 | * could still touch the channel */ | 1020 | * could still touch the channel */ |
1046 | gk20a_wait_for_deferred_interrupts(g); | 1021 | nvgpu_wait_for_deferred_interrupts(g); |
1047 | 1022 | ||
1048 | unbind: | 1023 | unbind: |
1049 | if (gk20a_is_channel_marked_as_tsg(ch)) | 1024 | if (gk20a_is_channel_marked_as_tsg(ch)) |