From cb55553544dab4291d9b4c4f800580485a670c88 Mon Sep 17 00:00:00 2001 From: seshendra Gadagottu Date: Sat, 23 Dec 2017 17:45:52 -0800 Subject: gpu: nvgpu: do channel resume after hw init During finalize power on, resume channels only after complete hw initialization is done. Otherwise it will cause issues with unexpected usage of hw. During first boot will not see these issues because there will no channels. But after rail gate/ungate or suspend/resume these issues can be seen if channels are present before rail-gate/suspend. Bug 2039195 Change-Id: Ie96e2f2b91902ba18b37e9a167344eeae07ba8c2 Signed-off-by: seshendra Gadagottu Reviewed-on: https://git-master.nvidia.com/r/1625506 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/gk20a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index c029e9e0..c72b6193 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -294,8 +294,6 @@ int gk20a_finalize_poweron(struct gk20a *g) /* Restore the debug setting */ g->ops.fb.set_debug_mode(g, g->mmu_debug_ctrl); - gk20a_channel_resume(g); - gk20a_init_ce_support(g); nvgpu_init_mm_ce_context(g); @@ -329,6 +327,8 @@ int gk20a_finalize_poweron(struct gk20a *g) } #endif + gk20a_channel_resume(g); + done: if (err) g->power_on = false; -- cgit v1.2.2