From 4cc1457703462f3743c05a866690d1748e7bd8e8 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 1 Jul 2015 11:33:39 -0700 Subject: 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 Reviewed-on: http://git-master/r/764970 Reviewed-by: Deepak Nibade Reviewed-by: Aleksandr Frid Reviewed-by: Vijayakumar Subbu --- drivers/gpu/nvgpu/gk20a/gk20a.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c') 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) bus_intr_en_0_pri_fecserr_m() | bus_intr_en_0_pri_timeout_m()); + if (g->ops.clk.disable_slowboot) + g->ops.clk.disable_slowboot(g); + gk20a_reset_priv_ring(g); /* TBD: move this after graphics init in which blcg/slcg is enabled. -- cgit v1.2.2