From 4bd9682c924d4e10e715f9f271a1e7461f9c1f59 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 25 Aug 2016 15:38:57 -0700 Subject: gpu: nvgpu: Reset priv ring properly on error We did not follow the proper sequence to reset priv ring on error. Instead we just re-enabled priv ring, which does not reset anything. Rename the gk20a_reset_priv_ring() to gk20a_enable_priv_ring() to indicate its proper use. Add another gk20a_reset_priv_ring() which actually resets priv ring properly. Change-Id: Ied74465b1215daa447a565b7e9cafef7fbe67d1b Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1294681 Reviewed-by: Seema Khowala Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gk20a/gk20a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 16acc1c9..a2fb8dc8 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -933,7 +933,7 @@ int gk20a_pm_finalize_poweron(struct device *dev) if (g->ops.clk.disable_slowboot) g->ops.clk.disable_slowboot(g); - gk20a_reset_priv_ring(g); + gk20a_enable_priv_ring(g); /* TBD: move this after graphics init in which blcg/slcg is enabled. This function removes SlowdownOnBoot which applies 32x divider -- cgit v1.2.2