ALSA: hda/tas2781: Enable init_profile_id for device initialization

commit 7ddb711b6e0d33e0a673b49f69dff0d950ed60b9 upstream.

Optimize the time consumption of profile switching, init_profile saves
the common settings of different profiles, such as the dsp coefficients,
etc, which can greatly reduce the profile switching time comsumption and
remove the repetitive settings.

Fixes: e83dcd139e77 ("ASoC: tas2781: Add keyword "init" in profile section")
Signed-off-by: Shenghao Ding <shenghao-ding@ti.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c b/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c
index b5b7a1e82b75e6d85df8cbe41026a3a8d86a63cc..32f16a8f9df3792270047d1149ce493768d73a76 100644 (file)
--- a/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c
+++ b/sound/hda/codecs/side-codecs/tas2781_hda_i2c.c
@@ -472,6 +472,12 @@ static void tasdevice_dspfw_init(void *context)
        if (tas_priv->fmw->nr_configurations > 0)
                tas_priv->cur_conf = 0;
 
+       /* Init common setting for different audio profiles */
+       if (tas_priv->rcabin.init_profile_id >= 0)
+               tasdevice_select_cfg_blk(tas_priv,
+                       tas_priv->rcabin.init_profile_id,
+                       TASDEVICE_BIN_BLK_PRE_POWER_UP);
+
        /* If calibrated data occurs error, dsp will still works with default
         * calibrated data inside algo.
         */
@@ -760,6 +766,12 @@ static int tas2781_system_resume(struct device *dev)
        tasdevice_reset(tas_hda->priv);
        tasdevice_prmg_load(tas_hda->priv, tas_hda->priv->cur_prog);
 
+       /* Init common setting for different audio profiles */
+       if (tas_hda->priv->rcabin.init_profile_id >= 0)
+               tasdevice_select_cfg_blk(tas_hda->priv,
+                       tas_hda->priv->rcabin.init_profile_id,
+                       TASDEVICE_BIN_BLK_PRE_POWER_UP);
+
        if (tas_hda->priv->playback_started)
                tasdevice_tuning_switch(tas_hda->priv, 0);