gpu: nvgpu: ce: drop prefence support

Delete the gk20a_fence_in argument in gk20a_ce_execute_ops. It has never
been used and is in the way of some upcoming code cleanup.

NVGPU-43

Change-Id: Ie61e1a2f4945b1e34d64880044c265d26fa822d7
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1646036
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 3 insertions, 20 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/ce2.c b/drivers/gpu/nvgpu/common/linux/ce2.c
index f172cede..97dc6678 100644
--- a/drivers/gpu/nvgpu/common/linux/ce2.c
+++ b/drivers/gpu/nvgpu/common/linux/ce2.c
@@ -43,7 +43,6 @@ int gk20a_ce_execute_ops(struct gk20a *g,
                 unsigned int payload,
                 int launch_flags,
                 int request_operation,
-                struct gk20a_fence *gk20a_fence_in,
                 u32 submit_flags,
                 struct gk20a_fence **gk20a_fence_out)
 {
@@ -135,19 +134,9 @@ int gk20a_ce_execute_ops(struct gk20a *g,
                                         payload,
                                         gk20a_get_valid_launch_flags(g, launch_flags),
                                         request_operation,
-                                        dma_copy_class,
-                                        gk20a_fence_in);
+                                        dma_copy_class);
 
         if (methodSize) {
-                /* TODO: Remove CPU pre-fence wait */
-                if (gk20a_fence_in) {
-                        ret = gk20a_fence_wait(g, gk20a_fence_in,
-                                               gk20a_get_gr_idle_timeout(g));
-                        gk20a_fence_put(gk20a_fence_in);
-                        if (ret)
-                                goto noop;
-                }
-
                 /* store the element into gpfifo */
                 gpfifo.entry0 =
                         u64_lo32(cmd_buf_gpu_va);
diff --git a/drivers/gpu/nvgpu/common/mm/vidmem.c b/drivers/gpu/nvgpu/common/mm/vidmem.c
index 7c3b8589..a55b3a2b 100644
--- a/drivers/gpu/nvgpu/common/mm/vidmem.c
+++ b/drivers/gpu/nvgpu/common/mm/vidmem.c
@@ -97,7 +97,6 @@ static int __nvgpu_vidmem_do_clear_all(struct gk20a *g)
                         0x00000000,
                         NVGPU_CE_DST_LOCATION_LOCAL_FB,
                         NVGPU_CE_MEMSET,
-                        NULL,
                         0,
                         NULL);
         if (err) {
@@ -116,7 +115,6 @@ static int __nvgpu_vidmem_do_clear_all(struct gk20a *g)
                         0x00000000,
                         NVGPU_CE_DST_LOCATION_LOCAL_FB,
                         NVGPU_CE_MEMSET,
-                        NULL,
                         0,
                         &gk20a_fence_out);
         if (err) {
@@ -437,7 +435,6 @@ int nvgpu_vidmem_clear(struct gk20a *g, struct nvgpu_mem *mem)
                         0x00000000,
                         NVGPU_CE_DST_LOCATION_LOCAL_FB,
                         NVGPU_CE_MEMSET,
-                        NULL,
                         0,
                         &gk20a_fence_out);
 
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
index a3afa7c1..c4fcca3c 100644
--- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c
@@ -208,8 +208,7 @@ int gk20a_ce_prepare_submit(u64 src_buf,
                 unsigned int payload,
                 int launch_flags,
                 int request_operation,
-                u32 dma_copy_class,
-                struct gk20a_fence *gk20a_fence_in)
+                u32 dma_copy_class)
 {
         u32 launch = 0;
         u32 methodSize = 0;
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h
index 1d9d8c72..0b475f65 100644
--- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h
@@ -138,7 +138,6 @@ int gk20a_ce_execute_ops(struct gk20a *g,
                 unsigned int payload,
                 int launch_flags,
                 int request_operation,
-                struct gk20a_fence *gk20a_fence_in,
                 u32 submit_flags,
                 struct gk20a_fence **gk20a_fence_out);
 void gk20a_ce_delete_context_priv(struct gk20a *g,
@@ -153,7 +152,6 @@ int gk20a_ce_prepare_submit(u64 src_buf,
                 unsigned int payload,
                 int launch_flags,
                 int request_operation,
-                u32 dma_copy_class,
-                struct gk20a_fence *gk20a_fence_in);
+                u32 dma_copy_class);
 
 #endif /*__CE2_GK20A_H__*/