From eed15a6bb7f7dab9d4c445f82ae66b13407db986 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 16 Apr 2015 15:38:04 -0700 Subject: 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 Reviewed-on: http://git-master/r/732428 --- drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c') 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 @@ void gk20a_reset_priv_ring(struct gk20a *g) { - u32 data = 0; + u32 data; if (tegra_platform_is_linsim()) return; - /* Skipping read and then writeback to this reg, as we are just getting - * out of reset, and before this call, the reg is not written to*/ - + data = gk20a_readl(g, trim_sys_gpc2clk_out_r()); data = set_field(data, trim_sys_gpc2clk_out_bypdiv_m(), trim_sys_gpc2clk_out_bypdiv_f(0)); -- cgit v1.2.2