[ALSA] Support all sample rate conversion capabilities of DXS channels

Documentation,VIA82xx driver
Add support for full sample rate conversion capabilities of DXS
channels present in VIA VT8233/5/7 controllers:

- any sample rate in the 8000 ... 48000 Hz range is supported even if
  the AC'97 codec supports only 48000 Hz output;

- different DXS channels can use different sample rates at the same
  time (the controller performs required sample rate conversion and
  mixing in hardware).

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 17 insertions, 3 deletions

diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 9b4d74d49f98..2f1e6ebd56a7 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -101,7 +101,7 @@ MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (default 48000Hz).");
 module_param_array(ac97_quirk, charp, NULL, 0444);
 MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
 module_param_array(dxs_support, int, NULL, 0444);
-MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 = disable, 3 = 48k only, 4 = no VRA)");
+MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 = disable, 3 = 48k only, 4 = no VRA, 5 = enable any sample rate)");
 
 
 /* pci ids */
@@ -302,6 +302,7 @@ DEFINE_VIA_REGSET(CAPTURE_8233, 0x60);
 #define VIA_DXS_DISABLE 2
 #define VIA_DXS_48K     3
 #define VIA_DXS_NO_VRA  4
+#define VIA_DXS_SRC     5
 
 
 /*
@@ -380,6 +381,7 @@ struct _snd_via82xx {
         struct via_rate_lock rates[2]; /* playback and capture */
         unsigned int dxs_fixed: 1;      /* DXS channel accepts only 48kHz */
         unsigned int no_vra: 1;         /* no need to set VRA on DXS channels */
+        unsigned int dxs_src: 1;        /* use full SRC capabilities of DXS */
         unsigned int spdif_on: 1;       /* only spdif rates work to external DACs */
 
         snd_pcm_t *pcms[2];
@@ -924,15 +926,16 @@ static int snd_via8233_playback_prepare(snd_pcm_substream_t *substream)
         via82xx_t *chip = snd_pcm_substream_chip(substream);
         viadev_t *viadev = (viadev_t *)substream->runtime->private_data;
         snd_pcm_runtime_t *runtime = substream->runtime;
+        int ac97_rate = chip->dxs_src ? 48000 : runtime->rate;
         int rate_changed;
         u32 rbits;
 
-        if ((rate_changed = via_lock_rate(&chip->rates[0], runtime->rate)) < 0)
+        if ((rate_changed = via_lock_rate(&chip->rates[0], ac97_rate)) < 0)
                 return rate_changed;
         if (rate_changed) {
                 snd_ac97_set_rate(chip->ac97, AC97_PCM_FRONT_DAC_RATE,
                                   chip->no_vra ? 48000 : runtime->rate);
-                snd_ac97_set_rate(chip->ac97, AC97_SPDIF, runtime->rate);
+                snd_ac97_set_rate(chip->ac97, AC97_SPDIF, ac97_rate);
         }
         if (runtime->rate == 48000)
                 rbits = 0xfffff;
@@ -1074,6 +1077,12 @@ static int snd_via82xx_pcm_open(via82xx_t *chip, viadev_t *viadev, snd_pcm_subst
                 /* fixed DXS playback rate */
                 runtime->hw.rates = SNDRV_PCM_RATE_48000;
                 runtime->hw.rate_min = runtime->hw.rate_max = 48000;
+        } else if (chip->dxs_src && viadev->reg_offset < 0x40) {
+                /* use full SRC capabilities of DXS */
+                runtime->hw.rates = (SNDRV_PCM_RATE_CONTINUOUS |
+                                     SNDRV_PCM_RATE_8000_48000);
+                runtime->hw.rate_min = 8000;
+                runtime->hw.rate_max = 48000;
         } else if (! ratep->rate) {
                 int idx = viadev->direction ? AC97_RATES_ADC : AC97_RATES_FRONT_DAC;
                 runtime->hw.rates = chip->ac97->rates[idx];
@@ -2149,6 +2158,7 @@ static int __devinit check_dxs_list(struct pci_dev *pci)
                 { .vendor = 0x1043, .device = 0x8095, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8X (FIXME: possibly VIA_DXS_ENABLE?)*/
                 { .vendor = 0x1043, .device = 0x80a1, .action = VIA_DXS_NO_VRA }, /* ASUS A7V8-X */
                 { .vendor = 0x1043, .device = 0x80b0, .action = VIA_DXS_NO_VRA }, /* ASUS A7V600 & K8V*/ 
+                { .vendor = 0x1043, .device = 0x812a, .action = VIA_DXS_SRC    }, /* ASUS A8V Deluxe */ 
                 { .vendor = 0x1071, .device = 0x8375, .action = VIA_DXS_NO_VRA }, /* Vobis/Yakumo/Mitac notebook */
                 { .vendor = 0x10cf, .device = 0x118e, .action = VIA_DXS_ENABLE }, /* FSC laptop */
                 { .vendor = 0x1106, .device = 0x4161, .action = VIA_DXS_NO_VRA }, /* ASRock K7VT2 */
@@ -2288,6 +2298,10 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci,
                                 chip->dxs_fixed = 1;
                         else if (dxs_support[dev] == VIA_DXS_NO_VRA)
                                 chip->no_vra = 1;
+                        else if (dxs_support[dev] == VIA_DXS_SRC) {
+                                chip->no_vra = 1;
+                                chip->dxs_src = 1;
+                        }
                 }
                 if ((err = snd_via8233_init_misc(chip, dev)) < 0)
                         goto __error;