diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-10-29 11:13:05 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-10-29 11:16:29 -0400 |
commit | 3b70bdba2fcb374a2235a56ab73334348d819579 (patch) | |
tree | bec1b83cb6293dd4d6bf54bbf25f96907aafa551 /sound/pci/hda/hda_intel.c | |
parent | 317168d0c766defd14b3d0e9c2c4a9a258b803ee (diff) |
ALSA: hda - Add workaround for CMI8888 snoop behavior
CMI8888 shows the stuttering playback when the snooping is disabled
on the audio buffer. Meanwhile, we've got reports that CORB/RIRB
doesn't work in the snooped mode. So, as a compromise, disable the
snoop only for CORB/RIRB and enable the snoop for the stream buffers.
The resultant patch became a bit ugly, unfortunately, but we still can
live with it.
Reported-and-tested-by: Geoffrey McRae <geoff@spacevs.com>
Cc: <stable@vger.kernel.org> # 3.17+
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index cfcca4c30d4d..9ab1e631cb32 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c | |||
@@ -374,6 +374,8 @@ static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool | |||
374 | #ifdef CONFIG_SND_DMA_SGBUF | 374 | #ifdef CONFIG_SND_DMA_SGBUF |
375 | if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_SG) { | 375 | if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_SG) { |
376 | struct snd_sg_buf *sgbuf = dmab->private_data; | 376 | struct snd_sg_buf *sgbuf = dmab->private_data; |
377 | if (chip->driver_type == AZX_DRIVER_CMEDIA) | ||
378 | return; /* deal with only CORB/RIRB buffers */ | ||
377 | if (on) | 379 | if (on) |
378 | set_pages_array_wc(sgbuf->page_table, sgbuf->pages); | 380 | set_pages_array_wc(sgbuf->page_table, sgbuf->pages); |
379 | else | 381 | else |
@@ -1769,7 +1771,7 @@ static void pcm_mmap_prepare(struct snd_pcm_substream *substream, | |||
1769 | #ifdef CONFIG_X86 | 1771 | #ifdef CONFIG_X86 |
1770 | struct azx_pcm *apcm = snd_pcm_substream_chip(substream); | 1772 | struct azx_pcm *apcm = snd_pcm_substream_chip(substream); |
1771 | struct azx *chip = apcm->chip; | 1773 | struct azx *chip = apcm->chip; |
1772 | if (!azx_snoop(chip)) | 1774 | if (!azx_snoop(chip) && chip->driver_type != AZX_DRIVER_CMEDIA) |
1773 | area->vm_page_prot = pgprot_writecombine(area->vm_page_prot); | 1775 | area->vm_page_prot = pgprot_writecombine(area->vm_page_prot); |
1774 | #endif | 1776 | #endif |
1775 | } | 1777 | } |