diff options
author | Sumit Singh <sumsingh@nvidia.com> | 2015-06-16 07:17:16 -0400 |
---|---|---|
committer | Sumit Singh <sumsingh@nvidia.com> | 2015-06-29 02:08:48 -0400 |
commit | c61ab8facbbc052a7aec9d8b365cc6a81b0903d7 (patch) | |
tree | 6054a2b80eba3285ee92c4213b57f625ed1747cc /drivers | |
parent | c6b396729bcdb2988878ea6acd256becef3d7cd9 (diff) |
Revert "HACK: Disable genpd_pm_subdomain_attach"
This reverts commit 83699a4ec9ebf55f6cc12c76e57dad1d4ec2fbfa.
This hack was put in place as upstream has removed of_node
field from generic_pm_domain structure. But as we are still
using it, so removing this hack.
Bug 200100078
Change-Id: I14e533786fb814e361c580e2883ceff1f63d251f
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 498de7e7..6afac4d8 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -1639,13 +1639,9 @@ static int _gk20a_init_domain(struct device_node *np, | |||
1639 | #endif | 1639 | #endif |
1640 | 1640 | ||
1641 | of_genpd_add_provider_simple(np, gpd); | 1641 | of_genpd_add_provider_simple(np, gpd); |
1642 | |||
1643 | #warning genpd_pm_subdomain_attach does not work with upstream | ||
1644 | #if 0 | ||
1645 | gpd->of_node = of_node_get(np); | 1642 | gpd->of_node = of_node_get(np); |
1646 | 1643 | ||
1647 | genpd_pm_subdomain_attach(gpd); | 1644 | genpd_pm_subdomain_attach(gpd); |
1648 | #endif | ||
1649 | return 0; | 1645 | return 0; |
1650 | } | 1646 | } |
1651 | 1647 | ||