1 files changed, 52 insertions, 24 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 5cc3d07f715..be6982289c0 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -177,7 +177,8 @@ MODULE_DESCRIPTION("Intel HDA driver");
 #define ICH6_REG_INTCTL                 0x20
 #define ICH6_REG_INTSTS                 0x24
 #define ICH6_REG_WALLCLK                0x30    /* 24Mhz source */
-#define ICH6_REG_SYNC                   0x34    
+#define ICH6_REG_OLD_SSYNC              0x34    /* SSYNC for old ICH */
+#define ICH6_REG_SSYNC                  0x38
 #define ICH6_REG_CORBLBASE              0x40
 #define ICH6_REG_CORBUBASE              0x44
 #define ICH6_REG_CORBWP                 0x48
@@ -479,6 +480,7 @@ enum {
 #define AZX_DCAPS_POSFIX_VIA    (1 << 17)       /* Use VIACOMBO as default */
 #define AZX_DCAPS_NO_64BIT      (1 << 18)       /* No 64bit address */
 #define AZX_DCAPS_SYNC_WRITE    (1 << 19)       /* sync each cmd write */
+#define AZX_DCAPS_OLD_SSYNC     (1 << 20)       /* Old SSYNC reg for ICH */
 
 /* quirks for ATI SB / AMD Hudson */
 #define AZX_DCAPS_PRESET_ATI_SB \
@@ -1706,13 +1708,16 @@ static int azx_pcm_prepare(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         unsigned int bufsize, period_bytes, format_val, stream_tag;
         int err;
+        struct hda_spdif_out *spdif =
+                snd_hda_spdif_out_of_nid(apcm->codec, hinfo->nid);
+        unsigned short ctls = spdif ? spdif->ctls : 0;
 
         azx_stream_reset(chip, azx_dev);
         format_val = snd_hda_calc_stream_format(runtime->rate,
                                                 runtime->channels,
                                                 runtime->format,
                                                 hinfo->maxbps,
-                                                apcm->codec->spdif_ctls);
+                                                ctls);
         if (!format_val) {
                 snd_printk(KERN_ERR SFX
                            "invalid format_val, rate=%d, ch=%d, format=%d\n",
@@ -1792,7 +1797,11 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
         spin_lock(&chip->reg_lock);
         if (nsync > 1) {
                 /* first, set SYNC bits of corresponding streams */
-                azx_writel(chip, SYNC, azx_readl(chip, SYNC) | sbits);
+                if (chip->driver_caps & AZX_DCAPS_OLD_SSYNC)
+                        azx_writel(chip, OLD_SSYNC,
+                                   azx_readl(chip, OLD_SSYNC) | sbits);
+                else
+                        azx_writel(chip, SSYNC, azx_readl(chip, SSYNC) | sbits);
         }
         snd_pcm_group_for_each_entry(s, substream) {
                 if (s->pcm->card != substream->pcm->card)
@@ -1848,7 +1857,11 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
         if (nsync > 1) {
                 spin_lock(&chip->reg_lock);
                 /* reset SYNC bits */
-                azx_writel(chip, SYNC, azx_readl(chip, SYNC) & ~sbits);
+                if (chip->driver_caps & AZX_DCAPS_OLD_SSYNC)
+                        azx_writel(chip, OLD_SSYNC,
+                                   azx_readl(chip, OLD_SSYNC) & ~sbits);
+                else
+                        azx_writel(chip, SSYNC, azx_readl(chip, SSYNC) & ~sbits);
                 spin_unlock(&chip->reg_lock);
         }
         return 0;
@@ -1863,7 +1876,7 @@ static unsigned int azx_via_get_position(struct azx *chip,
         unsigned int fifo_size;
 
         link_pos = azx_sd_readl(azx_dev, SD_LPIB);
-        if (azx_dev->index >= 4) {
+        if (azx_dev->substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 /* Playback, no problem using link position */
                 return link_pos;
         }
@@ -1927,6 +1940,17 @@ static unsigned int azx_get_position(struct azx *chip,
         default:
                 /* use the position buffer */
                 pos = le32_to_cpu(*azx_dev->posbuf);
+                if (chip->position_fix[stream] == POS_FIX_AUTO) {
+                        if (!pos || pos == (u32)-1) {
+                                printk(KERN_WARNING
+                                       "hda-intel: Invalid position buffer, "
+                                       "using LPIB read method instead.\n");
+                                chip->position_fix[stream] = POS_FIX_LPIB;
+                                pos = azx_sd_readl(azx_dev, SD_LPIB);
+                        } else
+                                chip->position_fix[stream] = POS_FIX_POSBUF;
+                }
+                break;
         }
 
         if (pos >= azx_dev->bufsize)
@@ -1964,16 +1988,6 @@ static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev)
 
         stream = azx_dev->substream->stream;
         pos = azx_get_position(chip, azx_dev);
-        if (chip->position_fix[stream] == POS_FIX_AUTO) {
-                if (!pos) {
-                        printk(KERN_WARNING
-                               "hda-intel: Invalid position buffer, "
-                               "using LPIB read method instead.\n");
-                        chip->position_fix[stream] = POS_FIX_LPIB;
-                        pos = azx_get_position(chip, azx_dev);
-                } else
-                        chip->position_fix[stream] = POS_FIX_POSBUF;
-        }
 
         if (WARN_ONCE(!azx_dev->period_bytes,
                       "hda-intel: zero azx_dev->period_bytes"))
@@ -2061,6 +2075,8 @@ static void azx_pcm_free(struct snd_pcm *pcm)
         }
 }
 
+#define MAX_PREALLOC_SIZE       (32 * 1024 * 1024)
+
 static int
 azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
                       struct hda_pcm *cpcm)
@@ -2069,6 +2085,7 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
         struct snd_pcm *pcm;
         struct azx_pcm *apcm;
         int pcm_dev = cpcm->device;
+        unsigned int size;
         int s, err;
 
         if (pcm_dev >= HDA_MAX_PCMS) {
@@ -2104,9 +2121,12 @@ azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
                         snd_pcm_set_ops(pcm, s, &azx_pcm_ops);
         }
         /* buffer pre-allocation */
+        size = CONFIG_SND_HDA_PREALLOC_SIZE * 1024;
+        if (size > MAX_PREALLOC_SIZE)
+                size = MAX_PREALLOC_SIZE;
         snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
                                               snd_dma_pci_data(chip->pci),
-                                              1024 * 64, 32 * 1024 * 1024);
+                                              size, MAX_PREALLOC_SIZE);
         return 0;
 }
 
