ALSA: hda: Use managed buffer allocation (7a6d4a5a) · Commits · 戴 / test

sound/pci/hda/hda_controller.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ static int azx_pcm_hw_params(struct snd_pcm_substream *substream,
		struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
		struct azx *chip = apcm->chip;
		struct azx_dev *azx_dev = get_azx_dev(substream);
		int ret;
		int ret = 0;

		trace_azx_pcm_hw_params(chip, azx_dev);
		dsp_lock(azx_dev);
		@@ -119,8 +119,6 @@ static int azx_pcm_hw_params(struct snd_pcm_substream *substream,
		azx_dev->core.bufsize = 0;
		azx_dev->core.period_bytes = 0;
		azx_dev->core.format_val = 0;
		ret = snd_pcm_lib_malloc_pages(substream,
		params_buffer_bytes(hw_params));

		unlock:
		dsp_unlock(azx_dev);
		@@ -132,7 +130,6 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)
		struct azx_pcm *apcm = snd_pcm_substream_chip(substream);
		struct azx_dev *azx_dev = get_azx_dev(substream);
		struct hda_pcm_stream *hinfo = to_hda_pcm_stream(substream);
		int err;

		/* reset BDL address */
		dsp_lock(azx_dev);
		@@ -141,10 +138,9 @@ static int azx_pcm_hw_free(struct snd_pcm_substream *substream)

		snd_hda_codec_cleanup(apcm->codec, hinfo, substream);

		err = snd_pcm_lib_free_pages(substream);
		azx_stream(azx_dev)->prepared = 0;
		dsp_unlock(azx_dev);
		return err;
		return 0;
		}

		static int azx_pcm_prepare(struct snd_pcm_substream *substream)
		@@ -766,8 +762,7 @@ int snd_hda_attach_pcm_stream(struct hda_bus _bus, struct hda_codec codec,
		size = MAX_PREALLOC_SIZE;
		if (chip->uc_buffer)
		type = SNDRV_DMA_TYPE_DEV_UC_SG;
		snd_pcm_lib_preallocate_pages_for_all(pcm, type,
		chip->card->dev,
		snd_pcm_set_managed_buffer_all(pcm, type, chip->card->dev,
		size, MAX_PREALLOC_SIZE);
		return 0;
		}

Admin message