gpu: nvgpu: Uncomment suspend/resume ops

As upstream has removed them, but we are still using these.
So uncommenting these callback assignment.

Bug 200070810

Change-Id: I26a221f9d76f6acef70095eb8afcf440057f464c
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>

1 files changed, 0 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index e9c38469..d5208e0d 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1198,7 +1198,6 @@ static int gk20a_pm_unrailgate(struct generic_pm_domain *domain)
         return _gk20a_pm_unrailgate(g->dev);
 }
 
-#if 0
 static int gk20a_pm_suspend(struct device *dev)
 {
         struct gk20a_platform *platform = dev_get_drvdata(dev);
@@ -1223,7 +1222,6 @@ static int gk20a_pm_resume(struct device *dev)
 {
         return gk20a_pm_finalize_poweron(dev);
 }
-#endif
 
 #ifdef CONFIG_PM_GENERIC_DOMAINS_OF
 static int gk20a_pm_initialise_domain(struct platform_device *pdev)
@@ -1276,11 +1274,8 @@ static int gk20a_pm_initialise_domain(struct platform_device *pdev)
         domain->dev_ops.stop = gk20a_pm_disable_clk;
         domain->dev_ops.save_state = gk20a_pm_prepare_poweroff;
         domain->dev_ops.restore_state = gk20a_pm_finalize_poweron;
-#warning domain suspend/resume ops have been removed upstream
-#if 0
         domain->dev_ops.suspend = gk20a_pm_suspend;
         domain->dev_ops.resume = gk20a_pm_resume;
-#endif
 
         device_set_wakeup_capable(&pdev->dev, 0);
         ret = pm_genpd_add_device(domain, &pdev->dev);
@@ -1633,11 +1628,8 @@ static int _gk20a_init_domain(struct device_node *np,
         gpd->dev_ops.stop = gk20a_pm_disable_clk;
         gpd->dev_ops.save_state = gk20a_pm_prepare_poweroff;
         gpd->dev_ops.restore_state = gk20a_pm_finalize_poweron;
-#warning domain suspend/resume ops have been removed upstream
-#if 0
         gpd->dev_ops.suspend = gk20a_pm_suspend;
         gpd->dev_ops.resume = gk20a_pm_resume;
-#endif
 
         of_genpd_add_provider_simple(np, gpd);
         gpd->of_node = of_node_get(np);