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

Commit 7552f34a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.14-3' of... 

Merge tag 'asoc-v3.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Last updates for the merge window

A couple more fixes plus some extensions to DPCM for use with compressed
audio from Liam which arrived just after my previous pull request.
parents 25875336 ac6d7c48

include/sound/soc-dpcm.h

+22 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#ifndef __LINUX_SND_SOC_DPCM_H

#define __LINUX_SND_SOC_DPCM_H



#include <linux/slab.h>

#include <linux/list.h>

#include <sound/pcm.h>
@@ -135,4 +136,25 @@ int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute); 
int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);

int soc_dpcm_runtime_update(struct snd_soc_card *);



int dpcm_path_get(struct snd_soc_pcm_runtime *fe,

	int stream, struct snd_soc_dapm_widget_list **list_);

int dpcm_process_paths(struct snd_soc_pcm_runtime *fe,

	int stream, struct snd_soc_dapm_widget_list **list, int new);

int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream);

int dpcm_be_dai_shutdown(struct snd_soc_pcm_runtime *fe, int stream);

void dpcm_be_disconnect(struct snd_soc_pcm_runtime *fe, int stream);

void dpcm_clear_pending_state(struct snd_soc_pcm_runtime *fe, int stream);

int dpcm_be_dai_hw_free(struct snd_soc_pcm_runtime *fe, int stream);

int dpcm_be_dai_hw_params(struct snd_soc_pcm_runtime *fe, int tream);

int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, int cmd);

int dpcm_be_dai_prepare(struct snd_soc_pcm_runtime *fe, int stream);

int dpcm_dapm_stream_event(struct snd_soc_pcm_runtime *fe, int dir,

	int event);



static inline void dpcm_path_put(struct snd_soc_dapm_widget_list **list)

{

	kfree(*list);

}





#endif

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -1042,6 +1042,7 @@ struct snd_soc_pcm_runtime { 


	/* Dynamic PCM BE runtime data */

	struct snd_soc_dpcm_runtime dpcm[2];

	int fe_compr;



	long pmdown_time;

	unsigned char pop_wait:1;

sound/soc/soc-compress.c

+300 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <sound/compress_driver.h>

#include <sound/soc.h>

#include <sound/initval.h>

#include <sound/soc-dpcm.h>



static int soc_compr_open(struct snd_compr_stream *cstream)

{
@@ -75,6 +76,98 @@ static int soc_compr_open(struct snd_compr_stream *cstream) 
	return ret;

}



static int soc_compr_open_fe(struct snd_compr_stream *cstream)

{

	struct snd_soc_pcm_runtime *fe = cstream->private_data;

	struct snd_pcm_substream *fe_substream = fe->pcm->streams[0].substream;

	struct snd_soc_platform *platform = fe->platform;

	struct snd_soc_dai *cpu_dai = fe->cpu_dai;

	struct snd_soc_dai *codec_dai = fe->codec_dai;

	struct snd_soc_dpcm *dpcm;

	struct snd_soc_dapm_widget_list *list;

	int stream;

	int ret = 0;



	if (cstream->direction == SND_COMPRESS_PLAYBACK)

		stream = SNDRV_PCM_STREAM_PLAYBACK;

	else

		stream = SNDRV_PCM_STREAM_CAPTURE;



	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);



	if (platform->driver->compr_ops && platform->driver->compr_ops->open) {

		ret = platform->driver->compr_ops->open(cstream);

		if (ret < 0) {

			pr_err("compress asoc: can't open platform %s\n", platform->name);

			goto out;

		}

	}



	if (fe->dai_link->compr_ops && fe->dai_link->compr_ops->startup) {

		ret = fe->dai_link->compr_ops->startup(cstream);

		if (ret < 0) {

			pr_err("compress asoc: %s startup failed\n", fe->dai_link->name);

			goto machine_err;

		}

	}



	fe->dpcm[stream].runtime = fe_substream->runtime;



	if (dpcm_path_get(fe, stream, &list) <= 0) {

		dev_dbg(fe->dev, "ASoC: %s no valid %s route\n",

			fe->dai_link->name, stream ? "capture" : "playback");

	}



	/* calculate valid and active FE <-> BE dpcms */

	dpcm_process_paths(fe, stream, &list, 1);



	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE;



	ret = dpcm_be_dai_startup(fe, stream);

	if (ret < 0) {

		/* clean up all links */

		list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be)

			dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE;



		dpcm_be_disconnect(fe, stream);

		fe->dpcm[stream].runtime = NULL;

		goto fe_err;

	}



	dpcm_clear_pending_state(fe, stream);

	dpcm_path_put(&list);



	fe->dpcm[stream].state = SND_SOC_DPCM_STATE_OPEN;

	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;



	if (cstream->direction == SND_COMPRESS_PLAYBACK) {

		cpu_dai->playback_active++;

		codec_dai->playback_active++;

	} else {

		cpu_dai->capture_active++;

		codec_dai->capture_active++;

	}



	cpu_dai->active++;

	codec_dai->active++;

	fe->codec->active++;



	mutex_unlock(&fe->card->mutex);



	return 0;



