summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2016-08-25 18:38:57 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-01-31 13:33:47 -0500
commit4bd9682c924d4e10e715f9f271a1e7461f9c1f59 (patch)
treeb033f434d7d86211cb586e8a59c4bc95cb4e4ab0 /drivers/gpu/nvgpu/gk20a/gk20a.c
parent5fb7f2a262d2e9e187d8bcc4fb2ceb945fec9f8d (diff)
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 <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1294681 Reviewed-by: Seema Khowala <seemaj@nvidia.com> Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c2
1 files changed, 1 insertions, 1 deletions
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)
933 if (g->ops.clk.disable_slowboot) 933 if (g->ops.clk.disable_slowboot)
934 g->ops.clk.disable_slowboot(g); 934 g->ops.clk.disable_slowboot(g);
935 935
936 gk20a_reset_priv_ring(g); 936 gk20a_enable_priv_ring(g);
937 937
938 /* TBD: move this after graphics init in which blcg/slcg is enabled. 938 /* TBD: move this after graphics init in which blcg/slcg is enabled.
939 This function removes SlowdownOnBoot which applies 32x divider 939 This function removes SlowdownOnBoot which applies 32x divider