summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@suse.cz>2003-09-25 18:21:57 +0200
committerJaroslav Kysela <perex@suse.cz>2003-09-25 18:21:57 +0200
commit0ceb413791ff6a5b0228f36765bb37bc3a7e92f9 (patch)
tree18775e4395df0ac74689360498ed5f1cc675288d
parentea32dc5021b42c7c55ef7ec83db81cb208dc9d98 (diff)
ALSA CVS update
D:2003/08/27 17:12:03 C:Documentation,VIA82xx driver A:Takashi Iwai <tiwai@suse.de> F:Documentation/ALSA-Configuration.txt:1.15->1.16 F:pci/via82xx.c:1.46->1.47 L:- use dxs_support=3 (48k fixed) as default, since there are so many problems L: with dxs_support=0. L:- added kernel boot parameter for dxs_support option.
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt12
-rw-r--r--sound/pci/via82xx.c7
2 files changed, 9 insertions, 10 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index d3b5d2793175..0f06390897fe 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -992,8 +992,8 @@ Module parameters
[VIA686A/686B only]
ac97_clock - AC'97 codec clock base (default 48000Hz)
dxs_support - support DXS channels,
- 0 = auto (default), 1 = enable, 2 = disable,
- 3 = 48k only
+ 0 = auto, 1 = enable, 2 = disable,
+ 3 = 48k only (default)
[VIA8233/C,8235 only]
Module supports autoprobe and multiple bus-master chips (max 8).
@@ -1007,11 +1007,9 @@ Module parameters
Note: VIA8233/5 (not VIA8233A) can support DXS (direct sound)
channels as the first PCM. With this device, up to 4
streams can be played at the same time. On some motherboards,
- these channels don't work properly due to the bug of BIOS.
- If you experience that the playback on this PCM is noisy,
- try to specify dxs_support option to 2 or 3. In most cases
- dxs_support=3 would suffice, so you can keep the multi-play
- capability.
+ these channels don't work properly except for 48k due to the
+ bug of BIOS. For supporting other sample rates, try to
+ specify dxs_support=0.
Note: for the MPU401 on VIA823x, use snd-mpu401 driver
additonally. The mpu_port option is for VIA686 chips only.
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 180653006efb..292c7841344a 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -74,7 +74,7 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
static int ac97_clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 48000};
-static int dxs_support[SNDRV_CARDS];
+static int dxs_support[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 3};
MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
MODULE_PARM_DESC(index, "Index value for VIA 82xx bridge.");
@@ -2083,7 +2083,7 @@ module_exit(alsa_card_via82xx_exit)
#ifndef MODULE
/* format is: snd-via82xx=enable,index,id,
- mpu_port,ac97_clock */
+ mpu_port,ac97_clock,dxs_support */
static int __init alsa_card_via82xx_setup(char *str)
{
@@ -2095,7 +2095,8 @@ static int __init alsa_card_via82xx_setup(char *str)
get_option(&str,&index[nr_dev]) == 2 &&
get_id(&str,&id[nr_dev]) == 2 &&
get_option(&str,(int *)&mpu_port[nr_dev]) == 2 &&
- get_option(&str,&ac97_clock[nr_dev]) == 2);
+ get_option(&str,&ac97_clock[nr_dev]) == 2 &&
+ get_option(&str,&dxs_support[nr_dev]) == 2);
nr_dev++;
return 1;
}