1 files changed, 12 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/common/sync/channel_sync.c b/drivers/gpu/nvgpu/common/sync/channel_sync.c
index 116e5701..b40de834 100644
--- a/drivers/gpu/nvgpu/common/sync/channel_sync.c
+++ b/drivers/gpu/nvgpu/common/sync/channel_sync.c
@@ -658,7 +658,7 @@ struct nvgpu_channel_sync *nvgpu_channel_sync_create(struct channel_gk20a *c,
         bool user_managed)
 {
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
-        if (gk20a_platform_has_syncpoints(c->g))
+        if (nvgpu_has_syncpoints(c->g))
                 return channel_sync_syncpt_create(c, user_managed);
 #endif
         return channel_sync_semaphore_create(c, user_managed);
@@ -666,5 +666,15 @@ struct nvgpu_channel_sync *nvgpu_channel_sync_create(struct channel_gk20a *c,
 
 bool nvgpu_channel_sync_needs_os_fence_framework(struct gk20a *g)
 {
-        return !gk20a_platform_has_syncpoints(g);
+        return !nvgpu_has_syncpoints(g);
+}
+
+bool nvgpu_has_syncpoints(struct gk20a *g)
+{
+#ifdef CONFIG_TEGRA_GK20A_NVHOST
+        return nvgpu_is_enabled(g, NVGPU_HAS_SYNCPOINTS) &&
+                !g->disable_syncpoints;
+#else
+        return false;
+#endif
 }