mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-16 07:35:14 +00:00
Code Issues Releases Wiki Activity

ASoC: SOF: Add new fields to snd_sof_route

Browse source 
Add two new fields to save the source widget and sink widget
pointers in struct snd_sof_route to make it easier to look up
routes by source/sink widget. Also, add a flag to indicate
if the route has been set up in the DSP. These will be used
when the dynamic pipeline feature is implemented and routes
will have to be set up at run time.

Also, add a new sof_tear_down_pipelines() callback, that will
used to reset the set up status for all routes during suspend.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20210927120517.20505-7-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ranjani Sridharan 2021-09-27 15:05:11 +03:00 committed by Mark Brown
parent d1a7af0979
commit 0a2dea1f10
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
4 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/sof/pm.c
View file

@ -208,6 +208,8 @@ static int sof_suspend(struct device *dev, bool runtime_suspend)
if (target_state == SOF_DSP_PM_D0)
goto suspend;
sof_tear_down_pipelines(dev);
/* release trace */
snd_sof_release_trace(sdev);

15
sound/soc/sof/sof-audio.c
View file

@ -276,6 +276,7 @@ int sof_restore_pipelines(struct device *dev)
return ret;
}
sroute->setup = true;
}
/* restore dai links */
@ -317,6 +318,20 @@ int sof_restore_pipelines(struct device *dev)
return ret;
}
/* This function doesn't free widgets. It only resets the set up status for all routes */
void sof_tear_down_pipelines(struct device *dev)
{
struct snd_sof_dev *sdev = dev_get_drvdata(dev);
struct snd_sof_route *sroute;
/*
* No need to protect sroute->setup as this function is called only during the suspend
* callback and all streams should be suspended by then
*/
list_for_each_entry(sroute, &sdev->route_list, list)
sroute->setup = false;
}
/*
* Generic object lookup APIs.
*/

4
sound/soc/sof/sof-audio.h
View file

@ -118,6 +118,9 @@ struct snd_sof_route {
struct snd_soc_dapm_route *route;
struct list_head list; /* list in sdev route list */
struct snd_sof_widget *src_widget;
struct snd_sof_widget *sink_widget;
bool setup;
void *private;
};
@ -240,6 +243,7 @@ int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_pa
/* PM */
int sof_restore_pipelines(struct device *dev);
void sof_tear_down_pipelines(struct device *dev);
int sof_set_hw_params_upon_resume(struct device *dev);
bool snd_sof_stream_suspend_ignored(struct snd_sof_dev *sdev);
bool snd_sof_dsp_only_d0i3_compatible_stream_active(struct snd_sof_dev *sdev);

3
sound/soc/sof/topology.c
View file

@ -3501,6 +3501,9 @@ static int sof_route_load(struct snd_soc_component *scomp, int index,
sroute->route = route;
dobj->private = sroute;
sroute->private = connect;
sroute->src_widget = source_swidget;
sroute->sink_widget = sink_swidget;
sroute->setup = true;
/* add route to route list */
list_add(&sroute->list, &sdev->route_list);