diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index e303dcd6..f9b28156 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -748,7 +748,7 @@ static int gk20a_pm_prepare_poweroff(struct device *dev) | |||
748 | 748 | ||
749 | gk20a_dbg_fn(""); | 749 | gk20a_dbg_fn(""); |
750 | 750 | ||
751 | gk20a_scale_suspend(to_platform_device(dev)); | 751 | gk20a_scale_suspend(pdev); |
752 | 752 | ||
753 | if (!g->power_on) | 753 | if (!g->power_on) |
754 | return 0; | 754 | return 0; |
@@ -917,6 +917,8 @@ static int gk20a_pm_finalize_poweron(struct device *dev) | |||
917 | gk20a_channel_resume(g); | 917 | gk20a_channel_resume(g); |
918 | set_user_nice(current, nice_value); | 918 | set_user_nice(current, nice_value); |
919 | 919 | ||
920 | gk20a_scale_resume(pdev); | ||
921 | |||
920 | trace_gk20a_finalize_poweron_done(dev_name(dev)); | 922 | trace_gk20a_finalize_poweron_done(dev_name(dev)); |
921 | 923 | ||
922 | done: | 924 | done: |
@@ -1242,15 +1244,7 @@ static int gk20a_pm_suspend(struct device *dev) | |||
1242 | 1244 | ||
1243 | static int gk20a_pm_resume(struct device *dev) | 1245 | static int gk20a_pm_resume(struct device *dev) |
1244 | { | 1246 | { |
1245 | int ret = 0; | 1247 | return gk20a_pm_finalize_poweron(dev); |
1246 | |||
1247 | ret = gk20a_pm_finalize_poweron(dev); | ||
1248 | if (ret) | ||
1249 | return ret; | ||
1250 | |||
1251 | gk20a_scale_resume(to_platform_device(dev)); | ||
1252 | |||
1253 | return 0; | ||
1254 | } | 1248 | } |
1255 | 1249 | ||
1256 | static int gk20a_pm_initialise_domain(struct platform_device *pdev) | 1250 | static int gk20a_pm_initialise_domain(struct platform_device *pdev) |