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

Commit 6b69a0e5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: aloop - Use vmalloc buffer 



snd-aloop driver is virtual and has no need for allocating contiguous
pages.  It'll be more system-friendly to use vmalloc buffers.

Tested-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 49957f39

sound/drivers/aloop.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -575,7 +575,8 @@ static void loopback_runtime_free(struct snd_pcm_runtime *runtime) 
static int loopback_hw_params(struct snd_pcm_substream *substream,

static int loopback_hw_params(struct snd_pcm_substream *substream,

			      struct snd_pcm_hw_params *params)

			      struct snd_pcm_hw_params *params)

{

{

	return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));

	return snd_pcm_lib_alloc_vmalloc_buffer(substream,

						params_buffer_bytes(params));

}

}





static int loopback_hw_free(struct snd_pcm_substream *substream)

static int loopback_hw_free(struct snd_pcm_substream *substream)
@@ -587,7 +588,7 @@ static int loopback_hw_free(struct snd_pcm_substream *substream) 
	mutex_lock(&dpcm->loopback->cable_lock);

	mutex_lock(&dpcm->loopback->cable_lock);

	cable->valid &= ~(1 << substream->stream);

	cable->valid &= ~(1 << substream->stream);

	mutex_unlock(&dpcm->loopback->cable_lock);

	mutex_unlock(&dpcm->loopback->cable_lock);

	return snd_pcm_lib_free_pages(substream);

	return snd_pcm_lib_free_vmalloc_buffer(substream);

}

}





static unsigned int get_cable_index(struct snd_pcm_substream *substream)

static unsigned int get_cable_index(struct snd_pcm_substream *substream)
@@ -740,6 +741,8 @@ static struct snd_pcm_ops loopback_playback_ops = { 
	.prepare =	loopback_prepare,

	.prepare =	loopback_prepare,

	.trigger =	loopback_trigger,

	.trigger =	loopback_trigger,

	.pointer =	loopback_pointer,

	.pointer =	loopback_pointer,

	.page =		snd_pcm_lib_get_vmalloc_page,

	.mmap =		snd_pcm_lib_mmap_vmalloc,

};

};





static struct snd_pcm_ops loopback_capture_ops = {

static struct snd_pcm_ops loopback_capture_ops = {
@@ -751,6 +754,8 @@ static struct snd_pcm_ops loopback_capture_ops = { 
	.prepare =	loopback_prepare,

	.prepare =	loopback_prepare,

	.trigger =	loopback_trigger,

	.trigger =	loopback_trigger,

	.pointer =	loopback_pointer,

	.pointer =	loopback_pointer,

	.page =		snd_pcm_lib_get_vmalloc_page,

	.mmap =		snd_pcm_lib_mmap_vmalloc,

};

};





static int __devinit loopback_pcm_new(struct loopback *loopback,

static int __devinit loopback_pcm_new(struct loopback *loopback,
@@ -771,10 +776,6 @@ static int __devinit loopback_pcm_new(struct loopback *loopback, 
	strcpy(pcm->name, "Loopback PCM");

	strcpy(pcm->name, "Loopback PCM");





	loopback->pcm[device] = pcm;

	loopback->pcm[device] = pcm;



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,

			snd_dma_continuous_data(GFP_KERNEL),

			0, 2 * 1024 * 1024);

	return 0;

	return 0;

}

}