From 2b50b594dcbf69f8dcc6e8cf673748f7063c3c17 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 13 Dec 2019 21:56:58 +0100
Subject: [PATCH 27/30] topology: dapm - merge identical index blocks like for
 other elems

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 src/topology/dapm.c       | 14 +++++++-------
 src/topology/elem.c       |  2 +-
 src/topology/tplg_local.h |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/topology/dapm.c b/src/topology/dapm.c
index cd80a4c03d92..ce46913192df 100644
--- a/src/topology/dapm.c
+++ b/src/topology/dapm.c
@@ -313,7 +313,7 @@ int tplg_build_routes(snd_tplg_t *tplg)
 	return 0;
 }
 
-struct tplg_elem *tplg_elem_new_route(snd_tplg_t *tplg)
+struct tplg_elem *tplg_elem_new_route(snd_tplg_t *tplg, int index)
 {
 	struct tplg_elem *elem;
 	struct snd_soc_tplg_dapm_graph_elem *line;
@@ -322,7 +322,8 @@ struct tplg_elem *tplg_elem_new_route(snd_tplg_t *tplg)
 	if (!elem)
 		return NULL;
 
-	list_add_tail(&elem->list, &tplg->route_list);
+	elem->index = index;
+	tplg_elem_insert(elem, &tplg->route_list);
 	strcpy(elem->id, "line");
 	elem->type = SND_TPLG_TYPE_DAPM_GRAPH;
 	elem->size = sizeof(*line);
@@ -403,10 +404,9 @@ static int tplg_parse_routes(snd_tplg_t *tplg, snd_config_t *cfg, int index)
 		if (snd_config_get_string(n, &val) < 0)
 			continue;
 
-		elem = tplg_elem_new_route(tplg);
+		elem = tplg_elem_new_route(tplg, index);
 		if (!elem)
 			return -ENOMEM;
-		elem->index = index;
 		line = elem->route;
 
 		err = tplg_parse_line(val, line);
@@ -628,7 +628,7 @@ int tplg_parse_dapm_widget(snd_tplg_t *tplg,
 	return 0;
 }
 
-int tplg_add_route(snd_tplg_t *tplg, struct snd_tplg_graph_elem *t)
+int tplg_add_route(snd_tplg_t *tplg, struct snd_tplg_graph_elem *t, int index)
 {
 	struct tplg_elem *elem;
 	struct snd_soc_tplg_dapm_graph_elem *line;
@@ -636,7 +636,7 @@ int tplg_add_route(snd_tplg_t *tplg, struct snd_tplg_graph_elem *t)
 	if (!t->src || !t->sink)
 		return -EINVAL;
 
-	elem = tplg_elem_new_route(tplg);
+	elem = tplg_elem_new_route(tplg, index);
 	if (!elem)
 		return -ENOMEM;
 
@@ -656,7 +656,7 @@ int tplg_add_graph_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t)
 	int i, ret;
 
 	for (i = 0; i < gt->count; i++) {
-		ret = tplg_add_route(tplg, gt->elem + i);
+		ret = tplg_add_route(tplg, gt->elem + i, t->index);
 		if (ret < 0)
 			return ret;
 	}
diff --git a/src/topology/elem.c b/src/topology/elem.c
index 2066fad83774..140cdd327994 100644
--- a/src/topology/elem.c
+++ b/src/topology/elem.c
@@ -132,7 +132,7 @@ struct tplg_elem *tplg_elem_lookup(struct list_head *base, const char* id,
 }
 
 /* insert a new element into list in the ascending order of index value */
-static void tplg_elem_insert(struct tplg_elem *elem_p, struct list_head *list)
+void tplg_elem_insert(struct tplg_elem *elem_p, struct list_head *list)
 {
 	struct list_head *pos, *p = &(elem_p->list);
 	struct tplg_elem *elem;
diff --git a/src/topology/tplg_local.h b/src/topology/tplg_local.h
index 7b8abcdefbcf..11efce6d580c 100644
--- a/src/topology/tplg_local.h
+++ b/src/topology/tplg_local.h
@@ -273,6 +273,7 @@ int tplg_ref_add_elem(struct tplg_elem *elem, struct tplg_elem *elem_ref);
 struct tplg_elem *tplg_elem_new(void);
 void tplg_elem_free(struct tplg_elem *elem);
 void tplg_elem_free_list(struct list_head *base);
+void tplg_elem_insert(struct tplg_elem *elem_p, struct list_head *list);
 struct tplg_elem *tplg_elem_lookup(struct list_head *base,
 				const char* id,
 				unsigned int type,
-- 
2.16.4