summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-04-14 19:10:59 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-28 01:06:58 -0400
commit7fdf02f554a5e922d0cc6797854c5fcfd78bf55f (patch)
treeefad3f01ad1f8bcbe876430d867489498b92faa9 /drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
parentbe6d308c18d991d4937e6ca467cd41918a3199e8 (diff)
gpu: nvgpu: gv11b: Access ptimer_src_freq from gk20a
Access ptimer_src_freq from gk20a instead of gk20a_platform. JIRA NVGPU-16 Change-Id: I3f2fcd22eb8a14c83ee2d481ff9f5acdf00f9c07 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1463534 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/fifo_gv11b.c')
-rw-r--r--drivers/gpu/nvgpu/gv11b/fifo_gv11b.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
index 8346de59..f16fbb98 100644
--- a/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fifo_gv11b.c
@@ -1082,7 +1082,6 @@ int gv11b_init_fifo_reset_enable_hw(struct gk20a *g)
1082 u32 timeout; 1082 u32 timeout;
1083 unsigned int i; 1083 unsigned int i;
1084 u32 host_num_pbdma = nvgpu_get_litter_value(g, GPU_LIT_HOST_NUM_PBDMA); 1084 u32 host_num_pbdma = nvgpu_get_litter_value(g, GPU_LIT_HOST_NUM_PBDMA);
1085 struct gk20a_platform *platform = dev_get_drvdata(g->dev);
1086 1085
1087 gk20a_dbg_fn(""); 1086 gk20a_dbg_fn("");
1088 1087
@@ -1140,7 +1139,7 @@ int gv11b_init_fifo_reset_enable_hw(struct gk20a *g)
1140 /* enable ctxsw timeout */ 1139 /* enable ctxsw timeout */
1141 timeout = GRFIFO_TIMEOUT_CHECK_PERIOD_US; 1140 timeout = GRFIFO_TIMEOUT_CHECK_PERIOD_US;
1142 timeout = scale_ptimer(timeout, 1141 timeout = scale_ptimer(timeout,
1143 ptimer_scalingfactor10x(platform->ptimer_src_freq)); 1142 ptimer_scalingfactor10x(g->ptimer_src_freq));
1144 timeout |= fifo_eng_ctxsw_timeout_detection_enabled_f(); 1143 timeout |= fifo_eng_ctxsw_timeout_detection_enabled_f();
1145 gk20a_writel(g, fifo_eng_ctxsw_timeout_r(), timeout); 1144 gk20a_writel(g, fifo_eng_ctxsw_timeout_r(), timeout);
1146 1145