summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/priv_ring_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/priv_ring_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/priv_ring_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
index d11cff06..d19702bb 100644
--- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
@@ -22,21 +22,12 @@
22#include "hw_mc_gk20a.h" 22#include "hw_mc_gk20a.h"
23#include "hw_pri_ringmaster_gk20a.h" 23#include "hw_pri_ringmaster_gk20a.h"
24#include "hw_pri_ringstation_sys_gk20a.h" 24#include "hw_pri_ringstation_sys_gk20a.h"
25#include "hw_trim_gk20a.h"
26 25
27void gk20a_reset_priv_ring(struct gk20a *g) 26void gk20a_reset_priv_ring(struct gk20a *g)
28{ 27{
29 u32 data;
30
31 if (tegra_platform_is_linsim()) 28 if (tegra_platform_is_linsim())
32 return; 29 return;
33 30
34 data = gk20a_readl(g, trim_sys_gpc2clk_out_r());
35 data = set_field(data,
36 trim_sys_gpc2clk_out_bypdiv_m(),
37 trim_sys_gpc2clk_out_bypdiv_f(0));
38 gk20a_writel(g, trim_sys_gpc2clk_out_r(), data);
39
40 gk20a_reset(g, mc_enable_priv_ring_enabled_f()); 31 gk20a_reset(g, mc_enable_priv_ring_enabled_f());
41 32
42 if (g->ops.clock_gating.slcg_priring_load_gating_prod) 33 if (g->ops.clock_gating.slcg_priring_load_gating_prod)