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>
This commit is contained in:
Deepak Nibade
2015-05-05 18:03:14 +05:30
committed by Ishan Mittal
parent d9854e4782
commit e7ea596363

View File

@@ -1210,19 +1210,11 @@ static int gk20a_pm_initialise_domain(struct platform_device *pdev)
struct gk20a_platform *platform = platform_get_drvdata(pdev);
struct dev_power_governor *pm_domain_gov = NULL;
struct generic_pm_domain *domain = dev_to_genpd(&pdev->dev);
struct device *dev = &pdev->dev;
#ifdef CONFIG_PM_RUNTIME
if (!platform->can_railgate)
pm_domain_gov = &pm_domain_always_on_gov;
#endif
/*
* FIXME: We can remove below assignment once we have clean shutdown
* for gk20a.
*/
if (dev->pm_domain)
dev->pm_domain->detach = NULL;
domain->gov = pm_domain_gov;
if (platform->railgate_delay)