OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

drivers: Intel: SSP: fix update of DAI config in prepared state 

The checks added in commit fc73578be7 ("drivers: Intel: SSP: ignore
config when SSP is already configured") also filter out cases where the
SSP parameters actually are modified in prepare state. This will happen
e.g. with a topology that has multiple configs for SSP and uses static
topology loading.

Modify the checks such that reconfiguration is done if:
 - the config is actually modified,
 - early MCLK/BCLK is not running.

BugLink: https://github.com/thesofproject/sof/issues/5375
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
This commit is contained in:
Kai Vehmanen 2022-02-16 13:18:38 +02:00 committed by Liam Girdwood
parent 74fcc02ff5
commit bcc789f981
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/drivers/intel/ssp/ssp.c
View File

@ -246,8 +246,17 @@ static int ssp_set_config_tplg(struct dai *dai, struct ipc_config_dai *common_co
/* ignore config if SSP is already configured */
if (ssp->state[DAI_DIR_PLAYBACK] > COMP_STATE_READY ||
ssp->state[DAI_DIR_CAPTURE] > COMP_STATE_READY) {
dai_info(dai, "ssp_set_config(): Already configured. Ignore config");
goto clk;
if (!memcmp(&ssp->params, &config->ssp, sizeof(ssp->params))) {
dai_info(dai, "ssp_set_config(): Already configured. Ignore config");
goto clk;
}
if (ssp->clk_active & (SSP_CLK_MCLK_ACTIVE | SSP_CLK_BCLK_ACTIVE)) {
dai_warn(dai, "ssp_set_config(): SSP active, cannot change config");
goto clk;
}
/* safe to proceed and change HW config */
}
dai_info(dai, "ssp_set_config(), config->format = 0x%4x",