summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/vgpu/vgpu.c
diff options
context:
space:
mode:
authorRichard Zhao <rizhao@nvidia.com>2016-03-31 14:16:23 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-05-31 13:47:22 -0400
commitd707c5a444e024e1184213a75f44a73dbb1707d2 (patch)
tree09711370df9d9078e4f604e60983877bbf30b9de /drivers/gpu/nvgpu/vgpu/vgpu.c
parenta71ce831fbbca3ba8602e0b07ecd630c4a39f376 (diff)
gpu: nvgpu: add tsg support for vgpu
- make tsg_gk20a.c call HAL for enable/disable channels - add preempt_tsg HAL callbacks - add tsg bind/unbind channel HAL callbacks - add according tsg callbacks for vgpu Bug 1702773 JIRA VFND-1003 Change-Id: I2cba74b3ebd3920ef09219a168e6433d9574dbe8 Signed-off-by: Richard Zhao <rizhao@nvidia.com> Reviewed-on: http://git-master/r/1144932 (cherry picked from commit c3787de7d38651d46969348f5acae2ba86b31ec7) Reviewed-on: http://git-master/r/1126942 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu/vgpu.c')
-rw-r--r--drivers/gpu/nvgpu/vgpu/vgpu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 3c06652b..4948d246 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -268,6 +268,7 @@ void vgpu_init_hal_common(struct gk20a *g)
268 vgpu_init_mm_ops(gops); 268 vgpu_init_mm_ops(gops);
269 vgpu_init_debug_ops(gops); 269 vgpu_init_debug_ops(gops);
270 vgpu_init_fecs_trace_ops(gops); 270 vgpu_init_fecs_trace_ops(gops);
271 vgpu_init_tsg_ops(gops);
271 gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics; 272 gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics;
272} 273}
273 274
@@ -340,8 +341,6 @@ int vgpu_pm_finalize_poweron(struct device *dev)
340 goto done; 341 goto done;
341 } 342 }
342 343
343 g->gpu_characteristics.flags &= ~NVGPU_GPU_FLAGS_SUPPORT_TSG;
344
345 gk20a_ctxsw_trace_init(g); 344 gk20a_ctxsw_trace_init(g);
346 gk20a_channel_resume(g); 345 gk20a_channel_resume(g);
347 346