From 4d278fdfd70082da3c020a15ba0dd722f9da1b3b Mon Sep 17 00:00:00 2001 From: Allen Yu Date: Mon, 9 Jun 2014 17:37:22 +0800 Subject: gpu: nvgpu: Turn on scaling when powered This patch reorders scaling resume to happen always when we power on the GPU, so as to balance the scaling suspend when we power off GPU. bug 200010911 Change-Id: I9fde817fbf9fed7d90c48ea06050db4b82e670a8 Signed-off-by: Allen Yu Reviewed-on: http://git-master/r/421541 GVS: Gerrit_Virtual_Submit Reviewed-by: Bharat Nihalani --- drivers/gpu/nvgpu/gk20a/gk20a.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c') 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) gk20a_dbg_fn(""); - gk20a_scale_suspend(to_platform_device(dev)); + gk20a_scale_suspend(pdev); if (!g->power_on) return 0; @@ -917,6 +917,8 @@ static int gk20a_pm_finalize_poweron(struct device *dev) gk20a_channel_resume(g); set_user_nice(current, nice_value); + gk20a_scale_resume(pdev); + trace_gk20a_finalize_poweron_done(dev_name(dev)); done: @@ -1242,15 +1244,7 @@ static int gk20a_pm_suspend(struct device *dev) static int gk20a_pm_resume(struct device *dev) { - int ret = 0; - - ret = gk20a_pm_finalize_poweron(dev); - if (ret) - return ret; - - gk20a_scale_resume(to_platform_device(dev)); - - return 0; + return gk20a_pm_finalize_poweron(dev); } static int gk20a_pm_initialise_domain(struct platform_device *pdev) -- cgit v1.2.2