| From 3b70bdba2fcb374a2235a56ab73334348d819579 Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Wed, 29 Oct 2014 16:13:05 +0100 |
| Subject: ALSA: hda - Add workaround for CMI8888 snoop behavior |
| |
| From: Takashi Iwai <tiwai@suse.de> |
| |
| commit 3b70bdba2fcb374a2235a56ab73334348d819579 upstream. |
| |
| 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> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/pci/hda/hda_intel.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/sound/pci/hda/hda_intel.c |
| +++ b/sound/pci/hda/hda_intel.c |
| @@ -373,6 +373,8 @@ static void __mark_pages_wc(struct azx * |
| #ifdef CONFIG_SND_DMA_SGBUF |
| if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_SG) { |
| struct snd_sg_buf *sgbuf = dmab->private_data; |
| + if (chip->driver_type == AZX_DRIVER_CMEDIA) |
| + return; /* deal with only CORB/RIRB buffers */ |
| if (on) |
| set_pages_array_wc(sgbuf->page_table, sgbuf->pages); |
| else |
| @@ -1768,7 +1770,7 @@ static void pcm_mmap_prepare(struct snd_ |
| #ifdef CONFIG_X86 |
| struct azx_pcm *apcm = snd_pcm_substream_chip(substream); |
| struct azx *chip = apcm->chip; |
| - if (!azx_snoop(chip)) |
| + if (!azx_snoop(chip) && chip->driver_type != AZX_DRIVER_CMEDIA) |
| area->vm_page_prot = pgprot_writecombine(area->vm_page_prot); |
| #endif |
| } |