nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

tegra-alt: adsp: add runtime suspend delay

Browse Source 
Add autosuspend delay to avoid freuquent suspend/resume
of ADSP OS. Remove redundant PM_SLEEP ops.

Bug 200087374

Change-Id: I0164f8b890b7edf0fb882706a8ada2fab121e280
Signed-off-by: Viraj Karandikar <vkarandikar@nvidia.com>
Reviewed-on: http://git-master/r/720996
(cherry picked from commit e88ffa5fc211e68b888027ede341e264717a57d6)
Reviewed-on: http://git-master/r/740601
Reviewed-on: http://git-master/r/750722
Tested-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Arun Shamanna Lakshmi <aruns@nvidia.com>
This commit is contained in:
Viraj Karandikar
2015-03-23 20:13:37 +05:30
committed by Sameer Pujar
parent 44e11500e3
commit 9b6c02f70f
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sound/soc/tegra-alt/tegra210_adsp_alt.c
View File

@@ -57,6 +57,9 @@
/* Flag to enable/disable loading of ADSP firmware */ /* Flag to enable/disable loading of ADSP firmware */
#define ENABLE_ADSP 1 #define ENABLE_ADSP 1
/* Suspend delay to avoid frequent ADSP suspend/resume */
#define TEGRA210_ADSP_SUSPEND_DELAY (3000) /* ms */
static struct tegra210_adsp_app_desc { static struct tegra210_adsp_app_desc {
const char *name; const char *name;
const char *fw_name; const char *fw_name;
@@ -1600,12 +1603,14 @@ static int tegra210_adsp_runtime_resume(struct device *dev)
return ret; return ret;
} }
#ifdef CONFIG_PM_SLEEP static int tegra210_adsp_runtime_idle(struct device *dev)
static int tegra210_adsp_suspend(struct device *dev)
{ {
return tegra210_adsp_runtime_suspend(dev); struct tegra210_adsp *adsp = dev_get_drvdata(dev);
dev_dbg(adsp->dev, "%s\n", __func__);
pm_runtime_mark_last_busy(adsp->dev);
pm_runtime_autosuspend(adsp->dev);
return 1;
} }
#endif
/* ADSP platform driver read/write call-back */ /* ADSP platform driver read/write call-back */
static int tegra210_adsp_read(struct snd_soc_component *component, static int tegra210_adsp_read(struct snd_soc_component *component,
@@ -1703,7 +1708,8 @@ static int tegra210_adsp_mux_put(struct snd_kcontrol *kcontrol,
snd_soc_dapm_mux_update_power(dapm, kcontrol, val, e, NULL); snd_soc_dapm_mux_update_power(dapm, kcontrol, val, e, NULL);
err_put: err_put:
pm_runtime_put(adsp->dev); pm_runtime_mark_last_busy(adsp->dev);
pm_runtime_put_autosuspend(adsp->dev);
return ret ? ret : 1; return ret ? ret : 1;
} }
@@ -1764,7 +1770,8 @@ static int tegra210_adsp_widget_event(struct snd_soc_dapm_widget *w,
* Actmon takes care of adjusting frequency later. */ * Actmon takes care of adjusting frequency later. */
pm_runtime_get_sync(adsp->dev); pm_runtime_get_sync(adsp->dev);
adsp_update_dfs(500000, 1); adsp_update_dfs(500000, 1);
pm_runtime_put(adsp->dev); pm_runtime_mark_last_busy(adsp->dev);
pm_runtime_put_autosuspend(adsp->dev);
tegra210_adsp_send_state_msg(app, nvfx_state_active, tegra210_adsp_send_state_msg(app, nvfx_state_active,
TEGRA210_ADSP_MSG_FLAG_SEND); TEGRA210_ADSP_MSG_FLAG_SEND);
} }
@@ -2376,7 +2383,8 @@ static int tegra210_adsp_set_param(struct snd_kcontrol *kcontrol,
pm_runtime_get_sync(adsp->dev); pm_runtime_get_sync(adsp->dev);
ret = tegra210_adsp_send_msg(app->apm, &apm_msg, ret = tegra210_adsp_send_msg(app->apm, &apm_msg,
TEGRA210_ADSP_MSG_FLAG_SEND); TEGRA210_ADSP_MSG_FLAG_SEND);
pm_runtime_put(adsp->dev); pm_runtime_mark_last_busy(adsp->dev);
pm_runtime_put_autosuspend(adsp->dev);
return ret; return ret;
} }
@@ -2494,6 +2502,10 @@ static int tegra210_adsp_audio_platform_probe(struct platform_device *pdev)
pdev->dev.dma_mask = &tegra_dma_mask; pdev->dev.dma_mask = &tegra_dma_mask;
pdev->dev.coherent_dma_mask = tegra_dma_mask; pdev->dev.coherent_dma_mask = tegra_dma_mask;
/* Delay suspend to avoid frequent ADSP OS suspend-resume */
pm_runtime_use_autosuspend(&pdev->dev);
pm_runtime_set_autosuspend_delay(&pdev->dev,
TEGRA210_ADSP_SUSPEND_DELAY);
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
if (!pm_runtime_enabled(&pdev->dev)) if (!pm_runtime_enabled(&pdev->dev))
goto err_pm_disable; goto err_pm_disable;
@@ -2667,8 +2679,7 @@ static int tegra210_adsp_audio_platform_remove(struct platform_device *pdev)
static const struct dev_pm_ops tegra210_adsp_pm_ops = { static const struct dev_pm_ops tegra210_adsp_pm_ops = {
SET_RUNTIME_PM_OPS(tegra210_adsp_runtime_suspend, SET_RUNTIME_PM_OPS(tegra210_adsp_runtime_suspend,
tegra210_adsp_runtime_resume, NULL) tegra210_adsp_runtime_resume, tegra210_adsp_runtime_idle)
SET_SYSTEM_SLEEP_PM_OPS(tegra210_adsp_suspend, NULL)
}; };
static struct platform_driver tegra210_adsp_audio_driver = { static struct platform_driver tegra210_adsp_audio_driver = {