jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-28 06:52:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Align buffer size to LCM of 128bytes, required by hardware, and alignment of

Browse Source 
current format. This fixes problems with non-power-of-2 number of channels.

Enable 5.1 formats support, as they are working fine now.
This commit is contained in:
Alexander Motin 2010-01-12 16:40:13 +00:00
parent 2fdb5f0b86
commit 481ad2f5b4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=202156
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/dev/sound/pci/hda/hdac.c
View File

@ -86,7 +86,7 @@
#include "mixer_if.h"
#define HDA_DRV_TEST_REV "20100111_0139"
#define HDA_DRV_TEST_REV "20100112_0140"
SND_DECLARE_FILE("$FreeBSD$");
@ -3543,6 +3543,32 @@ hdac_stream_setup(struct hdac_chan *ch)
}
}
/*
* Greatest Common Divisor.
*/
static unsigned
gcd(unsigned a, unsigned b)
{
u_int c;
while (b != 0) {
c = a;
a = b;
b = (c % b);
}
return (a);
}
/*
* Least Common Multiple.
*/
static unsigned
lcm(unsigned a, unsigned b)
{
return ((a * b) / gcd(a, b));
}
static int
hdac_channel_setfragments(kobj_t obj, void *data,
uint32_t blksz, uint32_t blkcnt)
@ -3550,7 +3576,7 @@ hdac_channel_setfragments(kobj_t obj, void *data,
struct hdac_chan *ch = data;
struct hdac_softc *sc = ch->devinfo->codec->sc;
blksz &= HDA_BLK_ALIGN;
blksz -= blksz % lcm(HDAC_DMA_ALIGNMENT, sndbuf_getalign(ch->b));
if (blksz > (sndbuf_getmaxsize(ch->b) / HDA_BDL_MIN))
blksz = sndbuf_getmaxsize(ch->b) / HDA_BDL_MIN;
@ -6551,14 +6577,12 @@ hdac_pcmchannel_setup(struct hdac_chan *ch)
if (ch->bit32)
ch->fmtlist[i++] = SND_FORMAT(AFMT_S32_LE, 4, 0);
}
#ifdef notyet
if (channels == 6 || /* Any 6-channel */
pinset == 0x0017) { /* 7.1 */
ch->fmtlist[i++] = SND_FORMAT(AFMT_S16_LE, 6, 1);
if (ch->bit32)
ch->fmtlist[i++] = SND_FORMAT(AFMT_S32_LE, 6, 1);
}
#endif
if (channels == 8) { /* Any 8-channel */
ch->fmtlist[i++] = SND_FORMAT(AFMT_S16_LE, 8, 1);
if (ch->bit32)