History

ASoC: qdsp6: audioreach: Simplify handing FE and BE graph connections

Current AudioReach design of connecting FE and BE graph is very complicated and not reliable. Instead used the virtual damp widgets private data to help identify the modules that needs connection at runtime. Also maintain a inter-graph connection info in the graph info, which can be used to both determine if the graphs are connected and at graph build time.

Srinivas Kandagatla committed 4 years ago

Commit e4977b91 parent 1c87d385 files · +127 −174Browse files

Unified · Split

5 files
  1. sound/soc/qcom/qdsp6/audioreach.c +25 −63
  2. sound/soc/qcom/qdsp6/audioreach.h +7 −13
  3. sound/soc/qcom/qdsp6/q6apm.c +1 −82
  4. sound/soc/qcom/qdsp6/q6apm.h +0 −5
  5. sound/soc/qcom/qdsp6/topology.c +94 −11
sound/soc/qcom/qdsp6/audioreach.c+25−63
@@ -332,63 +332,6 @@ static void apm_populate_module_prop_obj(struct apm_mod_prop_obj *obj, · 331 unmodified lines
332332 obj->prop_id_port.max_op_port = module->max_op_port;
333333 }
334334
335−struct audioreach_module *audioreach_get_container_last_module(
336− struct audioreach_container *container)
337−{
338− struct audioreach_module *module;
339−
340− list_for_each_entry(module, &container->modules_list, node) {
341− if (module->dst_mod_inst_id == 0)
342− return module;
343− }
344−
345− return NULL;
346−}
347−EXPORT_SYMBOL_GPL(audioreach_get_container_last_module);
348−
349−static bool is_module_in_container(struct audioreach_container *container, int module_iid)
350−{
351− struct audioreach_module *module;
352−
353− list_for_each_entry(module, &container->modules_list, node) {
354− if (module->instance_id == module_iid)
355− return true;
356− }
357−
358− return false;
359−}
360−
361−struct audioreach_module *audioreach_get_container_first_module(
362− struct audioreach_container *container)
363−{
364− struct audioreach_module *module;
365−
366− /* get the first module from both connected or un-connected containers */
367− list_for_each_entry(module, &container->modules_list, node) {
368− if (module->src_mod_inst_id == 0 ||
369− !is_module_in_container(container, module->src_mod_inst_id))
370− return module;
371− }
372− return NULL;
373−}
374−EXPORT_SYMBOL_GPL(audioreach_get_container_first_module);
375−
376−struct audioreach_module *audioreach_get_container_next_module(
377− struct audioreach_container *container,
378− struct audioreach_module *module)
379−{
380− int nmodule_iid = module->dst_mod_inst_id;
381− struct audioreach_module *nmodule;
382−
383− list_for_each_entry(nmodule, &container->modules_list, node) {
384− if (nmodule->instance_id == nmodule_iid)
385− return nmodule;
386− }
387−
388− return NULL;
389−}
390−EXPORT_SYMBOL_GPL(audioreach_get_container_next_module);
391−
392335 static void apm_populate_module_list_obj(struct apm_mod_list_obj *obj,
393336 struct audioreach_container *container,
394337 int sub_graph_id)
@@ -400,14 +343,15 @@ static void apm_populate_module_list_obj(struct apm_mod_list_obj *obj, · 5 unmodified lines
400343 obj->container_id = container->container_id;
401344 obj->num_modules = container->num_modules;
402345 i = 0;
403− list_for_each_container_module(module, container) {
346+ list_for_each_entry(module, &container->modules_list, node) {
404347 obj->mod_cfg[i].module_id = module->module_id;
405348 obj->mod_cfg[i].instance_id = module->instance_id;
406349 i++;
407350 }
408351 }
409352
410−static void audioreach_populate_graph(struct apm_graph_open_params *open,
353+static void audioreach_populate_graph(struct q6apm *apm, struct audioreach_graph_info *info,
354+ struct apm_graph_open_params *open,
411355 struct list_head *sg_list,
412356 int num_sub_graphs)
413357 {
@@ -428,6 +372,16 @@ static void audioreach_populate_graph(struct apm_graph_open_params *open, · 14 unmodified lines
428372
429373 mlobj = &ml_data->mod_list_obj[0];
430374
375+
376+ if (info->dst_mod_inst_id && info->src_mod_inst_id) {
377+ conn_obj = &mc_data->conn_obj[nconn];
378+ conn_obj->src_mod_inst_id = info->src_mod_inst_id;
379+ conn_obj->src_mod_op_port_id = info->src_mod_op_port_id;
380+ conn_obj->dst_mod_inst_id = info->dst_mod_inst_id;
381+ conn_obj->dst_mod_ip_port_id = info->dst_mod_ip_port_id;
382+ nconn++;
383+ }
384+
431385 list_for_each_entry(sg, sg_list, node) {
432386 struct apm_sub_graph_data *sg_cfg = &sg_data->sg_cfg[i++];
433387
@@ -439,7 +393,7 @@ static void audioreach_populate_graph(struct apm_graph_open_params *open, · 5 unmodified lines
439393 apm_populate_container_config(cobj, container);
440394 apm_populate_module_list_obj(mlobj, container, sg->sub_graph_id);
441395
442− list_for_each_container_module(module, container) {
396+ list_for_each_entry(module, &container->modules_list, node) {
443397 uint32_t src_mod_inst_id;
444398
445399 src_mod_inst_id = module->src_mod_inst_id;
@@ -462,7 +416,7 @@ static void audioreach_populate_graph(struct apm_graph_open_params *open, · 16 unmodified lines
462416 }
463417 }
464418
465−void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct list_head *sg_list, int graph_id)
419+void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct audioreach_graph_info *info)
466420 {
467421 int payload_size, sg_sz, cont_sz, ml_sz, mp_sz, mc_sz;
468422 struct apm_module_param_data *param_data;
@@ -475,6 +429,7 @@ void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct list_head *sg_list, i · 6 unmodified lines
475429 struct audioreach_module *module;
476430 struct audioreach_sub_graph *sgs;
477431 struct apm_mod_list_obj *mlobj;
432+ struct list_head *sg_list;
478433 int num_modules_per_list;
479434 int num_connections = 0;
480435 int num_containers = 0;
@@ -484,12 +439,19 @@ void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct list_head *sg_list, i · 3 unmodified lines
484439 struct gpr_pkt *pkt;
485440 void *p;
486441
442+ sg_list = &info->sg_list;
443+ ml_sz = 0;
444+
445+ /* add FE-BE connections */
446+ if (info->dst_mod_inst_id && info->src_mod_inst_id)
447+ num_connections++;
448+
487449 list_for_each_entry(sgs, sg_list, node) {
488450 num_sub_graphs++;
489451 list_for_each_entry(container, &sgs->container_list, node) {
490452 num_containers++;
491453 num_modules += container->num_modules;
492− list_for_each_container_module(module, container) {
454+ list_for_each_entry(module, &container->modules_list, node) {
493455 if (module->src_mod_inst_id)
494456 num_connections++;
495457 }
@@ -557,7 +519,7 @@ void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct list_head *sg_list, i · 61 unmodified lines
557519 params.mod_conn_list_data->num_connections = num_connections;
558520 p += mc_sz;
559521
560− audioreach_populate_graph(&params, sg_list, num_sub_graphs);
522+ audioreach_populate_graph(apm, info, &params, sg_list, num_sub_graphs);
561523
562524 return pkt;
563525 }
sound/soc/qcom/qdsp6/audioreach.h+7−13
@@ -595,6 +595,11 @@ struct audioreach_graph_info { · 594 unmodified lines
595595 int id;
596596 uint32_t num_sub_graphs;
597597 struct list_head sg_list;
598+ /* DPCM connection from FE Graph to BE graph */
599+ uint32_t src_mod_inst_id;
600+ uint32_t src_mod_op_port_id;
601+ uint32_t dst_mod_inst_id;
602+ uint32_t dst_mod_ip_port_id;
598603 };
599604
600605 struct audioreach_sub_graph {
@@ -693,9 +698,8 @@ void *audioreach_alloc_apm_pkt(int pkt_size, uint32_t opcode, uint32_t token, · 92 unmodified lines
693698 void *audioreach_alloc_pkt(int payload_size, uint32_t opcode,
694699 uint32_t token, uint32_t src_port,
695700 uint32_t dest_port);
696−void *audioreach_alloc_graph_pkt(struct q6apm *apm,
697− struct list_head *sg_list,
698− int graph_id);
701+void *audioreach_alloc_graph_pkt(struct q6apm *apm, struct audioreach_graph_info
702+ *info);
699703 /* Topology specific */
700704 int audioreach_tplg_init(struct snd_soc_component *component);
701705
@@ -716,14 +720,4 @@ int audioreach_set_media_format(struct q6apm_graph *graph, · 14 unmodified lines
716720 int audioreach_shared_memory_send_eos(struct q6apm_graph *graph);
717721 int audioreach_gain_set_vol_ctrl(struct q6apm *apm,
718722 struct audioreach_module *module, int vol);
719−struct audioreach_module *audioreach_get_container_last_module(
720− struct audioreach_container *container);
721−struct audioreach_module *audioreach_get_container_first_module(
722− struct audioreach_container *container);
723−struct audioreach_module *audioreach_get_container_next_module(
724− struct audioreach_container *container,
725− struct audioreach_module *module);
726−#define list_for_each_container_module(mod, cont) \
727− for (mod = audioreach_get_container_first_module(cont); mod != NULL; \
728− mod = audioreach_get_container_next_module(cont, mod))
729723 #endif /* __AUDIOREACH_H__ */
sound/soc/qcom/qdsp6/q6apm.c+1−82
@@ -63,7 +63,7 @@ static struct audioreach_graph *q6apm_get_audioreach_graph(struct q6apm *apm, ui · 62 unmodified lines
6363 graph->info = info;
6464 graph->id = graph_id;
6565
66− graph->graph = audioreach_alloc_graph_pkt(apm, &info->sg_list, graph_id);
66+ graph->graph = audioreach_alloc_graph_pkt(apm, info);
6767 if (IS_ERR(graph->graph)) {
6868 void *err = graph->graph;
6969
@@ -178,87 +178,6 @@ static struct audioreach_module *__q6apm_find_module_by_mid(struct q6apm *apm, · 108 unmodified lines
178178 return NULL;
179179 }
180180
181−static struct audioreach_module *q6apm_graph_get_last_module(struct q6apm *apm, u32 sgid)
182−{
183− struct audioreach_container *container;
184− struct audioreach_module *module;
185− struct audioreach_sub_graph *sg;
186−
187− mutex_lock(&apm->lock);
188− sg = idr_find(&apm->sub_graphs_idr, sgid);
189− mutex_unlock(&apm->lock);
190− if (!sg)
191− return NULL;
192−
193− container = list_last_entry(&sg->container_list, struct audioreach_container, node);
194− module = audioreach_get_container_last_module(container);
195−
196− return module;
197−}
198−
199−static struct audioreach_module *q6apm_graph_get_first_module(struct q6apm *apm, u32 sgid)
200−{
201− struct audioreach_container *container;
202− struct audioreach_module *module;
203− struct audioreach_sub_graph *sg;
204−
205− mutex_lock(&apm->lock);
206− sg = idr_find(&apm->sub_graphs_idr, sgid);
207− mutex_unlock(&apm->lock);
208− if (!sg)
209− return NULL;
210−
211− container = list_first_entry(&sg->container_list, struct audioreach_container, node);
212− module = audioreach_get_container_first_module(container);
213−
214− return module;
215−}
216−
217−bool q6apm_is_sub_graphs_connected(struct q6apm *apm, u32 src_sgid, u32 dst_sgid)
218−{
219− struct audioreach_module *module;
220− u32 iid;
221−
222− module = q6apm_graph_get_last_module(apm, src_sgid);
223− if (!module)
224− return false;
225−
226− iid = module->instance_id;
227− module = q6apm_graph_get_first_module(apm, dst_sgid);
228− if (!module)
229− return false;
230−
231− if (module->src_mod_inst_id == iid)
232− return true;
233−
234− return false;
235−}
236−
237−int q6apm_connect_sub_graphs(struct q6apm *apm, u32 src_sgid, u32 dst_sgid, bool connect)
238−{
239− struct audioreach_module *module;
240− u32 iid;
241−
242− if (connect) {
243− module = q6apm_graph_get_last_module(apm, src_sgid);
244− if (!module)
245− return -ENODEV;
246−
247− iid = module->instance_id;
248− } else {
249− iid = 0;
250− }
251−
252− module = q6apm_graph_get_first_module(apm, dst_sgid);
253− if (!module)
254− return -ENODEV;
255−
256− /* set src module in dst subgraph first module */
257− module->src_mod_inst_id = iid;
258−
259− return 0;
260−}
261−
262181 int q6apm_graph_media_format_shmem(struct q6apm_graph *graph,
263182 struct audioreach_module_config *cfg)
264183 {
sound/soc/qcom/qdsp6/q6apm.h+0−5
@@ -142,12 +142,7 @@ int q6apm_send_cmd_sync(struct q6apm *apm, struct gpr_pkt *pkt, · 141 unmodified lines
142142 /* Callback for graph specific */
143143 struct audioreach_module *q6apm_find_module_by_mid(struct q6apm_graph *graph,
144144 uint32_t mid);
145−
146145 void q6apm_set_fe_dai_ops(struct snd_soc_dai_driver *dai_drv);
147−int q6apm_connect_sub_graphs(struct q6apm *apm, u32 src_sgid, u32 dst_sgid,
148− bool connect);
149−bool q6apm_is_sub_graphs_connected(struct q6apm *apm, u32 src_sgid,
150− u32 dst_sgid);
151146 int q6apm_graph_get_rx_shmem_module_iid(struct q6apm_graph *graph);
152147
153148 #endif /* __APM_GRAPH_ */
sound/soc/qcom/qdsp6/topology.c+94−11
@@ -872,7 +872,21 @@ static int audioreach_widget_unload(struct snd_soc_component *scomp, · 871 unmodified lines
872872 return 0;
873873 }
874874
875−static struct audioreach_module *audioreach_find_widget(struct snd_soc_component *comp,
875+static struct snd_ar_control *audioreach_find_widget(struct snd_soc_component *comp,
876+ const char *name)
877+{
878+ struct q6apm *apm = dev_get_drvdata(comp->dev);
879+ struct snd_ar_control *control;
880+
881+ list_for_each_entry(control, &apm->widget_list, node) {
882+ if (control->w && !strcmp(name, control->w->name))
883+ return control;
884+ }
885+
886+ return NULL;
887+}
888+
889+static struct audioreach_module *audioreach_find_module(struct snd_soc_component *comp,
876890 const char *name)
877891 {
878892 struct q6apm *apm = dev_get_drvdata(comp->dev);
@@ -890,14 +904,41 @@ static struct audioreach_module *audioreach_find_widget(struct snd_soc_component · 11 unmodified lines
890904 static int audioreach_route_load(struct snd_soc_component *scomp, int index,
891905 struct snd_soc_dapm_route *route)
892906 {
893− struct audioreach_module *src, *sink;
894−
895− src = audioreach_find_widget(scomp, route->source);
896− sink = audioreach_find_widget(scomp, route->sink);
907+ struct audioreach_module *src_module, *sink_module;
908+ struct snd_ar_control *control;
909+ struct snd_soc_dapm_widget *w;
910+ int i;
911+
912+ /* check if these are actual modules */
913+ src_module = audioreach_find_module(scomp, route->source);
914+ sink_module = audioreach_find_module(scomp, route->sink);
915+
916+ if (sink_module && !src_module) {
917+ control = audioreach_find_widget(scomp, route->source);
918+ if (control)
919+ control->module_instance_id = sink_module->instance_id;
920+
921+ } else if (!sink_module && src_module && route->control) {
922+ /* check if this is a virtual mixer */
923+ control = audioreach_find_widget(scomp, route->sink);
924+ if (!control || !control->w)
925+ return 0;
926+
927+ w = control->w;
928+
929+ for (i = 0; i < w->num_kcontrols; i++) {
930+ if (!strcmp(route->control, w->kcontrol_news[i].name)) {
931+ struct soc_mixer_control *sm;
932+ struct snd_soc_dobj *dobj;
933+ struct snd_ar_control *scontrol;
934+
935+ sm = (struct soc_mixer_control *)w->kcontrol_news[i].private_value;
936+ dobj = &sm->dobj;
937+ scontrol = dobj->private;
938+ scontrol->module_instance_id = src_module->instance_id;
939+ }
940+ }
897941
898− if (src && sink) {
899− src->dst_mod_inst_id = sink->instance_id;
900− sink->src_mod_inst_id = src->instance_id;
901942 }
902943
903944 return 0;
@@ -928,6 +969,48 @@ static int audioreach_link_load(struct snd_soc_component *component, int index, · 24 unmodified lines
928969 return 0;
929970 }
930971
972+static void audioreach_connect_sub_graphs(struct q6apm *apm,
973+ struct snd_ar_control *m1,
974+ struct snd_ar_control *m2,
975+ bool connect)
976+{
977+ struct audioreach_graph_info *info;
978+
979+ mutex_lock(&apm->lock);
980+ info = idr_find(&apm->graph_info_idr, m2->graph_id);
981+ mutex_unlock(&apm->lock);
982+
983+ if (connect) {
984+ info->src_mod_inst_id = m1->module_instance_id;
985+ info->src_mod_op_port_id = 1;
986+ info->dst_mod_inst_id = m2->module_instance_id;
987+ info->dst_mod_ip_port_id = 2;
988+
989+ } else {
990+ info->src_mod_inst_id = 0;
991+ info->src_mod_op_port_id = 0;
992+ info->dst_mod_inst_id = 0;
993+ info->dst_mod_ip_port_id = 0;
994+ }
995+}
996+
997+static bool audioreach_is_vmixer_connected(struct q6apm *apm,
998+ struct snd_ar_control *m1,
999+ struct snd_ar_control *m2)
1000+{
1001+ struct audioreach_graph_info *info;
1002+
1003+ mutex_lock(&apm->lock);
1004+ info = idr_find(&apm->graph_info_idr, m2->graph_id);
1005+ mutex_unlock(&apm->lock);
1006+
1007+ if (info->dst_mod_inst_id == m2->module_instance_id &&
1008+ info->src_mod_inst_id == m1->module_instance_id)
1009+ return true;
1010+
1011+ return false;
1012+}
1013+
9311014 static int audioreach_get_audio_mixer(struct snd_kcontrol *kcontrol,
9321015 struct snd_ctl_elem_value *ucontrol)
9331016 {
@@ -940,7 +1023,7 @@ static int audioreach_get_audio_mixer(struct snd_kcontrol *kcontrol, · 6 unmodified lines
9401023 struct q6apm *data = dev_get_drvdata(c->dev);
9411024 bool connected;
9421025
943− connected = q6apm_is_sub_graphs_connected(data, scontrol->sgid, dapm_scontrol->sgid);
1026+ connected = audioreach_is_vmixer_connected(data, scontrol, dapm_scontrol);
9441027 if (connected)
9451028 ucontrol->value.integer.value[0] = 1;
9461029 else
@@ -961,10 +1044,10 @@ static int audioreach_put_audio_mixer(struct snd_kcontrol *kcontrol, · 14 unmodified lines
9611044 struct q6apm *data = dev_get_drvdata(c->dev);
9621045
9631046 if (ucontrol->value.integer.value[0]) {
964− q6apm_connect_sub_graphs(data, scontrol->sgid, dapm_scontrol->sgid, true);
1047+ audioreach_connect_sub_graphs(data, scontrol, dapm_scontrol, true);
9651048 snd_soc_dapm_mixer_update_power(dapm, kcontrol, 1, NULL);
9661049 } else {
967− q6apm_connect_sub_graphs(data, scontrol->sgid, dapm_scontrol->sgid, false);
1050+ audioreach_connect_sub_graphs(data, scontrol, dapm_scontrol, false);
9681051 snd_soc_dapm_mixer_update_power(dapm, kcontrol, 0, NULL);
9691052 }
9701053 return 0;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t