2 files changed, 9 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index c48d7cf8..9ce2ef53 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -281,10 +281,14 @@ int gk20a_finalize_poweron(struct gk20a *g)
                 }
         }
 
-        err = nvgpu_clk_arb_init_arbiter(g);
-        if (err) {
-                nvgpu_err(g, "failed to init clk arb");
-                goto done;
+        if (g->ops.pmu_ver.clk.clk_set_boot_clk && nvgpu_is_enabled(g, NVGPU_PMU_PSTATE))
+                g->ops.pmu_ver.clk.clk_set_boot_clk(g);
+        else {
+                err = nvgpu_clk_arb_init_arbiter(g);
+                if (err) {
+                        nvgpu_err(g, "failed to init clk arb");
+                        goto done;
+                }
         }
 
         err = gk20a_init_therm_support(g);
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 8f35e2c9..07ff28f6 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -820,6 +820,7 @@ struct gpu_ops {
                                 struct nv_pmu_clk_rpc *rpccall,
                                 struct set_fll_clk *setfllclk);
                         u32 (*perf_pmu_vfe_load)(struct gk20a *g);
+                        u32 (*clk_set_boot_clk)(struct gk20a *g);
                 }clk;
         } pmu_ver;
         struct {