From e7ea5963634cb1832d1cbd559e26ba92cdaf1e25 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Tue, 5 May 2015 18:03:14 +0530 Subject: 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 Reviewed-on: http://git-master/r/739082 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- 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 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) 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) -- cgit v1.2.2