summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2015-05-05 08:33:14 -0400
committerIshan Mittal <imittal@nvidia.com>2015-05-18 02:03:39 -0400
commite7ea5963634cb1832d1cbd559e26ba92cdaf1e25 (patch)
tree9ae3891d9b15f8651bb8d6c2f70b4e269c4d15ca /drivers
parentd9854e4782b72247f80b64669d00289592cf4dbc (diff)
Revert "gpu: nvgpu: Fix gk20a shutdown issue"
This reverts commit c18edd3686115ca0b7d8bb08b35f23264f865358. Proper fixes for shutdown issue are being added with below changes http://git-master/r/#/c/738509/ http://git-master/r/#/c/734920/ Hence revert this workaround Bug 200099940 Change-Id: I74b29c804af2bdb9d95c6b93c5308a323575ae57 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/739082 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 0f2b576d..8e7fbae0 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1210,19 +1210,11 @@ static int gk20a_pm_initialise_domain(struct platform_device *pdev)
1210 struct gk20a_platform *platform = platform_get_drvdata(pdev); 1210 struct gk20a_platform *platform = platform_get_drvdata(pdev);
1211 struct dev_power_governor *pm_domain_gov = NULL; 1211 struct dev_power_governor *pm_domain_gov = NULL;
1212 struct generic_pm_domain *domain = dev_to_genpd(&pdev->dev); 1212 struct generic_pm_domain *domain = dev_to_genpd(&pdev->dev);
1213 struct device *dev = &pdev->dev;
1214 1213
1215#ifdef CONFIG_PM_RUNTIME 1214#ifdef CONFIG_PM_RUNTIME
1216 if (!platform->can_railgate) 1215 if (!platform->can_railgate)
1217 pm_domain_gov = &pm_domain_always_on_gov; 1216 pm_domain_gov = &pm_domain_always_on_gov;
1218#endif 1217#endif
1219 /*
1220 * FIXME: We can remove below assignment once we have clean shutdown
1221 * for gk20a.
1222 */
1223 if (dev->pm_domain)
1224 dev->pm_domain->detach = NULL;
1225
1226 domain->gov = pm_domain_gov; 1218 domain->gov = pm_domain_gov;
1227 1219
1228 if (platform->railgate_delay) 1220 if (platform->railgate_delay)