2 files changed, 9 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 0206c915..64ae4401 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -91,9 +91,11 @@ int gk20a_prepare_poweroff(struct gk20a *g)
 
         gk20a_dbg_fn("");
 
-        ret = gk20a_channel_suspend(g);
-        if (ret)
-                return ret;
+        if (g->ops.fifo.channel_suspend) {
+                ret = g->ops.fifo.channel_suspend(g);
+                if (ret)
+                        return ret;
+        }
 
         /* disable elpg before gr or fifo suspend */
         if (g->ops.pmu.is_pmu_supported(g))
@@ -330,7 +332,8 @@ int gk20a_finalize_poweron(struct gk20a *g)
         }
 #endif
 
-        gk20a_channel_resume(g);
+        if (g->ops.fifo.channel_resume)
+                g->ops.fifo.channel_resume(g);
 
         nvgpu_init_mm_ce_context(g);
 
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 76413600..c7653133 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -633,6 +633,8 @@ struct gpu_ops {
                                                 bool *verbose, u32 *ms);
                 bool (*check_ch_ctxsw_timeout)(struct channel_gk20a *ch,
                                                 bool *verbose, u32 *ms);
+                int (*channel_suspend)(struct gk20a *g);
+                int (*channel_resume)(struct gk20a *g);
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
                 int (*alloc_syncpt_buf)(struct channel_gk20a *c,
                                 u32 syncpt_id, struct nvgpu_mem *syncpt_buf);