summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRichard Zhao <rizhao@nvidia.com>2016-02-09 18:22:16 -0500
committerVladislav Buzov <vbuzov@nvidia.com>2016-02-11 13:27:37 -0500
commit5b7588a50ba8d2ed1c07627bbb015ded573ac1c1 (patch)
treeb140145bddc592dcdd2525e2b862ad789ddc023c /drivers
parent9f7613945c83f2bf8865bb3cfd61c238bcd36002 (diff)
gpu: nvgpu: add characteristics flag NVGPU_GPU_FLAGS_SUPPORT_TSG
NVGPU_GPU_FLAGS_SUPPORT_TSG indicates both the kernel driver and device support time slice group (TSG). Bug 1617046 Bug 200155618 Change-Id: Ib3490a32b773222560c58f1fd6d32bffcb97d6cd Signed-off-by: Richard Zhao <rizhao@nvidia.com> Reviewed-on: http://git-master/r/1010173 Reviewed-by: Sami Kiminki <skiminki@nvidia.com> Reviewed-by: Aingara Paramakuru <aparamakuru@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Vladislav Buzov <vbuzov@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c1
-rw-r--r--drivers/gpu/nvgpu/vgpu/vgpu.c2
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)
1999 gpu->flags |= NVGPU_GPU_FLAGS_HAS_SYNCPOINTS; 1999 gpu->flags |= NVGPU_GPU_FLAGS_HAS_SYNCPOINTS;
2000 2000
2001 gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_USERSPACE_MANAGED_AS; 2001 gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_USERSPACE_MANAGED_AS;
2002 gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_TSG;
2002 2003
2003 gpu->gpc_mask = 1; 2004 gpu->gpc_mask = 1;
2004 2005
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)
329 goto done; 329 goto done;
330 } 330 }
331 331
332 g->gpu_characteristics.flags &= ~NVGPU_GPU_FLAGS_SUPPORT_TSG;
333
332 gk20a_channel_resume(g); 334 gk20a_channel_resume(g);
333 335
334done: 336done: