nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 18:16:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: remove wait in shutdown

Browse Source 
In gk20a_pm_shutdown(), we currently wait for 2s
for all channels to finish their work

But we already cancel all the nvgpu workers, freeze
user processes during shutdown
So the waiting should not be required, and hence
remove it

Bug 200166139

Change-Id: I0012f1b3c0f4f676958d083f8c60a001f7015fb0
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1121918
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Deepak Nibade
2016-01-12 17:49:57 +05:30
committed by Terje Bergstrom
parent caed43e0a2
commit 0dd7ffbf23
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpu/nvgpu/gk20a/gk20a.c
View File

@@ -1155,26 +1155,23 @@ static int gk20a_pm_disable_clk(struct device *dev)
static void gk20a_pm_shutdown(struct platform_device *pdev)
{
#ifdef CONFIG_PM
unsigned long timeout = jiffies +
msecs_to_jiffies(GK20A_WAIT_FOR_IDLE_MS);
int ref_cnt;
#endif
struct gk20a_platform *platform = platform_get_drvdata(pdev);
dev_info(&pdev->dev, "shutting down");
/* If GPU is already railgated,
* just prevent more requests, and return */
if (platform->is_railgated && platform->is_railgated(&pdev->dev)) {
#ifdef CONFIG_PM
__pm_runtime_disable(&pdev->dev, false);
#endif
return;
}
#ifdef CONFIG_PM
/* Prevent more requests by disabling Runtime PM */
__pm_runtime_disable(&pdev->dev, false);
/* Wait until current running requests are finished */
while (time_before(jiffies, timeout)) {
ref_cnt = atomic_read(&pdev->dev.power.usage_count);
if (ref_cnt > 1)
msleep(1);
else
break;
}
#endif
/* Be ready for rail-gate after this point */
@@ -1182,6 +1179,8 @@ static void gk20a_pm_shutdown(struct platform_device *pdev)
vgpu_pm_prepare_poweroff(&pdev->dev);
else
gk20a_pm_prepare_poweroff(&pdev->dev);
dev_info(&pdev->dev, "shut down complete\n");
}
#ifdef CONFIG_PM