From c61ab8facbbc052a7aec9d8b365cc6a81b0903d7 Mon Sep 17 00:00:00 2001 From: Sumit Singh Date: Tue, 16 Jun 2015 16:47:16 +0530 Subject: 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 --- drivers/gpu/nvgpu/gk20a/gk20a.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers') 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, #endif of_genpd_add_provider_simple(np, gpd); - -#warning genpd_pm_subdomain_attach does not work with upstream -#if 0 gpd->of_node = of_node_get(np); genpd_pm_subdomain_attach(gpd); -#endif return 0; } -- cgit v1.2.2 From c65d41e768a898b5e7f2472c797746e13b319875 Mon Sep 17 00:00:00 2001 From: Sumit Singh Date: Wed, 6 May 2015 21:50:26 +0530 Subject: gpu: nvgpu: Add DT support for gpu power-domain for T132 Make modification to add DT support for gpu power-domain for T132 chip. Bug 200070810 Change-Id: Iac63c8fb5fc5280e9a9f5758e63c9da009f3813d Signed-off-by: Sumit Singh Reviewed-on: http://git-master/r/739698 Reviewed-by: Bharat Nihalani Tested-by: Bharat Nihalani --- drivers/gpu/nvgpu/gk20a/gk20a.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 6afac4d8..e9c38469 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -1347,6 +1347,7 @@ static int gk20a_secure_page_alloc(struct platform_device *pdev) } static struct of_device_id tegra_gpu_domain_match[] = { + {.compatible = "nvidia,tegra132-gpu-pd"}, {.compatible = "nvidia,tegra210-gpu-pd"}, {}, }; -- cgit v1.2.2 From 1f99458ed39f44fc874f835aae8289b0d596a5db Mon Sep 17 00:00:00 2001 From: Sumit Singh Date: Thu, 25 Jun 2015 16:27:10 +0530 Subject: 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 --- drivers/gpu/nvgpu/gk20a/gk20a.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'drivers') 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); -- cgit v1.2.2