summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Kiminki <skiminki@nvidia.com>2016-07-12 08:31:19 -0400
committerDeepak Nibade <dnibade@nvidia.com>2016-12-27 04:56:18 -0500
commit00a092b729e42bc905db2b785c1564ad386c8ace (patch)
treeb33fa41ff30d1eb4bbe50fd5cee756104986e5db
parentb583ef729636677c86651685a392849bb8e22431 (diff)
gpu: nvgpu: Fix read_ptimer hook for GP106
Add the read_ptimer hook for GP106. This makes NVGPU_GPU_IOCTL_GET_GPU_TIME not crash on call. Bug 1787348 Change-Id: I31d7c30bcf0d6ad7fdecccd25a7c9c16276632a2 Signed-off-by: Sami Kiminki <skiminki@nvidia.com> Reviewed-on: http://git-master/r/1179661 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Konsta Holtta <kholtta@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman <alexw@nvidia.com> Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/gp106/hal_gp106.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index f32a2cd4..55c263cb 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -207,6 +207,7 @@ int gp106_init_hal(struct gk20a *g)
207 gops->get_litter_value = gp106_get_litter_value; 207 gops->get_litter_value = gp106_get_litter_value;
208 gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics; 208 gops->chip_init_gpu_characteristics = gk20a_init_gpu_characteristics;
209 gops->gr_ctx.use_dma_for_fw_bootstrap = true; 209 gops->gr_ctx.use_dma_for_fw_bootstrap = true;
210 gops->read_ptimer = gk20a_read_ptimer;
210 211
211 c->twod_class = FERMI_TWOD_A; 212 c->twod_class = FERMI_TWOD_A;
212 c->threed_class = PASCAL_B; 213 c->threed_class = PASCAL_B;