diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2014-05-07 06:09:36 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:09:47 -0400 |
commit | caae9bfd241f0592b68e127f583d74280f8cb353 (patch) | |
tree | 684b426de27f9a1873378782aa957808841b5263 /drivers/gpu/nvgpu | |
parent | 219eb3d26bbcbede22c59e313c797e1854b12f2f (diff) |
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
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 5 |
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) | |||
770 | /* Disable GPCPLL */ | 770 | /* Disable GPCPLL */ |
771 | ret |= gk20a_suspend_clk_support(g); | 771 | ret |= gk20a_suspend_clk_support(g); |
772 | 772 | ||
773 | gk20a_platform_channel_idle(pdev); | ||
773 | g->power_on = false; | 774 | g->power_on = false; |
774 | 775 | ||
775 | return ret; | 776 | return ret; |
@@ -801,6 +802,10 @@ static int gk20a_pm_finalize_poweron(struct device *dev) | |||
801 | 802 | ||
802 | gk20a_dbg_fn(""); | 803 | gk20a_dbg_fn(""); |
803 | 804 | ||
805 | err = gk20a_platform_channel_busy(pdev); | ||
806 | if (err) | ||
807 | return err; | ||
808 | |||
804 | if (g->power_on) | 809 | if (g->power_on) |
805 | return 0; | 810 | return 0; |
806 | 811 | ||