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

Unverified Commit d00f749b authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ALSA: compress: make use of runtime buffer for copy 



Default copy function uses kmalloc to allocate buffers, lets check
if the runtime buffers are setup before making this allocations.
This can be useful if the buffers are dma buffers.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ba02eed9

sound/core/compress_offload.c

+15 −3
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ static int snd_compr_free(struct inode *inode, struct file *f) 
	}



	data->stream.ops->free(&data->stream);

	if (!data->stream.runtime->dma_buffer_p)

		kfree(data->stream.runtime->buffer);

	kfree(data->stream.runtime);

	kfree(data);
@@ -505,7 +506,7 @@ static int snd_compr_allocate_buffer(struct snd_compr_stream *stream, 
		struct snd_compr_params *params)

{

	unsigned int buffer_size;

	void *buffer;

	void *buffer = NULL;



	buffer_size = params->buffer.fragment_size * params->buffer.fragments;

	if (stream->ops->copy) {
@@ -513,8 +514,19 @@ static int snd_compr_allocate_buffer(struct snd_compr_stream *stream, 
		/* if copy is defined the driver will be required to copy

		 * the data from core

		 */

	} else {

		if (stream->runtime->dma_buffer_p) {



			if (buffer_size > stream->runtime->dma_buffer_p->bytes)

				dev_err(&stream->device->dev,

						"Not enough DMA buffer");

			else

				buffer = stream->runtime->dma_buffer_p->area;



		} else {

			buffer = kmalloc(buffer_size, GFP_KERNEL);

		}



		if (!buffer)

			return -ENOMEM;

	}