github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: rockchip: vad: refine buffer time

Browse Source 
This patch fix hw_params fail if the buffer time is too large,
anyway, we use the smaller one between vad->buffer_time and
the max buffer time.

Change-Id: I111bb835f281d717d0b5a4be7bc6b321387f31d5
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
This commit is contained in:
Sugar Zhang 2018-08-22 19:53:18 +08:00 committed by Tao Huang
parent a990c87249
commit 93787d1406
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/rockchip/rockchip_vad.c
View File

@ -490,7 +490,7 @@ static int rockchip_vad_hw_params(struct snd_pcm_substream *substream,
{
struct snd_soc_codec *codec = dai->codec;
struct rockchip_vad *vad = snd_soc_codec_get_drvdata(codec);
unsigned int val = 0, mask = 0, frame_bytes;
unsigned int val = 0, mask = 0, frame_bytes, buf_time;
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
return 0;
@ -535,7 +535,15 @@ static int rockchip_vad_hw_params(struct snd_pcm_substream *substream,
if (vad->buffer_time) {
frame_bytes = snd_pcm_format_size(params_format(params),
params_channels(params));
val = params_rate(params) * vad->buffer_time / 1000;
buf_time = VAD_SRAM_BUFFER_END - vad->memphy + 0x8;
buf_time *= 1000;
buf_time /= (frame_bytes * params_rate(params));
if (buf_time < vad->buffer_time)
dev_info(vad->dev, "max buffer time: %u ms.\n", buf_time);
buf_time = min(buf_time, vad->buffer_time);
val = params_rate(params) * buf_time / 1000;
val *= frame_bytes;
val += vad->memphy;
val -= 0x8;