summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/vgpu/vgpu.c
diff options
context:
space:
mode:
authorPeter Daifuku <pdaifuku@nvidia.com>2016-04-01 12:51:42 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-04-07 14:31:42 -0400
commitcefc747ba2cdf6ccb98ecf18e63b6911db3be019 (patch)
tree08f24dfc631555782d772b306583bd05a93eb6e7 /drivers/gpu/nvgpu/vgpu/vgpu.c
parent37155b65f1dd6039bdef92f513d86640956bc12c (diff)
gpu: nvgpu: vgpu: fix regressions causing crashes
Client OS was accessing gpu registers directly, resulting in a crash: - Use gk20a version of init_gpu_characteristics - Set cbc_ctrl callback to NULL Bug 1749990 Bug 1749896 Change-Id: I7e5eea52c5d1d0c2ca7ca5e4d34dc4fc21f4e093 Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com> Reviewed-on: http://git-master/r/1120473 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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index 4750d7ee..ab063c9b 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -261,6 +261,7 @@ void vgpu_init_hal_common(struct gk20a *g)
261 vgpu_init_mm_ops(gops); 261 vgpu_init_mm_ops(gops);
262 vgpu_init_debug_ops(gops); 262 vgpu_init_debug_ops(gops);
263 vgpu_init_fecs_trace_ops(gops); 263 vgpu_init_fecs_trace_ops(gops);
264 gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics;
264} 265}
265 266
266static int vgpu_init_hal(struct gk20a *g) 267static int vgpu_init_hal(struct gk20a *g)