ALSA: hda - Enable sync_write workaround for AMD generically

The workaround for AMD chipset via sync_write flag seems needed for
machines with Realtek codecs.  So, it's better to activate it
generically in hda_intel.c from the beginning.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

2 files changed, 11 insertions, 16 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 6f891ee82a7..f95ff6e029a 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1447,6 +1447,17 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model)
                 }
         }
 
+        /* AMD chipsets often cause the communication stalls upon certain
+         * sequence like the pin-detection.  It seems that forcing the synced
+         * access works around the stall.  Grrr...
+         */
+        if (chip->pci->vendor == PCI_VENDOR_ID_AMD ||
+            chip->pci->vendor == PCI_VENDOR_ID_ATI) {
+                snd_printk(KERN_INFO SFX "Enable sync_write for AMD chipset\n");
+                chip->bus->sync_write = 1;
+                chip->bus->allow_bus_reset = 1;
+        }
+
         /* Then create codec instances */
         for (c = 0; c < max_slots; c++) {
                 if ((chip->codec_mask & (1 << c)) & chip->codec_probe_mask) {
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 75b7155b164..6c5af3e77d8 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -5449,13 +5449,6 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
         spec->multiout.dac_nids = spec->dac_nids;
         spec->init = stac92hd83xxx_core_init;
 
-        if (codec->bus->pci && codec->bus->pci->vendor == PCI_VENDOR_ID_AMD) {
-                snd_printk(KERN_INFO "idt92hd83xxx: "
-                           "Enable sync_write for AMD chipset\n");
-                codec->bus->sync_write = 1;
-                codec->bus->allow_bus_reset = 1;
-        }
-
         spec->board_config = snd_hda_check_board_config(codec,
                                                         STAC_92HD83XXX_MODELS,
                                                         stac92hd83xxx_models,
@@ -5736,15 +5729,6 @@ again:
         if (get_wcaps(codec, 0xa) & AC_WCAP_IN_AMP)
                 snd_hda_sequence_write_cache(codec, unmute_init);
 
-        /* Some HP machines seem to have unstable codec communications
-         * especially with ATI fglrx driver.  For recovering from the
-         * CORB/RIRB stall, allow the BUS reset and keep always sync
-         */
-        if (spec->board_config == STAC_HP_DV5) {
-                codec->bus->sync_write = 1;
-                codec->bus->allow_bus_reset = 1;
-        }
-
         spec->aloopback_ctl = stac92hd71bxx_loopback;
         spec->aloopback_mask = 0x50;
         spec->aloopback_shift = 0;