gpu: nvgpu: Keep host1x on when GPU on

Remove the path for turning on only gk20a. Always when turning on
hardware, turn both host1x and GPU on.

Change-Id: I5f972a487d3348bf2254bdb0fadb42ca600a559e
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/406405

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 029bfca2..78e33a49 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -770,6 +770,7 @@ static int gk20a_pm_prepare_poweroff(struct device *dev)
         /* Disable GPCPLL */
         ret |= gk20a_suspend_clk_support(g);
 
+        gk20a_platform_channel_idle(pdev);
         g->power_on = false;
 
         return ret;
@@ -801,6 +802,10 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
 
         gk20a_dbg_fn("");
 
+        err = gk20a_platform_channel_busy(pdev);
+        if (err)
+                return err;
+
         if (g->power_on)
                 return 0;