summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-04-14 18:25:57 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-28 01:07:04 -0400
commitf6c92780ffe3b79cb84fb6d4321dcc13d2a07f73 (patch)
treeb3a186dce91e621e0145a1a5bb1afca1e1b2de55 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
parentcacd455dfdcb8864e296268a230cc490759a3f9e (diff)
gpu: nvgpu: Move ptimer_src_freq to gk20a
Copy ptimer_src_freq to struct gk20a at probe time, and access it from gk20a instead of platform_gk20a. JIRA NVGPU-16 Change-Id: I92c1b83d6e2305a19eb2cd267b7dd8d97c1fdc44 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1463544 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@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, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index e89e9f68..b96adc5a 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -760,7 +760,6 @@ int gk20a_init_fifo_reset_enable_hw(struct gk20a *g)
760 u32 mask; 760 u32 mask;
761 u32 timeout; 761 u32 timeout;
762 unsigned int i; 762 unsigned int i;
763 struct gk20a_platform *platform = dev_get_drvdata(g->dev);
764 u32 host_num_pbdma = nvgpu_get_litter_value(g, GPU_LIT_HOST_NUM_PBDMA); 763 u32 host_num_pbdma = nvgpu_get_litter_value(g, GPU_LIT_HOST_NUM_PBDMA);
765 764
766 gk20a_dbg_fn(""); 765 gk20a_dbg_fn("");
@@ -803,7 +802,7 @@ int gk20a_init_fifo_reset_enable_hw(struct gk20a *g)
803 802
804 timeout = GRFIFO_TIMEOUT_CHECK_PERIOD_US; 803 timeout = GRFIFO_TIMEOUT_CHECK_PERIOD_US;
805 timeout = scale_ptimer(timeout, 804 timeout = scale_ptimer(timeout,
806 ptimer_scalingfactor10x(platform->ptimer_src_freq)); 805 ptimer_scalingfactor10x(g->ptimer_src_freq));
807 timeout |= fifo_eng_timeout_detection_enabled_f(); 806 timeout |= fifo_eng_timeout_detection_enabled_f();
808 gk20a_writel(g, fifo_eng_timeout_r(), timeout); 807 gk20a_writel(g, fifo_eng_timeout_r(), timeout);
809 808