topology: pre-process-object: add support for updating automatic attributes

Classes definitions in Topology2.0 can have attributes
qualified with the "automatic" constraint. Values for
these attributes will be calculated by the compiler.
This patch provides a generic method for defining automatic
attributes computation logic for different classes.

To update automatic attributes for a class, add an item
in object_build_map with auto_attr_updater defined, and then
add updating logic in the custom auto_attr_updater function.

Signed-off-by: Chao Song <chao.song@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/topology/pre-process-object.c b/topology/pre-process-object.c
index f479aa48a8be5fc113b86cc2553d7cc344bae45b..a976cd3956da9e54728e14908ca8e533bb240bb9 100644 (file)
--- a/topology/pre-process-object.c
+++ b/topology/pre-process-object.c
@@ -923,28 +923,33 @@ const struct config_template_items data_config = {
        .string_config_ids = {"bytes"}
 };
 
+/*
+ * Items without class name should be placed lower than those with one,
+ * because they are much more generic.
+ */
 const struct build_function_map object_build_map[] = {
-       {"Base", "manifest", "SectionManifest", &tplg_build_generic_object, NULL},
-       {"Base", "data", "SectionData", &tplg_build_data_object, &data_config},
-       {"Base", "tlv", "SectionTLV", &tplg_build_tlv_object, NULL},
-       {"Base", "scale", "scale", &tplg_build_scale_object, &scale_config},
-       {"Base", "ops", "ops" ,&tplg_build_ops_object, &ops_config},
-       {"Base", "extops", "extops" ,&tplg_build_ops_object, &ops_config},
-       {"Base", "channel", "channel", &tplg_build_channel_object, &channel_config},
-       {"Base", "VendorToken", "SectionVendorTokens", &tplg_build_vendor_token_object, NULL},
-       {"Base", "hw_config", "SectionHWConfig", &tplg_build_hw_cfg_object,
+       {"Base", "manifest", "SectionManifest", &tplg_build_generic_object, NULL, NULL},
+       {"Base", "data", "SectionData", &tplg_build_data_object, NULL, &data_config},
+       {"Base", "tlv", "SectionTLV", &tplg_build_tlv_object, NULL, NULL},
+       {"Base", "scale", "scale", &tplg_build_scale_object, NULL, &scale_config},
+       {"Base", "ops", "ops" ,&tplg_build_ops_object, NULL, &ops_config},
+       {"Base", "extops", "extops" ,&tplg_build_ops_object, NULL, &ops_config},
+       {"Base", "channel", "channel", &tplg_build_channel_object, NULL, &channel_config},
+       {"Base", "VendorToken", "SectionVendorTokens", &tplg_build_vendor_token_object,
+        NULL, NULL},
+       {"Base", "hw_config", "SectionHWConfig", &tplg_build_hw_cfg_object, NULL,
         &hwcfg_config},
-       {"Base", "fe_dai", "dai", &tplg_build_fe_dai_object, &fe_dai_config},
-       {"Base", "route", "SectionGraph", &tplg_build_dapm_route_object, NULL},
-       {"Widget", "", "SectionWidget", &tplg_build_generic_object, &widget_config},
-       {"Control", "mixer", "SectionControlMixer", &tplg_build_mixer_control,
+       {"Base", "fe_dai", "dai", &tplg_build_fe_dai_object, NULL, &fe_dai_config},
+       {"Base", "route", "SectionGraph", &tplg_build_dapm_route_object, NULL, NULL},
+       {"Widget", "", "SectionWidget", &tplg_build_generic_object, NULL, &widget_config},
+       {"Control", "mixer", "SectionControlMixer", &tplg_build_mixer_control, NULL,
         &mixer_control_config},
-       {"Control", "bytes", "SectionControlBytes", &tplg_build_bytes_control,
+       {"Control", "bytes", "SectionControlBytes", &tplg_build_bytes_control, NULL,
         &bytes_control_config},
-       {"Dai", "", "SectionBE", &tplg_build_generic_object, &be_dai_config},
-       {"PCM", "pcm", "SectionPCM", &tplg_build_generic_object, &pcm_config},
+       {"Dai", "", "SectionBE", &tplg_build_generic_object, NULL, &be_dai_config},
+       {"PCM", "pcm", "SectionPCM", &tplg_build_generic_object, NULL, &pcm_config},
        {"PCM", "pcm_caps", "SectionPCMCapabilities", &tplg_build_pcm_caps_object,
-        &pcm_caps_config},
+        NULL, &pcm_caps_config},
 };
 
 static const struct build_function_map *tplg_object_get_map(struct tplg_pre_processor *tplg_pp,
@@ -966,7 +971,8 @@ static const struct build_function_map *tplg_object_get_map(struct tplg_pre_proc
 
        for (i = 0; i < ARRAY_SIZE(object_build_map); i++) {
                if (!strcmp(class_type, "Widget") &&
-                   !strcmp(object_build_map[i].class_type, "Widget"))
+                   !strcmp(object_build_map[i].class_type, "Widget") &&
+                       !strcmp(object_build_map[i].class_name, ""))
                        return &object_build_map[i];
 
                if (!strcmp(class_type, "Dai") &&
@@ -1414,6 +1420,7 @@ static int tplg_build_object(struct tplg_pre_processor *tplg_pp, snd_config_t *n
        snd_config_t *obj_local, *class_cfg;
        const struct build_function_map *map;
        build_func builder;
+       update_auto_attr_func auto_attr_updater;
        const char *id, *class_id;
        int ret;
 
@@ -1457,6 +1464,16 @@ static int tplg_build_object(struct tplg_pre_processor *tplg_pp, snd_config_t *n
        if (!map)
                goto child;
 
+       /* update automatic attribute for current object */
+       auto_attr_updater = map->auto_attr_updater;
+       if(auto_attr_updater) {
+               ret = auto_attr_updater(tplg_pp, obj_local, parent);
+               if (ret < 0) {
+                       SNDERR("Failed to update automatic attributes for %s\n", id);
+                       return ret;
+               }
+       }
+
        /* build the object and save the sections to the output config */
        builder = map->builder;
        ret = builder(tplg_pp, new_obj, parent);

diff --git a/topology/pre-processor.h b/topology/pre-processor.h
index 3900372124398eb878573a16fce6feb1546445ae..fce7b477b755175249f1c7206080f450f7ae1ec2 100644 (file)
--- a/topology/pre-processor.h
+++ b/topology/pre-processor.h
@@ -35,11 +35,15 @@ struct config_template_items {
 typedef int (*build_func)(struct tplg_pre_processor *tplg_pp, snd_config_t *obj,
                          snd_config_t *parent);
 
+typedef int (*update_auto_attr_func)(struct tplg_pre_processor *tplg_pp,
+                         snd_config_t *obj, snd_config_t *parent);
+
 struct build_function_map {
        char *class_type;
        char *class_name;
        char *section_name;
        build_func builder;
+       update_auto_attr_func auto_attr_updater;
        const struct config_template_items *template_items;
 };