diff options
author | Sumit Singh <sumsingh@nvidia.com> | 2015-06-25 06:57:10 -0400 |
---|---|---|
committer | Sumit Singh <sumsingh@nvidia.com> | 2015-06-29 02:12:30 -0400 |
commit | 1f99458ed39f44fc874f835aae8289b0d596a5db (patch) | |
tree | 753c8e202a865488a170bf520a1d1b28d318d55c /drivers/gpu/nvgpu | |
parent | c65d41e768a898b5e7f2472c797746e13b319875 (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 8 |
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) | |||
1198 | return _gk20a_pm_unrailgate(g->dev); | 1198 | return _gk20a_pm_unrailgate(g->dev); |
1199 | } | 1199 | } |
1200 | 1200 | ||
1201 | #if 0 | ||
1202 | static int gk20a_pm_suspend(struct device *dev) | 1201 | static int gk20a_pm_suspend(struct device *dev) |
1203 | { | 1202 | { |
1204 | struct gk20a_platform *platform = dev_get_drvdata(dev); | 1203 | struct gk20a_platform *platform = dev_get_drvdata(dev); |
@@ -1223,7 +1222,6 @@ static int gk20a_pm_resume(struct device *dev) | |||
1223 | { | 1222 | { |
1224 | return gk20a_pm_finalize_poweron(dev); | 1223 | return gk20a_pm_finalize_poweron(dev); |
1225 | } | 1224 | } |
1226 | #endif | ||
1227 | 1225 | ||
1228 | #ifdef CONFIG_PM_GENERIC_DOMAINS_OF | 1226 | #ifdef CONFIG_PM_GENERIC_DOMAINS_OF |
1229 | static int gk20a_pm_initialise_domain(struct platform_device *pdev) | 1227 | static int gk20a_pm_initialise_domain(struct platform_device *pdev) |
@@ -1276,11 +1274,8 @@ static int gk20a_pm_initialise_domain(struct platform_device *pdev) | |||
1276 | domain->dev_ops.stop = gk20a_pm_disable_clk; | 1274 | domain->dev_ops.stop = gk20a_pm_disable_clk; |
1277 | domain->dev_ops.save_state = gk20a_pm_prepare_poweroff; | 1275 | domain->dev_ops.save_state = gk20a_pm_prepare_poweroff; |
1278 | domain->dev_ops.restore_state = gk20a_pm_finalize_poweron; | 1276 | domain->dev_ops.restore_state = gk20a_pm_finalize_poweron; |
1279 | #warning domain suspend/resume ops have been removed upstream | ||
1280 | #if 0 | ||
1281 | domain->dev_ops.suspend = gk20a_pm_suspend; | 1277 | domain->dev_ops.suspend = gk20a_pm_suspend; |
1282 | domain->dev_ops.resume = gk20a_pm_resume; | 1278 | domain->dev_ops.resume = gk20a_pm_resume; |
1283 | #endif | ||
1284 | 1279 | ||
1285 | device_set_wakeup_capable(&pdev->dev, 0); | 1280 | device_set_wakeup_capable(&pdev->dev, 0); |
1286 | ret = pm_genpd_add_device(domain, &pdev->dev); | 1281 | ret = pm_genpd_add_device(domain, &pdev->dev); |
@@ -1633,11 +1628,8 @@ static int _gk20a_init_domain(struct device_node *np, | |||
1633 | gpd->dev_ops.stop = gk20a_pm_disable_clk; | 1628 | gpd->dev_ops.stop = gk20a_pm_disable_clk; |
1634 | gpd->dev_ops.save_state = gk20a_pm_prepare_poweroff; | 1629 | gpd->dev_ops.save_state = gk20a_pm_prepare_poweroff; |
1635 | gpd->dev_ops.restore_state = gk20a_pm_finalize_poweron; | 1630 | gpd->dev_ops.restore_state = gk20a_pm_finalize_poweron; |
1636 | #warning domain suspend/resume ops have been removed upstream | ||
1637 | #if 0 | ||
1638 | gpd->dev_ops.suspend = gk20a_pm_suspend; | 1631 | gpd->dev_ops.suspend = gk20a_pm_suspend; |
1639 | gpd->dev_ops.resume = gk20a_pm_resume; | 1632 | gpd->dev_ops.resume = gk20a_pm_resume; |
1640 | #endif | ||
1641 | 1633 | ||
1642 | of_genpd_add_provider_simple(np, gpd); | 1634 | of_genpd_add_provider_simple(np, gpd); |
1643 | gpd->of_node = of_node_get(np); | 1635 | gpd->of_node = of_node_get(np); |