nvgpu: gpu: gv11b: Remove syncpt protection support

In gv11b sync point support is moved to a shim outside of GPU,
and gv11b does not support sync points anymore. Remove use of
the sync point protection.

JIRA GV11B-47
JIRA GV11B-2

Change-Id: I70f3d2ce0cfe016453efe03f2bbf64c59baeb154
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: http://git-master/r/1300964
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

3 files changed, 2 insertions, 29 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index ab32016e..cd6007ba 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -228,6 +228,7 @@ void gv11b_init_fifo(struct gpu_ops *gops)
         gops->fifo.userd_gp_get = gv11b_userd_gp_get;
         gops->fifo.userd_gp_put = gv11b_userd_gp_put;
         gops->fifo.setup_ramfc = channel_gv11b_setup_ramfc;
+        gops->fifo.resetup_ramfc = NULL;
         gops->fifo.unbind_channel = channel_gv11b_unbind;
         gops->fifo.eng_runlist_base_size = fifo_eng_runlist_base__size_1_v;
         gops->fifo.free_channel_ctx_header = gv11b_free_subctx_header;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h
index c4d3a631..7aea3870 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -518,30 +518,6 @@ static inline u32 pbdma_udma_nop_r(void)
 {
         return 0x00000008;
 }
-static inline u32 pbdma_allowed_syncpoints_r(u32 i)
-{
-        return 0x000400e8 + i*8192;
-}
-static inline u32 pbdma_allowed_syncpoints_0_valid_f(u32 v)
-{
-        return (v & 0x1) << 31;
-}
-static inline u32 pbdma_allowed_syncpoints_0_index_f(u32 v)
-{
-        return (v & 0x7fff) << 16;
-}
-static inline u32 pbdma_allowed_syncpoints_0_index_v(u32 r)
-{
-        return (r >> 16) & 0x7fff;
-}
-static inline u32 pbdma_allowed_syncpoints_1_valid_f(u32 v)
-{
-        return (v & 0x1) << 15;
-}
-static inline u32 pbdma_allowed_syncpoints_1_index_f(u32 v)
-{
-        return (v & 0x7fff) << 0;
-}
 static inline u32 pbdma_runlist_timeslice_r(u32 i)
 {
         return 0x000400f8 + i*8192;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h
index bcbb7b81..69de33c6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_ram_gv11b.h
@@ -546,10 +546,6 @@ static inline u32 ram_fc_subdevice_w(void)
 {
         return 37;
 }
-static inline u32 ram_fc_allowed_syncpoints_w(void)
-{
-        return 58;
-}
 static inline u32 ram_fc_target_w(void)
 {
         return 43;