diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/cde.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ce2.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/channel.c | 12 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/channel.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_channel.c | 2 |
5 files changed, 4 insertions, 15 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c index 511d564f..8a15b82a 100644 --- a/drivers/gpu/nvgpu/common/linux/cde.c +++ b/drivers/gpu/nvgpu/common/linux/cde.c | |||
@@ -781,7 +781,7 @@ static int gk20a_cde_execute_buffer(struct gk20a_cde_ctx *cde_ctx, | |||
781 | } | 781 | } |
782 | 782 | ||
783 | return gk20a_submit_channel_gpfifo(cde_ctx->ch, gpfifo, NULL, | 783 | return gk20a_submit_channel_gpfifo(cde_ctx->ch, gpfifo, NULL, |
784 | num_entries, flags, fence, fence_out, true, | 784 | num_entries, flags, fence, fence_out, |
785 | NULL); | 785 | NULL); |
786 | } | 786 | } |
787 | 787 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/ce2.c b/drivers/gpu/nvgpu/common/linux/ce2.c index a2ab22ff..165f33db 100644 --- a/drivers/gpu/nvgpu/common/linux/ce2.c +++ b/drivers/gpu/nvgpu/common/linux/ce2.c | |||
@@ -132,7 +132,7 @@ int gk20a_ce_execute_ops(struct gk20a *g, | |||
132 | 132 | ||
133 | ret = gk20a_submit_channel_gpfifo(ce_ctx->ch, &gpfifo, NULL, | 133 | ret = gk20a_submit_channel_gpfifo(ce_ctx->ch, &gpfifo, NULL, |
134 | 1, submit_flags, &fence, | 134 | 1, submit_flags, &fence, |
135 | &ce_cmd_buf_fence_out, false, NULL); | 135 | &ce_cmd_buf_fence_out, NULL); |
136 | 136 | ||
137 | if (!ret) { | 137 | if (!ret) { |
138 | ce_ctx->postfences[ce_ctx->cmd_buf_read_queue_offset] = | 138 | ce_ctx->postfences[ce_ctx->cmd_buf_read_queue_offset] = |
diff --git a/drivers/gpu/nvgpu/common/linux/channel.c b/drivers/gpu/nvgpu/common/linux/channel.c index f189d3ed..88bc2009 100644 --- a/drivers/gpu/nvgpu/common/linux/channel.c +++ b/drivers/gpu/nvgpu/common/linux/channel.c | |||
@@ -527,7 +527,6 @@ static int gk20a_submit_prepare_syncs(struct channel_gk20a *c, | |||
527 | struct priv_cmd_entry **wait_cmd, | 527 | struct priv_cmd_entry **wait_cmd, |
528 | struct priv_cmd_entry **incr_cmd, | 528 | struct priv_cmd_entry **incr_cmd, |
529 | struct gk20a_fence **post_fence, | 529 | struct gk20a_fence **post_fence, |
530 | bool force_need_sync_fence, | ||
531 | bool register_irq, | 530 | bool register_irq, |
532 | u32 flags) | 531 | u32 flags) |
533 | { | 532 | { |
@@ -539,13 +538,6 @@ static int gk20a_submit_prepare_syncs(struct channel_gk20a *c, | |||
539 | bool need_wfi = !(flags & NVGPU_SUBMIT_FLAGS_SUPPRESS_WFI); | 538 | bool need_wfi = !(flags & NVGPU_SUBMIT_FLAGS_SUPPRESS_WFI); |
540 | bool pre_alloc_enabled = channel_gk20a_is_prealloc_enabled(c); | 539 | bool pre_alloc_enabled = channel_gk20a_is_prealloc_enabled(c); |
541 | 540 | ||
542 | /* | ||
543 | * If user wants to always allocate sync_fence_fds then respect that; | ||
544 | * otherwise, allocate sync_fence_fd based on user flags. | ||
545 | */ | ||
546 | if (force_need_sync_fence) | ||
547 | need_sync_fence = true; | ||
548 | |||
549 | if (g->aggressive_sync_destroy_thresh) { | 541 | if (g->aggressive_sync_destroy_thresh) { |
550 | nvgpu_mutex_acquire(&c->sync_lock); | 542 | nvgpu_mutex_acquire(&c->sync_lock); |
551 | if (!c->sync) { | 543 | if (!c->sync) { |
@@ -772,7 +764,6 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c, | |||
772 | u32 flags, | 764 | u32 flags, |
773 | struct nvgpu_channel_fence *fence, | 765 | struct nvgpu_channel_fence *fence, |
774 | struct gk20a_fence **fence_out, | 766 | struct gk20a_fence **fence_out, |
775 | bool force_need_sync_fence, | ||
776 | struct fifo_profile_gk20a *profile) | 767 | struct fifo_profile_gk20a *profile) |
777 | { | 768 | { |
778 | struct gk20a *g = c->g; | 769 | struct gk20a *g = c->g; |
@@ -861,7 +852,7 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c, | |||
861 | if (c->deterministic && !channel_gk20a_is_prealloc_enabled(c)) | 852 | if (c->deterministic && !channel_gk20a_is_prealloc_enabled(c)) |
862 | return -EINVAL; | 853 | return -EINVAL; |
863 | 854 | ||
864 | need_sync_framework = force_need_sync_fence || | 855 | need_sync_framework = |
865 | gk20a_channel_sync_needs_sync_framework(g) || | 856 | gk20a_channel_sync_needs_sync_framework(g) || |
866 | (flags & NVGPU_SUBMIT_FLAGS_SYNC_FENCE && | 857 | (flags & NVGPU_SUBMIT_FLAGS_SYNC_FENCE && |
867 | flags & NVGPU_SUBMIT_FLAGS_FENCE_GET); | 858 | flags & NVGPU_SUBMIT_FLAGS_FENCE_GET); |
@@ -968,7 +959,6 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c, | |||
968 | err = gk20a_submit_prepare_syncs(c, fence, job, | 959 | err = gk20a_submit_prepare_syncs(c, fence, job, |
969 | &wait_cmd, &incr_cmd, | 960 | &wait_cmd, &incr_cmd, |
970 | &post_fence, | 961 | &post_fence, |
971 | force_need_sync_fence, | ||
972 | need_deferred_cleanup, | 962 | need_deferred_cleanup, |
973 | flags); | 963 | flags); |
974 | if (err) | 964 | if (err) |
diff --git a/drivers/gpu/nvgpu/common/linux/channel.h b/drivers/gpu/nvgpu/common/linux/channel.h index 805de55a..4a58b10c 100644 --- a/drivers/gpu/nvgpu/common/linux/channel.h +++ b/drivers/gpu/nvgpu/common/linux/channel.h | |||
@@ -91,7 +91,6 @@ int gk20a_submit_channel_gpfifo(struct channel_gk20a *c, | |||
91 | u32 flags, | 91 | u32 flags, |
92 | struct nvgpu_channel_fence *fence, | 92 | struct nvgpu_channel_fence *fence, |
93 | struct gk20a_fence **fence_out, | 93 | struct gk20a_fence **fence_out, |
94 | bool force_need_sync_fence, | ||
95 | struct fifo_profile_gk20a *profile); | 94 | struct fifo_profile_gk20a *profile); |
96 | 95 | ||
97 | #endif /* __NVGPU_CHANNEL_H__ */ | 96 | #endif /* __NVGPU_CHANNEL_H__ */ |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c index c1492cad..057c81e2 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c | |||
@@ -803,7 +803,7 @@ static int gk20a_ioctl_channel_submit_gpfifo( | |||
803 | 803 | ||
804 | ret = gk20a_submit_channel_gpfifo(ch, NULL, args, args->num_entries, | 804 | ret = gk20a_submit_channel_gpfifo(ch, NULL, args, args->num_entries, |
805 | submit_flags, &fence, | 805 | submit_flags, &fence, |
806 | &fence_out, false, profile); | 806 | &fence_out, profile); |
807 | 807 | ||
808 | if (ret) { | 808 | if (ret) { |
809 | if (fd != -1) | 809 | if (fd != -1) |