fe_err:

	if (fe->dai_link->compr_ops && fe->dai_link->compr_ops->shutdown)

		fe->dai_link->compr_ops->shutdown(cstream);

machine_err:

	if (platform->driver->compr_ops && platform->driver->compr_ops->free)

		platform->driver->compr_ops->free(cstream);

out:

	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;

	mutex_unlock(&fe->card->mutex);

	return ret;

}



/*

 * Power down the audio subsystem pmdown_time msecs after close is called.

 * This is to ensure there are no pops or clicks in between any music tracks
@@ -164,6 +257,65 @@ static int soc_compr_free(struct snd_compr_stream *cstream) 
	return 0;

}



static int soc_compr_free_fe(struct snd_compr_stream *cstream)

{

	struct snd_soc_pcm_runtime *fe = cstream->private_data;

	struct snd_soc_platform *platform = fe->platform;

	struct snd_soc_dai *cpu_dai = fe->cpu_dai;

	struct snd_soc_dai *codec_dai = fe->codec_dai;

	struct snd_soc_dpcm *dpcm;

	int stream, ret;



	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);



	if (cstream->direction == SND_COMPRESS_PLAYBACK) {

		stream = SNDRV_PCM_STREAM_PLAYBACK;

		cpu_dai->playback_active--;

		codec_dai->playback_active--;

	} else {

		stream = SNDRV_PCM_STREAM_CAPTURE;

		cpu_dai->capture_active--;

		codec_dai->capture_active--;

	}



	cpu_dai->active--;

	codec_dai->active--;

	fe->codec->active--;



	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE;



	ret = dpcm_be_dai_hw_free(fe, stream);

	if (ret < 0)

		dev_err(fe->dev, "compressed hw_free failed %d\n", ret);



	ret = dpcm_be_dai_shutdown(fe, stream);



	/* mark FE's links ready to prune */

	list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be)

		dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE;



	if (stream == SNDRV_PCM_STREAM_PLAYBACK)

		dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);

	else

		dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);



	fe->dpcm[stream].state = SND_SOC_DPCM_STATE_CLOSE;

	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;



	dpcm_be_disconnect(fe, stream);



	fe->dpcm[stream].runtime = NULL;



	if (fe->dai_link->compr_ops && fe->dai_link->compr_ops->shutdown)

		fe->dai_link->compr_ops->shutdown(cstream);



	if (platform->driver->compr_ops && platform->driver->compr_ops->free)

		platform->driver->compr_ops->free(cstream);



	mutex_unlock(&fe->card->mutex);

	return 0;

}



static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)

{
@@ -194,6 +346,59 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd) 
	return ret;

}



static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)

