diff options
| author | martin <martin@NetBSD.org> | 2020-04-25 10:40:45 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2020-04-25 10:40:45 +0000 |
| commit | 4fc511dd0d48aff2c1a4ae1bf4eaa3c45fd201f7 (patch) | |
| tree | ba109a9ea5acfaac8949ad70eafbbce456cfeef1 /sys | |
| parent | fe07f0b76ef0eb5bace2ba086d4e809c8fa729f5 (diff) | |
Pull up following revision(s) (requested by isaki in ticket #852):
sys/dev/hdaudio/hdafg.c: revision 1.22
Make round_blocksize satisfy all of
- restrictions that existed before merging isaki-audio2 branch.
- better support for 6 channels hardware.
- audio layer's requirement.
This may help PR kern/54474.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/hdaudio/hdafg.c | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/sys/dev/hdaudio/hdafg.c b/sys/dev/hdaudio/hdafg.c index 3609c0095c4..07805da5b09 100644 --- a/sys/dev/hdaudio/hdafg.c +++ b/sys/dev/hdaudio/hdafg.c @@ -1,4 +1,4 @@ -/* $NetBSD: hdafg.c,v 1.18 2019/06/08 08:02:38 isaki Exp $ */ +/* $NetBSD: hdafg.c,v 1.18.2.1 2020/04/25 10:40:45 martin Exp $ */ /* * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk> @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.18 2019/06/08 08:02:38 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.18.2.1 2020/04/25 10:40:45 martin Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -3934,12 +3934,28 @@ hdafg_set_format(void *opaque, int setmode, return 0; } +/* LCM for round_blocksize */ +static u_int gcd(u_int, u_int); +static u_int lcm(u_int, u_int); + +static u_int gcd(u_int a, u_int b) +{ + + return (b == 0) ? a : gcd(b, a % b); +} +static u_int lcm(u_int a, u_int b) +{ + + return a * b / gcd(a, b); +} + static int hdafg_round_blocksize(void *opaque, int blksize, int mode, const audio_params_t *param) { struct hdaudio_audiodev *ad = opaque; struct hdaudio_stream *st; + u_int minblksize; int bufsize; st = (mode == AUMODE_PLAY) ? ad->ad_playback : ad->ad_capture; @@ -3949,6 +3965,15 @@ hdafg_round_blocksize(void *opaque, int blksize, int mode, return 128; } + if (blksize > 8192) + blksize = 8192; + + /* Make sure there are enough BDL descriptors */ + bufsize = st->st_data.dma_size; + if (bufsize > HDAUDIO_BDL_MAX * blksize) { + blksize = bufsize / HDAUDIO_BDL_MAX; + } + /* * HD audio's buffer constraint looks like following: * - The buffer MUST start on a 128bytes boundary. @@ -3956,13 +3981,15 @@ hdafg_round_blocksize(void *opaque, int blksize, int mode, * - The buffer size is preferred multiple of 128bytes for efficiency. * * https://www.intel.co.jp/content/www/jp/ja/standards/high-definition-audio-specification.html , p70. + * + * Also, the audio layer requires that the blocksize must be a + * multiple of the number of channels. */ + minblksize = lcm(128, param->channels); + blksize = rounddown(blksize, minblksize); + if (blksize < minblksize) + blksize = minblksize; - /* Make sure there are enough BDL descriptors */ - bufsize = st->st_data.dma_size; - if (bufsize > HDAUDIO_BDL_MAX * blksize) { - blksize = bufsize / HDAUDIO_BDL_MAX; - } return blksize; } |
