| Message ID | 20210414165926.1875465-1-ranjani.sridharan@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | eea1d18e9b2d959df908746b193f66dba3078473 |
| Headers | show |
| Series | ASoC: SOF: use current DAI config during resume | expand |
On 4/15/21 10:53 AM, Mark Brown wrote: > On Wed, Apr 14, 2021 at 09:59:26AM -0700, Ranjani Sridharan wrote: >> Recently, the sof_pcm_dai_link_fixup() function was >> updated to match SSP config with the PCM hw_params >> and set the current_config for the DAI widget. >> >> But the sof_restore_pipelines() function still chooses the >> default config for the DAI widget upon resuming. Fix this >> to use the last used config when setting up the DAI widget >> during resume. >> >> Fixes: a1e1f10a6ed6 ("ASoC: SOF: match SSP config with pcm hw params") > > I don't seem to have that commit. I think it should be: Fixes: c943a586f6e49 ("ASoC: SOF: match SSP config with pcm hw params") I can re-send if needed
On Wed, 14 Apr 2021 09:59:26 -0700, Ranjani Sridharan wrote: > Recently, the sof_pcm_dai_link_fixup() function was > updated to match SSP config with the PCM hw_params > and set the current_config for the DAI widget. > > But the sof_restore_pipelines() function still chooses the > default config for the DAI widget upon resuming. Fix this > to use the last used config when setting up the DAI widget > during resume. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: SOF: use current DAI config during resume commit: eea1d18e9b2d959df908746b193f66dba3078473 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c index 0d0d47dc0246..510883cd9107 100644 --- a/sound/soc/sof/sof-audio.c +++ b/sound/soc/sof/sof-audio.c @@ -267,7 +267,7 @@ int sof_restore_pipelines(struct device *dev) /* restore dai links */ list_for_each_entry_reverse(dai, &sdev->dai_list, list) { struct sof_ipc_reply reply; - struct sof_ipc_dai_config *config = dai->dai_config; + struct sof_ipc_dai_config *config = &dai->dai_config[dai->current_config]; if (!config) { dev_err(dev, "error: no config for DAI %s\n",
Recently, the sof_pcm_dai_link_fixup() function was updated to match SSP config with the PCM hw_params and set the current_config for the DAI widget. But the sof_restore_pipelines() function still chooses the default config for the DAI widget upon resuming. Fix this to use the last used config when setting up the DAI widget during resume. Fixes: a1e1f10a6ed6 ("ASoC: SOF: match SSP config with pcm hw params") Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> --- sound/soc/sof/sof-audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)