summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2015-07-01 14:33:39 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2015-07-03 10:51:42 -0400
commit4cc1457703462f3743c05a866690d1748e7bd8e8 (patch)
tree382cdc8d20d92628fc60c47efc6bd61dcbed4107 /drivers/gpu/nvgpu/gk20a/gk20a.c
parente7ba93fefbc4df9663302d240f9fbd5967a75a3c (diff)
gpu: nvgpu: Move clk bypass div code to clk init
Clock bypass divider was changed just before resetting priv ring. Move the code to a new clk op instead so that it is executed only on gk20a. Change-Id: Ic8084a4a5fac23770f50b50f910ced2543ba0f28 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/764970 Reviewed-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-by: Aleksandr Frid <afrid@nvidia.com> Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 5a25eecf..b1747987 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -780,6 +780,9 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
780 bus_intr_en_0_pri_fecserr_m() | 780 bus_intr_en_0_pri_fecserr_m() |
781 bus_intr_en_0_pri_timeout_m()); 781 bus_intr_en_0_pri_timeout_m());
782 782
783 if (g->ops.clk.disable_slowboot)
784 g->ops.clk.disable_slowboot(g);
785
783 gk20a_reset_priv_ring(g); 786 gk20a_reset_priv_ring(g);
784 787
785 /* TBD: move this after graphics init in which blcg/slcg is enabled. 788 /* TBD: move this after graphics init in which blcg/slcg is enabled.