Commit c93c604e authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Takashi Iwai
Browse files

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: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Acked-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20231117120610.1755254-16-cezary.rojewski@intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent dfd6ba68

sound/soc/intel/avs/pcm.c

+15 −5
Original line number Diff line number Diff line
@@ -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,

	},

};

sound/soc/intel/avs/topology.c

+12 −1
Original line number Diff line number Diff line
@@ -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;