Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78c9be61 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda: Check the non-cached stream buffers more explicitly 



Introduce a new flag, uc_buffer, to indicate that the controller
requires the non-cached pages for stream buffers, either as a
chip-specific requirement or specified via snoop=0 option.
This improves the code-readability.

Also, this patch fixes the incorrect behavior for C-Media chip where
the stream buffers were never handled as non-cached due to the check
of driver_type even if you pass snoop=0 option.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 42e748a0

sound/pci/hda/hda_controller.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ struct azx { 
	unsigned int msi:1;

	unsigned int probing:1; /* codec probing phase */

	unsigned int snoop:1;

	unsigned int uc_buffer:1; /* non-cached pages for stream buffers */

	unsigned int align_buffer_size:1;

	unsigned int region_requested:1;

	unsigned int disabled:1; /* disabled by vga_switcheroo */

sound/pci/hda/hda_intel.c

+8 −3
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ static void __mark_pages_wc(struct azx *chip, struct snd_dma_buffer *dmab, bool 
#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)

		if (!chip->uc_buffer)

			return; /* deal with only CORB/RIRB buffers */

		if (on)

			set_pages_array_wc(sgbuf->page_table, sgbuf->pages);
@@ -1637,6 +1637,7 @@ static void azx_check_snoop_available(struct azx *chip) 
		dev_info(chip->card->dev, "Force to %s mode by module option\n",

			 snoop ? "snoop" : "non-snoop");

		chip->snoop = snoop;

		chip->uc_buffer = !snoop;

		return;

	}
@@ -1657,8 +1658,12 @@ static void azx_check_snoop_available(struct azx *chip) 
		snoop = false;



	chip->snoop = snoop;

	if (!snoop)

	if (!snoop) {

		dev_info(chip->card->dev, "Force to non-snoop mode\n");

		/* C-Media requires non-cached pages only for CORB/RIRB */

		if (chip->driver_type != AZX_DRIVER_CMEDIA)

			chip->uc_buffer = true;

	}

}



static void azx_probe_work(struct work_struct *work)
@@ -2097,7 +2102,7 @@ static void pcm_mmap_prepare(struct snd_pcm_substream *substream, 
#ifdef CONFIG_X86

	struct azx_pcm *apcm = snd_pcm_substream_chip(substream);

	struct azx *chip = apcm->chip;

	if (!azx_snoop(chip) && chip->driver_type != AZX_DRIVER_CMEDIA)

	if (chip->uc_buffer)

		area->vm_page_prot = pgprot_writecombine(area->vm_page_prot);

#endif

}