summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2015-04-16 18:38:04 -0400
committerIshan Mittal <imittal@nvidia.com>2015-05-18 01:49:43 -0400
commiteed15a6bb7f7dab9d4c445f82ae66b13407db986 (patch)
tree7a883c71eecf335e1758dd26bf7ece9b73b6d968 /drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
parente88a606932269833b23887cd84212bfc2c6266b7 (diff)
Revert "gpu: nvgpu: Skip reg read of gpc2clk"
This reverts commit 259842f9d222dd2ca2e66bddaceef4a2fd626bc7. The commit clears some init values that are never restored. Change-Id: I4efee115863cbfb08b2e280a58b525cb49adc0b6 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/732428
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
index f5aa3f0f..d11cff06 100644
--- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c
@@ -26,14 +26,12 @@
26 26
27void gk20a_reset_priv_ring(struct gk20a *g) 27void gk20a_reset_priv_ring(struct gk20a *g)
28{ 28{
29 u32 data = 0; 29 u32 data;
30 30
31 if (tegra_platform_is_linsim()) 31 if (tegra_platform_is_linsim())
32 return; 32 return;
33 33
34 /* Skipping read and then writeback to this reg, as we are just getting 34 data = gk20a_readl(g, trim_sys_gpc2clk_out_r());
35 * out of reset, and before this call, the reg is not written to*/
36
37 data = set_field(data, 35 data = set_field(data,
38 trim_sys_gpc2clk_out_bypdiv_m(), 36 trim_sys_gpc2clk_out_bypdiv_m(),
39 trim_sys_gpc2clk_out_bypdiv_f(0)); 37 trim_sys_gpc2clk_out_bypdiv_f(0));