{

	struct snd_soc_pcm_runtime *fe = cstream->private_data;

	struct snd_soc_platform *platform = fe->platform;

	int ret = 0, stream;



	if (cmd == SND_COMPR_TRIGGER_PARTIAL_DRAIN ||

		cmd == SND_COMPR_TRIGGER_DRAIN) {



		if (platform->driver->compr_ops &&

			platform->driver->compr_ops->trigger)

		return platform->driver->compr_ops->trigger(cstream, cmd);

	}



	if (cstream->direction == SND_COMPRESS_PLAYBACK)

		stream = SNDRV_PCM_STREAM_PLAYBACK;

	else

		stream = SNDRV_PCM_STREAM_CAPTURE;





	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);



	if (platform->driver->compr_ops && platform->driver->compr_ops->trigger) {

		ret = platform->driver->compr_ops->trigger(cstream, cmd);

		if (ret < 0)

			goto out;

	}



	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE;



	ret = dpcm_be_dai_trigger(fe, stream, cmd);



	switch (cmd) {

	case SNDRV_PCM_TRIGGER_START:

	case SNDRV_PCM_TRIGGER_RESUME:

	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

		fe->dpcm[stream].state = SND_SOC_DPCM_STATE_START;

		break;

	case SNDRV_PCM_TRIGGER_STOP:

	case SNDRV_PCM_TRIGGER_SUSPEND:

		fe->dpcm[stream].state = SND_SOC_DPCM_STATE_STOP;

		break;

	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PAUSED;

		break;

	}



out:

	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;

	mutex_unlock(&fe->card->mutex);

	return ret;

}



static int soc_compr_set_params(struct snd_compr_stream *cstream,

					struct snd_compr_params *params)

{
@@ -241,6 +446,64 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream, 
	return ret;

}



static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,

					struct snd_compr_params *params)

{

	struct snd_soc_pcm_runtime *fe = cstream->private_data;

	struct snd_pcm_substream *fe_substream = fe->pcm->streams[0].substream;

	struct snd_soc_platform *platform = fe->platform;

	int ret = 0, stream;



	if (cstream->direction == SND_COMPRESS_PLAYBACK)

		stream = SNDRV_PCM_STREAM_PLAYBACK;

	else

		stream = SNDRV_PCM_STREAM_CAPTURE;



	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);



	if (platform->driver->compr_ops && platform->driver->compr_ops->set_params) {

		ret = platform->driver->compr_ops->set_params(cstream, params);

		if (ret < 0)

			goto out;

	}



	if (fe->dai_link->compr_ops && fe->dai_link->compr_ops->set_params) {

		ret = fe->dai_link->compr_ops->set_params(cstream);

		if (ret < 0)

			goto out;

	}



	/*

	 * Create an empty hw_params for the BE as the machine driver must

	 * fix this up to match DSP decoder and ASRC configuration.

	 * I.e. machine driver fixup for compressed BE is mandatory.

	 */

	memset(&fe->dpcm[fe_substream->stream].hw_params, 0,

		sizeof(struct snd_pcm_hw_params));



	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE;



	ret = dpcm_be_dai_hw_params(fe, stream);

	if (ret < 0)

		goto out;



	ret = dpcm_be_dai_prepare(fe, stream);

	if (ret < 0)

		goto out;



	if (stream == SNDRV_PCM_STREAM_PLAYBACK)

		dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START);

	else

		dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START);



	fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PREPARE;



out:

	fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;

	mutex_unlock(&fe->card->mutex);

	return ret;

}



static int soc_compr_get_params(struct snd_compr_stream *cstream,

					struct snd_codec *params)

{
@@ -360,6 +623,7 @@ static int soc_compr_get_metadata(struct snd_compr_stream *cstream, 


	return ret;

}



/* ASoC Compress operations */

static struct snd_compr_ops soc_compr_ops = {

	.open		= soc_compr_open,
@@ -375,6 +639,21 @@ static struct snd_compr_ops soc_compr_ops = { 
	.get_codec_caps = soc_compr_get_codec_caps

};



/* ASoC Dynamic Compress operations */

static struct snd_compr_ops soc_compr_dyn_ops = {

	.open		= soc_compr_open_fe,

	.free		= soc_compr_free_fe,

	.set_params	= soc_compr_set_params_fe,

	.get_params	= soc_compr_get_params,

	.set_metadata   = soc_compr_set_metadata,

	.get_metadata	= soc_compr_get_metadata,

	.trigger	= soc_compr_trigger_fe,

	.pointer	= soc_compr_pointer,

