4 files changed, 16 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c
index 44f8fb64..e10df6ac 100644
--- a/drivers/gpu/nvgpu/gk20a/clk_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/clk_gk20a.c
@@ -629,6 +629,17 @@ static int gk20a_clk_register_export_ops(struct gk20a *g)
         return ret;
 }
 
+static void gk20a_clk_disable_slowboot(struct gk20a *g)
+{
+        u32 data;
+
+        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));
+        gk20a_writel(g, trim_sys_gpc2clk_out_r(), data);
+}
+
 static int gk20a_init_clk_support(struct gk20a *g)
 {
         struct clk_gk20a *clk = &g->clk;
@@ -695,6 +706,7 @@ static int gk20a_suspend_clk_support(struct gk20a *g)
 
 void gk20a_init_clk_ops(struct gpu_ops *gops)
 {
+        gops->clk.disable_slowboot = gk20a_clk_disable_slowboot;
         gops->clk.init_clk_support = gk20a_init_clk_support;
         gops->clk.suspend_clk_support = gk20a_suspend_clk_support;
 }
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 5a25eecf..b1747987 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -780,6 +780,9 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
                                 bus_intr_en_0_pri_fecserr_m() |
                                 bus_intr_en_0_pri_timeout_m());
 
+        if (g->ops.clk.disable_slowboot)
+                g->ops.clk.disable_slowboot(g);
+
         gk20a_reset_priv_ring(g);
 
         /* TBD: move this after graphics init in which blcg/slcg is enabled.
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index fc2ed643..72f1178b 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -392,6 +392,7 @@ struct gpu_ops {
                 bool fecsbootstrapdone;
         } pmu;
         struct {
+                void (*disable_slowboot)(struct gk20a *g);
                 int (*init_clk_support)(struct gk20a *g);
                 int (*suspend_clk_support)(struct gk20a *g);
         } clk;
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 @@
 #include "hw_mc_gk20a.h"
 #include "hw_pri_ringmaster_gk20a.h"
 #include "hw_pri_ringstation_sys_gk20a.h"
-#include "hw_trim_gk20a.h"
 
 void gk20a_reset_priv_ring(struct gk20a *g)
 {
-        u32 data;
-
         if (tegra_platform_is_linsim())
                 return;
 
-        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));
-        gk20a_writel(g, trim_sys_gpc2clk_out_r(), data);
-
         gk20a_reset(g, mc_enable_priv_ring_enabled_f());
 
         if (g->ops.clock_gating.slcg_priring_load_gating_prod)