gpu: nvgpu: Initialize CE once channels resumed

Initialize CE channels and vidmem clearer only once channels have
been enabled.

Change-Id: Id4c870ee7d4632044b97cead5d0d7b8317170430
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1628167
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: David Martinez Nieto <dmartineznie@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 0ccc8f6c..c967b69b 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -302,8 +302,6 @@ int gk20a_finalize_poweron(struct gk20a *g)
 
         gk20a_init_ce_support(g);
 
-        nvgpu_init_mm_ce_context(g);
-
         if (g->ops.xve.available_speeds) {
                 u32 speed;
 
@@ -321,8 +319,6 @@ int gk20a_finalize_poweron(struct gk20a *g)
                 }
         }
 
-        nvgpu_vidmem_thread_unpause(&g->mm);
-
 #if defined(CONFIG_TEGRA_GK20A_NVHOST) && defined(CONFIG_TEGRA_19x_GPU)
         if (gk20a_platform_has_syncpoints(g) && g->syncpt_unit_size) {
                 if (!nvgpu_mem_is_valid(&g->syncpt_mem)) {
@@ -335,6 +331,10 @@ int gk20a_finalize_poweron(struct gk20a *g)
 
         gk20a_channel_resume(g);
 
+        nvgpu_init_mm_ce_context(g);
+
+        nvgpu_vidmem_thread_unpause(&g->mm);
+
 done:
         if (err)
                 g->power_on = false;