2 files changed, 3 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 4ddb244b..bbcf60e3 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1999,6 +1999,7 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
                 gpu->flags |= NVGPU_GPU_FLAGS_HAS_SYNCPOINTS;
 
         gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_USERSPACE_MANAGED_AS;
+        gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_TSG;
 
         gpu->gpc_mask = 1;
 
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index d97b9e52..c9d2ee92 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -329,6 +329,8 @@ int vgpu_pm_finalize_poweron(struct device *dev)
                 goto done;
         }
 
+        g->gpu_characteristics.flags &= ~NVGPU_GPU_FLAGS_SUPPORT_TSG;
+
         gk20a_channel_resume(g);
 
 done: