shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 02:50:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rockchip: i2s-tdm: Check stream is valid

Browse Source 
Do nothing when stream is invalid, especially for
HDMI-TX-DLP with multi-dais situation.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ieb056147875ca2707b85f8d9962a5593e66abb21
This commit is contained in:
Sugar Zhang
2024-07-09 23:10:40 +08:00
parent 602e6eab74
commit 9b72f7d254
1 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sound/soc/rockchip/rockchip_i2s_tdm.c
View File

@@ -181,6 +181,25 @@ static struct i2s_of_quirks {
},
};
static bool rockchip_i2s_tdm_stream_valid(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_dai_get_drvdata(dai);
if (!substream)
return false;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
i2s_tdm->has_playback)
return true;
if (substream->stream == SNDRV_PCM_STREAM_CAPTURE &&
i2s_tdm->has_capture)
return true;
return false;
}
static int to_ch_num(unsigned int val)
{
switch (val) {
@@ -1843,6 +1862,9 @@ static int rockchip_i2s_tdm_hw_params(struct snd_pcm_substream *substream,
unsigned int val = 0;
unsigned int mclk_rate, bclk_rate, lrck_rate, div_bclk = 4, div_lrck = 64;
if (!rockchip_i2s_tdm_stream_valid(substream, dai))
return 0;
#ifdef CONFIG_SND_SOC_ROCKCHIP_I2S_TDM_MULTI_LANES
if (i2s_tdm->is_tdm_multi_lanes)
rockchip_i2s_tdm_multi_lanes_set_clk(substream, params, dai);
@@ -1908,6 +1930,9 @@ static int rockchip_i2s_tdm_hw_params(struct snd_pcm_substream *substream,
static int rockchip_i2s_tdm_hw_free(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
if (!rockchip_i2s_tdm_stream_valid(substream, dai))
return 0;
rockchip_utils_put_performance(substream, dai);
return 0;
@@ -1918,6 +1943,9 @@ static int rockchip_i2s_tdm_trigger(struct snd_pcm_substream *substream,
{
struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai);
if (!rockchip_i2s_tdm_stream_valid(substream, dai))
return 0;
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_RESUME:
@@ -2307,6 +2335,9 @@ static int rockchip_i2s_tdm_startup(struct snd_pcm_substream *substream,
struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_dai_get_drvdata(dai);
int stream = substream->stream;
if (!rockchip_i2s_tdm_stream_valid(substream, dai))
return 0;
if (i2s_tdm->substreams[stream])
return -EBUSY;
@@ -2323,6 +2354,9 @@ static void rockchip_i2s_tdm_shutdown(struct snd_pcm_substream *substream,
{
struct rk_i2s_tdm_dev *i2s_tdm = snd_soc_dai_get_drvdata(dai);
if (!rockchip_i2s_tdm_stream_valid(substream, dai))
return;
i2s_tdm->substreams[substream->stream] = NULL;
}