	.ack		= soc_compr_ack,

	.get_caps	= soc_compr_get_caps,

	.get_codec_caps = soc_compr_get_codec_caps

};



/* create a new compress */

int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)

{
@@ -383,6 +662,7 @@ int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 
	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_compr *compr;

	struct snd_pcm *be_pcm;

	char new_name[64];

	int ret = 0, direction = 0;
@@ -410,6 +690,25 @@ int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 
		ret = -ENOMEM;

		goto compr_err;

	}



	if (rtd->dai_link->dynamic) {

		snprintf(new_name, sizeof(new_name), "(%s)",

			rtd->dai_link->stream_name);



		ret = snd_pcm_new_internal(rtd->card->snd_card, new_name, num,

				1, 0, &be_pcm);

		if (ret < 0) {

			dev_err(rtd->card->dev, "ASoC: can't create compressed for %s\n",

				rtd->dai_link->name);

			goto compr_err;

		}



		rtd->pcm = be_pcm;

		rtd->fe_compr = 1;

		be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd;

		be_pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->private_data = rtd;

		memcpy(compr->ops, &soc_compr_dyn_ops, sizeof(soc_compr_dyn_ops));

	} else

		memcpy(compr->ops, &soc_compr_ops, sizeof(soc_compr_ops));



	/* Add copy callback for not memory mapped DSPs */

sound/soc/soc-dapm.c

+6 −5
Original line number Diff line number Diff line
@@ -2476,7 +2476,8 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm, 
}



static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm,

				  const struct snd_soc_dapm_route *route)

				  const struct snd_soc_dapm_route *route,

				  unsigned int is_prefixed)

{

	struct snd_soc_dapm_widget *wsource = NULL, *wsink = NULL, *w;

	struct snd_soc_dapm_widget *wtsource = NULL, *wtsink = NULL;
@@ -2486,7 +2487,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, 
	char prefixed_source[80];

	int ret;



	if (dapm->codec && dapm->codec->name_prefix) {

	if (dapm->codec && dapm->codec->name_prefix && !is_prefixed) {

		snprintf(prefixed_sink, sizeof(prefixed_sink), "%s %s",

			 dapm->codec->name_prefix, route->sink);

		sink = prefixed_sink;
@@ -2614,7 +2615,7 @@ int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm, 


	mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_INIT);

	for (i = 0; i < num; i++) {

		r = snd_soc_dapm_add_route(dapm, route);

		r = snd_soc_dapm_add_route(dapm, route, false);

		if (r < 0) {

			dev_err(dapm->dev, "ASoC: Failed to add route %s -> %s -> %s\n",

				route->source,
@@ -3670,7 +3671,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) 
				cpu_dai->codec->name, r.source,

				codec_dai->platform->name, r.sink);



			snd_soc_dapm_add_route(&card->dapm, &r);

			snd_soc_dapm_add_route(&card->dapm, &r, true);

		}



		/* connect BE DAI capture if widgets are valid */
@@ -3681,7 +3682,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) 
				codec_dai->codec->name, r.source,

				cpu_dai->platform->name, r.sink);



			snd_soc_dapm_add_route(&card->dapm, &r);

			snd_soc_dapm_add_route(&card->dapm, &r, true);

		}



	}

sound/soc/soc-generic-dmaengine-pcm.c

+6 −3
Original line number Diff line number Diff line
@@ -176,17 +176,20 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel( 
{

	struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);

	struct snd_dmaengine_dai_dma_data *dma_data;

	dma_filter_fn fn = NULL;



	dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);



	if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])

		return pcm->chan[0];



	if (pcm->config->compat_request_channel)

	if (pcm->config && pcm->config->compat_request_channel)

		return pcm->config->compat_request_channel(rtd, substream);



	return snd_dmaengine_pcm_request_channel(pcm->config->compat_filter_fn,

						 dma_data->filter_data);

	if (pcm->config)

		fn = pcm->config->compat_filter_fn;



	return snd_dmaengine_pcm_request_channel(fn, dma_data->filter_data);

}



static bool dmaengine_pcm_can_report_residue(struct dma_chan *chan)