d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Limit total hardware playback channels to just 1. The reliability of

Browse Source 
it's multi DAC / playback channels is not that good. Enabling vchans
make the bug more visible since playback allocation will look for
possible free hardware channels first (i.e: the next DAC, the very first
has been consumed by vchan mixer) which in this case has been proven faulty.

Tested by:	Dominic Fandrey <LoN_Kamikaze at gmx dot de>
URL:		http://lists.freebsd.org/pipermail/freebsd-stable/2007-December/039022.html
This commit is contained in:
ariff 2007-12-14 02:16:26 +00:00
parent c6ebd74e98
commit 76dde6b4fa
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/sound/pci/maestro.c
View File

@ -1771,7 +1771,7 @@ agg_attach(device_t dev)
struct resource *irq = NULL;
void *ih = NULL;
char status[SND_STATUSLEN];
int ret = 0;
int dacn, ret = 0;
ess = malloc(sizeof(*ess), M_DEVBUF, M_WAITOK | M_ZERO);
ess->dev = dev;
@ -1786,6 +1786,15 @@ agg_attach(device_t dev)
}
#endif
if (resource_int_value(device_get_name(dev), device_get_unit(dev),
"dac", &dacn) == 0) {
if (dacn < 1)
dacn = 1;
else if (dacn > AGG_MAXPLAYCH)
dacn = AGG_MAXPLAYCH;
} else
dacn = AGG_MAXPLAYCH;
ess->bufsz = pcm_getbuffersize(dev, 4096, AGG_DEFAULT_BUFSZ, 65536);
if (bus_dma_tag_create(/*parent*/ bus_get_dma_tag(dev),
/*align */ 4, 1 << (16+1),
@ -1895,7 +1904,7 @@ agg_attach(device_t dev)
}
ess->codec = codec;
ret = pcm_register(dev, ess, AGG_MAXPLAYCH, 1);
ret = pcm_register(dev, ess, dacn, 1);
if (ret)
goto bad;
@ -1903,7 +1912,7 @@ agg_attach(device_t dev)
agg_lock(ess);
agg_power(ess, powerstate_init);
agg_unlock(ess);
for (data = 0; data < AGG_MAXPLAYCH; data++)
for (data = 0; data < dacn; data++)
pcm_addchan(dev, PCMDIR_PLAY, &aggpch_class, ess);
pcm_addchan(dev, PCMDIR_REC, &aggrch_class, ess);
adjust_pchbase(ess->pch, ess->playchns, ess->bufsz);