summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
diff options
context:
space:
mode:
authorSeshendra Gadagottu <sgadagottu@nvidia.com>2015-10-16 15:31:35 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2015-11-04 17:38:34 -0500
commit19b3bd28b3e277d8892f663e7c61a813dbc54feb (patch)
tree5bd76a4242a9f09b7ba3cbf9ab1eb3f5990875c7 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
parent9592a4e6fce8204e9ada54ba00902e792199fec5 (diff)
gpu: nvgpu: use platform data for ptimer source rate
Instead of depending on clock frame-work, use platform data for ptimer source rate. Removed ptimerscaling10x platform data, and use ptimer source frequency to calculate ptimerscaling factor. Reviewed-on: http://git-master/r/819030 (cherry picked from commit dd291334d54dab80cab7eb1656dffc48a59610b4) Change-Id: I7638ce9875a6e440bbfc2ba2da0d0b094b2700ff Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com> Reviewed-on: http://git-master/r/827300 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/fifo_gk20a.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index 5eba9f12..f6f0cb1d 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -410,7 +410,8 @@ int gk20a_init_fifo_reset_enable_hw(struct gk20a *g)
410 g->ops.fifo.apply_pb_timeout(g); 410 g->ops.fifo.apply_pb_timeout(g);
411 411
412 timeout = GRFIFO_TIMEOUT_CHECK_PERIOD_US; 412 timeout = GRFIFO_TIMEOUT_CHECK_PERIOD_US;
413 timeout = scale_ptimer(timeout, platform->ptimerscaling10x); 413 timeout = scale_ptimer(timeout,
414 ptimer_scalingfactor10x(platform->ptimer_src_freq));
414 timeout |= fifo_eng_timeout_detection_enabled_f(); 415 timeout |= fifo_eng_timeout_detection_enabled_f();
415 gk20a_writel(g, fifo_eng_timeout_r(), timeout); 416 gk20a_writel(g, fifo_eng_timeout_r(), timeout);
416 417