ALSA: hda - Use LPIB for ATI/AMD chipsets as default

[pandora-kernel.git] / sound / pci / hda / hda_intel.c

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index fcedad9..f5cad7c 100644 (file)
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1052,9 +1052,12 @@ static void azx_init_pci(struct azx *chip)
        /* Clear bits 0-2 of PCI register TCSEL (at offset 0x44)
         * TCSEL == Traffic Class Select Register, which sets PCI express QOS
         * Ensuring these bits are 0 clears playback static on some HD Audio
-        * codecs
+        * codecs.
+        * The PCI register TCSEL is defined in the Intel manuals.
         */
-       update_pci_byte(chip->pci, ICH6_PCIREG_TCSEL, 0x07, 0);
+       if (chip->driver_type != AZX_DRIVER_ATI &&
+           chip->driver_type != AZX_DRIVER_ATIHDMI)
+               update_pci_byte(chip->pci, ICH6_PCIREG_TCSEL, 0x07, 0);
 
        switch (chip->driver_type) {
        case AZX_DRIVER_ATI:
@@ -2346,9 +2349,16 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
        /* Check VIA/ATI HD Audio Controller exist */
        switch (chip->driver_type) {
        case AZX_DRIVER_VIA:
-       case AZX_DRIVER_ATI:
                /* Use link position directly, avoid any transfer problem. */
                return POS_FIX_VIACOMBO;
+       case AZX_DRIVER_ATI:
+               /* ATI chipsets don't work well with position-buffer */
+               return POS_FIX_LPIB;
+       case AZX_DRIVER_GENERIC:
+               /* AMD chipsets also don't work with position-buffer */
+               if (chip->pci->vendor == PCI_VENDOR_ID_AMD)
+                       return POS_FIX_LPIB;
+               break;
        }
 
        return POS_FIX_AUTO;