1 files changed, 26 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c
index 796507a9..5012d8b5 100644
--- a/drivers/gpu/nvgpu/common/linux/module.c
+++ b/drivers/gpu/nvgpu/common/linux/module.c
@@ -59,6 +59,7 @@
 #include "cde_gp10b.h"
 #include "ctxsw_trace.h"
 #include "driver_common.h"
+#include "channel.h"
 
 #define CLASS_NAME "nvidia-gpu"
 /* TODO: Change to e.g. "nvidia-gpu%s" once we have symlinks in place. */
@@ -185,6 +186,25 @@ static int nvgpu_init_os_linux_ops(struct nvgpu_os_linux *l)
         return 0;
 }
 
+static int nvgpu_finalize_poweron_linux(struct nvgpu_os_linux *l)
+{
+        struct gk20a *g = &l->g;
+        int err;
+
+        if (l->init_done)
+                return 0;
+
+        err = nvgpu_init_channel_support_linux(l);
+        if (err) {
+                nvgpu_err(g, "failed to init linux channel support");
+                return err;
+        }
+
+        l->init_done = true;
+
+        return 0;
+}
+
 int gk20a_pm_finalize_poweron(struct device *dev)
 {
         struct gk20a *g = get_gk20a(dev);
@@ -227,6 +247,10 @@ int gk20a_pm_finalize_poweron(struct device *dev)
         if (err)
                 goto done;
 
+        err = nvgpu_finalize_poweron_linux(l);
+        if (err)
+                goto done;
+
         trace_gk20a_finalize_poweron_done(dev_name(dev));
 
         err = nvgpu_init_os_linux_ops(l);
@@ -596,6 +620,8 @@ void gk20a_remove_support(struct gk20a *g)
 
         nvgpu_kfree(g, g->dbg_regops_tmp_buf);
 
+        nvgpu_remove_channel_support_linux(l);
+
         if (g->pmu.remove_support)
                 g->pmu.remove_support(&g->pmu);