On 07/07/11 04:32, Mark Brown wrote:
On Wed, Jul 06, 2011 at 08:49:28PM +0100, Liam Girdwood wrote:
Add DAPM API calls to determine whether a DAPM audio path is valid between source and sink widgets and return a lits of active widgets in that path. This also takes into account all kcontrol mux and mixer settings in between the source and sink widgets to validate the audio path.
Hrm, I'm not entirely sure about this. My overall feeling is that it feels complicated and I'm not comfortable that it's doing something different to the rest of DAPM that doesn't normally get used. It doesn't seem like the tree walk we're doing here should be different enough to the walk we do for the normal power check to require a completely separate implementation and having the two checks feels like it's going to cause issues later on. I may be missing something but shouldn't we be able to replace the current list walk with a walk which uses this sort of interface on each relevant widget it finds?
There's already some drift with things like the callbacks for dynamic routes not being implemented...
The reason for using a separate walk here was because this code is taken from my old auto-router and it was to avoid the extra logic introduced by the auto-router. The auto-router did need to check for loops and always select the shortest path when > 1 path was viable (interesting as WM9713 has both loops and multiple paths). Let me see how cleanly I can merge it into the current walk.
It does also occur to me that perhaps what we want to do here is allow widgets to find out about paths when they're being activated anyway?
For dynamic PCM, we need to also work out which DAIs are active based on the graph. Hence for playback we can supply the DAC/AIF and find out all the connected output AIF/Speakers/Pins/etc. This is required at the start of open() in order that we can call the other PCM ops for each DAI, codec and platform.
That'd also be useful for things like DVFS charge pumps, sometimes they can easily be controlled with a fake widget but not always if there's complicated digital routing within the device.
Yeah, this can also be used to figure out the paths when widgets are activated too. I can export the API calls in order for components to make use of this information when their widgets are activated.
@@ -432,6 +440,8 @@ struct snd_soc_dapm_path { u32 connect:1; /* source and sink widgets are connected */ u32 walked:1; /* path has been walked */ u32 weak:1; /* path ignored for power management */
- u32 length:6; /* path length - used by route checker */
The :6 seems very odd here.
Yeah, this came from auto-router when I think we cared about squeezing this all into a u32.
index 0a78482..800af10 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -48,6 +48,8 @@
#include <trace/events/asoc.h>
+#define DAPM_MAX_HOPS 16
This seems too low, if we need a limit I'd expect it to be an order of magnitude higher. I'm not sure we should need a limit, though.
Agreed, I will remove it.
+/* add widget to list if it's not already in the list */ +static int dapm_add_unique_widget(struct snd_soc_dapm_context *dapm,
- struct snd_soc_dapm_widget_list **list,
- struct snd_soc_dapm_widget *w)
Just make this plain old add_widget()? I can't see us ever wanting a non-unique version, and it's going to have fun with the standard list implementation if we do. Perhaps also shove a list in the name.
Yeah, that does sound better.
- /* is the list empty ? */
- if (*list == NULL) {
wlistsize = sizeof(struct snd_soc_dapm_widget_list) +sizeof(struct snd_soc_dapm_widget *);*list = kzalloc(wlistsize, GFP_KERNEL);if (*list == NULL) {dev_err(dapm->dev, "can't allocate widget list for %s\n",w->name);return -ENOMEM;It seems really odd to be allocating here rather than in the caller.
*list = krealloc(wlist, wlistsize, GFP_KERNEL);if (*list == NULL) {dev_err(dapm->dev, "can't allocate widget list for %s\n",w->name);return -ENOMEM;}This will leak the pointer to the list when it fails.
+/* is widget an output endpoint */ +static int is_output_widget_ep(struct snd_soc_dapm_widget *widget) +{
- switch (widget->id) {
- case snd_soc_dapm_adc:
- case snd_soc_dapm_aif_out:
return 1;- case snd_soc_dapm_output:
if (widget->connected && !widget->ext)return 1;elsereturn 0;- case snd_soc_dapm_hp:
- case snd_soc_dapm_spk:
- case snd_soc_dapm_line:
return !list_empty(&widget->sources);- default:
return 0;With both this and the input version we're duplicating sort of the logic that's in is_connected_foo_ep. I'd feel much happier if we factored the shared logic out of those functions rather than duplicating it, as it is I'm worried the two could drift apart over time.
- case snd_soc_dapm_mic:
return !list_empty(&widget->sources);That doesn't seem right?
+/**
- snd_soc_dapm_get_connected_widgets_type - query audio path and it's widgets.
- @dapm: the dapm context.
- @stream_name: stream name.
- @list: list of active widgets for this stream.
- @stream: stream direction.
- @type: Initial widget type.
- Queries DAPM graph as to whether an valid audio stream path exists for
- the DAPM stream and initial widget type specified. This takes into account
- current mixer and mux kcontrol settings. Creates list of valid widgets.
Why would someone want to query by type? That seems surprising. Name and/or direction yes but type seems hard to find a use for.
We query by type so that we can qualify the root widget for a shared common stream name. i.e. Dynamic DSP needs to find the AIF rather than a DAC for stream X.
Liam