3 files changed, 14 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/channel.c b/drivers/gpu/nvgpu/common/linux/channel.c
index a725cd6b..8bfa4cfc 100644
--- a/drivers/gpu/nvgpu/common/linux/channel.c
+++ b/drivers/gpu/nvgpu/common/linux/channel.c
@@ -444,7 +444,7 @@ static int gk20a_submit_prepare_syncs(struct channel_gk20a *c,
         if (g->aggressive_sync_destroy_thresh) {
                 nvgpu_mutex_acquire(&c->sync_lock);
                 if (!c->sync) {
-                        c->sync = gk20a_channel_sync_create(c);
+                        c->sync = gk20a_channel_sync_create(c, false);
                         if (!c->sync) {
                                 err = -ENOMEM;
                                 nvgpu_mutex_release(&c->sync_lock);
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
index ab6ac9b9..0acaa61d 100644
--- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
+++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c
@@ -972,11 +972,11 @@ static int nvgpu_ioctl_channel_get_user_syncpoint(struct channel_gk20a *ch,
         }
 
         nvgpu_mutex_acquire(&ch->sync_lock);
-        if (ch->sync) {
+        if (ch->user_sync) {
                 nvgpu_mutex_release(&ch->sync_lock);
         } else {
-                ch->sync = gk20a_channel_sync_create(ch);
-                if (!ch->sync) {
+                ch->user_sync = gk20a_channel_sync_create(ch, true);
+                if (!ch->user_sync) {
                         nvgpu_mutex_release(&ch->sync_lock);
                         return -ENOMEM;
                 }
@@ -989,11 +989,11 @@ static int nvgpu_ioctl_channel_get_user_syncpoint(struct channel_gk20a *ch,
                 }
         }
 
-        args->syncpoint_id = ch->sync->syncpt_id(ch->sync);
+        args->syncpoint_id = ch->user_sync->syncpt_id(ch->user_sync);
         args->syncpoint_max = nvgpu_nvhost_syncpt_read_maxval(g->nvhost_dev,
                                                 args->syncpoint_id);
         if (nvgpu_is_enabled(g, NVGPU_SUPPORT_SYNCPOINT_ADDRESS))
-                args->gpu_va = ch->sync->syncpt_address(ch->sync);
+                args->gpu_va = ch->user_sync->syncpt_address(ch->user_sync);
         else
                 args->gpu_va = 0;
 
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost.c b/drivers/gpu/nvgpu/common/linux/nvhost.c
index 94bbfd70..a76953e3 100644
--- a/drivers/gpu/nvgpu/common/linux/nvhost.c
+++ b/drivers/gpu/nvgpu/common/linux/nvhost.c
@@ -138,6 +138,14 @@ u32 nvgpu_nvhost_get_syncpt_host_managed(
                         param, syncpt_name);
 }
 
+u32 nvgpu_nvhost_get_syncpt_client_managed(
+        struct nvgpu_nvhost_dev *nvhost_dev,
+        const char *syncpt_name)
+{
+        return nvhost_get_syncpt_client_managed(nvhost_dev->host1x_pdev,
+                        syncpt_name);
+}
+
 int nvgpu_nvhost_syncpt_wait_timeout_ext(
         struct nvgpu_nvhost_dev *nvhost_dev, u32 id,
         u32 thresh, u32 timeout, u32 *value, struct timespec *ts)