@@ -2347,28 +2367,20 @@ static int azx_dev_free(struct snd_device *device)
  * white/black-listing for position_fix
  */
 static struct snd_pci_quirk position_fix_list[] __devinitdata = {
-        SND_PCI_QUIRK(0x1025, 0x009f, "Acer Aspire 5110", POS_FIX_LPIB),
-        SND_PCI_QUIRK(0x1025, 0x026f, "Acer Aspire 5538", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),
-        SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),
-        SND_PCI_QUIRK(0x1028, 0x0470, "Dell Inspiron 1120", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x103c, 0x306d, "HP dv3", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1043, 0x81e7, "ASUS M2V", POS_FIX_LPIB),
-        SND_PCI_QUIRK(0x1043, 0x8410, "ASUS", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x104d, 0x9069, "Sony VPCS11V9E", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1106, 0x3288, "ASUS M2V-MX SE", POS_FIX_LPIB),
-        SND_PCI_QUIRK(0x1179, 0xff10, "Toshiba A100-259", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1297, 0x3166, "Shuttle", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1458, 0xa022, "ga-ma770-ud3", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),
-        SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1565, 0x8218, "Biostar Microtech", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x1849, 0x0888, "775Dual-VSTA", POS_FIX_LPIB),
         SND_PCI_QUIRK(0x8086, 0x2503, "DG965OT AAD63733-203", POS_FIX_LPIB),
-        SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),
         {}
 };
 
@@ -2815,6 +2827,22 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
         /* SCH */
         { PCI_DEVICE(0x8086, 0x811b),
           .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_SCH_SNOOP },
+        { PCI_DEVICE(0x8086, 0x2668),
+          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC },  /* ICH6 */
+        { PCI_DEVICE(0x8086, 0x27d8),
+          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC },  /* ICH7 */
+        { PCI_DEVICE(0x8086, 0x269a),
+          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC },  /* ESB2 */
+        { PCI_DEVICE(0x8086, 0x284b),
+          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC },  /* ICH8 */
+        { PCI_DEVICE(0x8086, 0x293e),
+          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC },  /* ICH9 */
+        { PCI_DEVICE(0x8086, 0x293f),
+          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC },  /* ICH9 */
+        { PCI_DEVICE(0x8086, 0x3a3e),
+          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC },  /* ICH10 */
+        { PCI_DEVICE(0x8086, 0x3a6e),
+          .driver_data = AZX_DRIVER_ICH | AZX_DCAPS_OLD_SSYNC },  /* ICH10 */
         /* Generic Intel */
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
           .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,