ASoC: Intel: avs: Kill S24_LE format

Eliminate all occurrences of S24_LE within PCM code, both HOST and LINK
side. Replace those with MSBITS subformats to allow for granular
selection when S32_LE is the format of choice.

Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Acked-by: Jaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20231117120610.1755254-16-cezary.rojewski@intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
index f586a804099a0548667ee673d0fef42c7ad26d0b..b6c48f88ca85baa84a68605a50632f9bbbf890fb 100644 (file)
--- a/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@ -1073,8 +1073,10 @@ static const struct snd_pcm_hardware avs_pcm_hardware = {
                                  SNDRV_PCM_INFO_RESUME |
                                  SNDRV_PCM_INFO_NO_PERIOD_WAKEUP,
        .formats                = SNDRV_PCM_FMTBIT_S16_LE |
-                                 SNDRV_PCM_FMTBIT_S24_LE |
                                  SNDRV_PCM_FMTBIT_S32_LE,
+       .subformats             = SNDRV_PCM_SUBFMTBIT_MSBITS_20 |
+                                 SNDRV_PCM_SUBFMTBIT_MSBITS_24 |
+                                 SNDRV_PCM_SUBFMTBIT_MSBITS_MAX,
        .buffer_bytes_max       = AZX_MAX_BUF_SIZE,
        .period_bytes_min       = 128,
        .period_bytes_max       = AZX_MAX_BUF_SIZE / 2,
@@ -1225,8 +1227,10 @@ static const struct snd_soc_dai_driver i2s_dai_template = {
                .rates          = SNDRV_PCM_RATE_8000_192000 |
                                  SNDRV_PCM_RATE_KNOT,
                .formats        = SNDRV_PCM_FMTBIT_S16_LE |
-                                 SNDRV_PCM_FMTBIT_S24_LE |
                                  SNDRV_PCM_FMTBIT_S32_LE,
+               .subformats     = SNDRV_PCM_SUBFMTBIT_MSBITS_20 |
+                                 SNDRV_PCM_SUBFMTBIT_MSBITS_24 |
+                                 SNDRV_PCM_SUBFMTBIT_MSBITS_MAX,
        },
        .capture = {
                .channels_min   = 1,
@@ -1234,8 +1238,10 @@ static const struct snd_soc_dai_driver i2s_dai_template = {
                .rates          = SNDRV_PCM_RATE_8000_192000 |
                                  SNDRV_PCM_RATE_KNOT,
                .formats        = SNDRV_PCM_FMTBIT_S16_LE |
-                                 SNDRV_PCM_FMTBIT_S24_LE |
                                  SNDRV_PCM_FMTBIT_S32_LE,
+               .subformats     = SNDRV_PCM_SUBFMTBIT_MSBITS_20 |
+                                 SNDRV_PCM_SUBFMTBIT_MSBITS_24 |
+                                 SNDRV_PCM_SUBFMTBIT_MSBITS_MAX,
        },
 };
 
@@ -1310,16 +1316,20 @@ static const struct snd_soc_dai_driver hda_cpu_dai = {
                .channels_max   = 8,
                .rates          = SNDRV_PCM_RATE_8000_192000,
                .formats        = SNDRV_PCM_FMTBIT_S16_LE |
-                                 SNDRV_PCM_FMTBIT_S24_LE |
                                  SNDRV_PCM_FMTBIT_S32_LE,
+               .subformats     = SNDRV_PCM_SUBFMTBIT_MSBITS_20 |
+                                 SNDRV_PCM_SUBFMTBIT_MSBITS_24 |
+                                 SNDRV_PCM_SUBFMTBIT_MSBITS_MAX,
        },
        .capture = {
                .channels_min   = 1,
                .channels_max   = 8,
                .rates          = SNDRV_PCM_RATE_8000_192000,
                .formats        = SNDRV_PCM_FMTBIT_S16_LE |
-                                 SNDRV_PCM_FMTBIT_S24_LE |
                                  SNDRV_PCM_FMTBIT_S32_LE,
+               .subformats     = SNDRV_PCM_SUBFMTBIT_MSBITS_20 |
+                                 SNDRV_PCM_SUBFMTBIT_MSBITS_24 |
+                                 SNDRV_PCM_SUBFMTBIT_MSBITS_MAX,
        },
 };
 

diff --git a/sound/soc/intel/avs/topology.c b/sound/soc/intel/avs/topology.c
index c74e9d622e4c67a3cd708b2f99f0cc25d197cd50..778236d3fd2806912120ab0eb953f96a6c79c90b 100644 (file)
--- a/sound/soc/intel/avs/topology.c
+++ b/sound/soc/intel/avs/topology.c
@@ -1514,8 +1514,16 @@ static int avs_dai_load(struct snd_soc_component *comp, int index,
                        struct snd_soc_dai_driver *dai_drv, struct snd_soc_tplg_pcm *pcm,
                        struct snd_soc_dai *dai)
 {
-       if (pcm)
+       u32 fe_subformats = SNDRV_PCM_SUBFMTBIT_MSBITS_20 |
+                           SNDRV_PCM_SUBFMTBIT_MSBITS_24 |
+                           SNDRV_PCM_SUBFMTBIT_MSBITS_MAX;
+
+       if (pcm) {
                dai_drv->ops = &avs_dai_fe_ops;
+               dai_drv->capture.subformats = fe_subformats;
+               dai_drv->playback.subformats = fe_subformats;
+       }
+
        return 0;
 }
 
@@ -1534,6 +1542,9 @@ static int avs_link_load(struct snd_soc_component *comp, int index, struct snd_s
                /* Open LINK (BE) pipes last and close them first to prevent xruns. */
                link->trigger[0] = SND_SOC_DPCM_TRIGGER_PRE;
                link->trigger[1] = SND_SOC_DPCM_TRIGGER_PRE;
+       } else {
+               /* Do not ignore codec capabilities. */
+               link->dpcm_merged_format = 1;
        }
 
        return 0;