2 files changed, 18 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_scale.c b/drivers/gpu/nvgpu/gk20a/gk20a_scale.c
index eeabd919..ec9ca5db 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a_scale.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a_scale.c
@@ -118,10 +118,13 @@ static int gk20a_scale_make_freq_table(struct gk20a_scale_profile *profile)
         int num_freqs, err;
         unsigned long *freqs;
 
-        /* get gpu frequency table */
-        err = platform->get_clk_freqs(profile->dev, &freqs,
+        if (platform->get_clk_freqs) {
+                /* get gpu frequency table */
+                err = platform->get_clk_freqs(profile->dev, &freqs,
                                         &num_freqs);
-        if (err)
+                if (err)
+                        return -ENOSYS;
+        } else
                 return -ENOSYS;
 
         profile->devfreq_profile.freq_table = (unsigned long *)freqs;
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 62d3b231..6fc52ad0 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -4656,6 +4656,8 @@ out:
 
 static void gr_gk20a_load_gating_prod(struct gk20a *g)
 {
+        gk20a_dbg_fn("");
+
         /* slcg prod values */
         if (g->ops.clock_gating.slcg_bus_load_gating_prod)
                 g->ops.clock_gating.slcg_bus_load_gating_prod(g,
@@ -4669,7 +4671,9 @@ static void gr_gk20a_load_gating_prod(struct gk20a *g)
         if (g->ops.clock_gating.slcg_ctxsw_firmware_load_gating_prod)
                 g->ops.clock_gating.slcg_ctxsw_firmware_load_gating_prod(g,
                                 g->slcg_enabled);
-        g->ops.clock_gating.slcg_perf_load_gating_prod(g, g->slcg_enabled);
+        if (g->ops.clock_gating.slcg_perf_load_gating_prod)
+                g->ops.clock_gating.slcg_perf_load_gating_prod(g,
+                                g->slcg_enabled);
         if (g->ops.clock_gating.slcg_xbar_load_gating_prod)
                 g->ops.clock_gating.slcg_xbar_load_gating_prod(g,
                                 g->slcg_enabled);
@@ -4681,14 +4685,19 @@ static void gr_gk20a_load_gating_prod(struct gk20a *g)
         if (g->ops.clock_gating.blcg_ce_load_gating_prod)
                 g->ops.clock_gating.blcg_ce_load_gating_prod(g,
                                 g->blcg_enabled);
-        g->ops.clock_gating.blcg_gr_load_gating_prod(g, g->blcg_enabled);
+        if (g->ops.clock_gating.blcg_gr_load_gating_prod)
+                g->ops.clock_gating.blcg_gr_load_gating_prod(g,
+                                g->blcg_enabled);
         if (g->ops.clock_gating.blcg_ctxsw_firmware_load_gating_prod)
                 g->ops.clock_gating.blcg_ctxsw_firmware_load_gating_prod(g,
                                 g->blcg_enabled);
         if (g->ops.clock_gating.blcg_xbar_load_gating_prod)
                 g->ops.clock_gating.blcg_xbar_load_gating_prod(g,
                                 g->blcg_enabled);
-        g->ops.clock_gating.pg_gr_load_gating_prod(g, true);
+        if (g->ops.clock_gating.pg_gr_load_gating_prod)
+                g->ops.clock_gating.pg_gr_load_gating_prod(g, true);
+
+        gk20a_dbg_fn("done");
 }
 
 static int gk20a_init_gr_prepare(struct gk20a *g)