Commit 16c5cde2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Once again back-merge the 6.0-rc devel branch for further USB-audio
and HD-audio developments.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 32eeeed9 37137ec2

sound/core/memalloc.c

+7 −2
Original line number Diff line number Diff line
@@ -558,10 +558,13 @@ static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size) 
	dmab->dev.need_sync = dma_need_sync(dmab->dev.dev,

					    sg_dma_address(sgt->sgl));

	p = dma_vmap_noncontiguous(dmab->dev.dev, size, sgt);

	if (p)

	if (p) {

		dmab->private_data = sgt;

	else

		/* store the first page address for convenience */

		dmab->addr = snd_sgbuf_get_addr(dmab, 0);

	} else {

		dma_free_noncontiguous(dmab->dev.dev, size, sgt, dmab->dev.dir);

	}

	return p;

}
@@ -763,6 +766,8 @@ static void *snd_dma_sg_fallback_alloc(struct snd_dma_buffer *dmab, size_t size) 
	if (!p)

		goto error;

	dmab->private_data = sgbuf;

	/* store the first page address for convenience */

	dmab->addr = snd_sgbuf_get_addr(dmab, 0);

	return p;



 error:

sound/core/oss/pcm_oss.c

+3 −3
Original line number Diff line number Diff line
@@ -1672,14 +1672,14 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file) 
		runtime = substream->runtime;

		if (atomic_read(&substream->mmap_count))

			goto __direct;

		err = snd_pcm_oss_make_ready(substream);

		if (err < 0)

			return err;

		atomic_inc(&runtime->oss.rw_ref);

		if (mutex_lock_interruptible(&runtime->oss.params_lock)) {

			atomic_dec(&runtime->oss.rw_ref);

			return -ERESTARTSYS;

		}

		err = snd_pcm_oss_make_ready_locked(substream);

		if (err < 0)

			goto unlock;

		format = snd_pcm_oss_format_from(runtime->oss.format);

		width = snd_pcm_format_physical_width(format);

		if (runtime->oss.buffer_used > 0) {

sound/drivers/aloop.c

+4 −3
Original line number Diff line number Diff line
@@ -605,17 +605,18 @@ static unsigned int loopback_jiffies_timer_pos_update 
			cable->streams[SNDRV_PCM_STREAM_PLAYBACK];

	struct loopback_pcm *dpcm_capt =

			cable->streams[SNDRV_PCM_STREAM_CAPTURE];

	unsigned long delta_play = 0, delta_capt = 0;

	unsigned long delta_play = 0, delta_capt = 0, cur_jiffies;

	unsigned int running, count1, count2;



	cur_jiffies = jiffies;

	running = cable->running ^ cable->pause;

	if (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) {

		delta_play = jiffies - dpcm_play->last_jiffies;

		delta_play = cur_jiffies - dpcm_play->last_jiffies;

		dpcm_play->last_jiffies += delta_play;

	}



	if (running & (1 << SNDRV_PCM_STREAM_CAPTURE)) {

		delta_capt = jiffies - dpcm_capt->last_jiffies;

		delta_capt = cur_jiffies - dpcm_capt->last_jiffies;

		dpcm_capt->last_jiffies += delta_capt;

	}

sound/pci/hda/hda_intel.c

+1 −1
Original line number Diff line number Diff line
@@ -1810,7 +1810,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, 


	/* use the non-cached pages in non-snoop mode */

	if (!azx_snoop(chip))

		azx_bus(chip)->dma_type = SNDRV_DMA_TYPE_DEV_WC;

		azx_bus(chip)->dma_type = SNDRV_DMA_TYPE_DEV_WC_SG;



	if (chip->driver_type == AZX_DRIVER_NVIDIA) {

		dev_dbg(chip->card->dev, "Enable delay in RIRB handling\n");

sound/pci/hda/hda_tegra.c

+2 −1
Original line number Diff line number Diff line
@@ -474,7 +474,8 @@ MODULE_DEVICE_TABLE(of, hda_tegra_match); 
static int hda_tegra_probe(struct platform_device *pdev)

{

	const unsigned int driver_flags = AZX_DCAPS_CORBRP_SELF_CLEAR |

					  AZX_DCAPS_PM_RUNTIME;

					  AZX_DCAPS_PM_RUNTIME |

					  AZX_DCAPS_4K_BDLE_BOUNDARY;

	struct snd_card *card;

	struct azx *chip;

	struct hda_tegra *hda;