Unverified Commit 3202e2f5 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Revert PCM trigger changes 



These have turned up some issues in further testing.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 52c64e5f

include/sound/soc-dpcm.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -101,8 +101,6 @@ struct snd_soc_dpcm_runtime { 
	enum snd_soc_dpcm_state state;

	enum snd_soc_dpcm_state state;





	int trigger_pending; /* trigger cmd + 1 if pending, 0 if not */

	int trigger_pending; /* trigger cmd + 1 if pending, 0 if not */



	int be_start; /* refcount protected by dpcm_lock */

};

};





#define for_each_dpcm_fe(be, stream, _dpcm)				\

#define for_each_dpcm_fe(be, stream, _dpcm)				\

sound/soc/soc-pcm.c

+23 −128
Original line number Original line Diff line number Diff line
@@ -1534,7 +1534,7 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream) 
			be->dpcm[stream].state = SND_SOC_DPCM_STATE_CLOSE;

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

			goto unwind;

			goto unwind;

		}

		}

		be->dpcm[stream].be_start = 0;



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

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

		count++;

		count++;

	}

	}
@@ -1999,9 +1999,6 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, 
	struct snd_soc_pcm_runtime *be;

	struct snd_soc_pcm_runtime *be;

	struct snd_soc_dpcm *dpcm;

	struct snd_soc_dpcm *dpcm;

	int ret = 0;

	int ret = 0;

	unsigned long flags;

	enum snd_soc_dpcm_state state;

	bool do_trigger;





	for_each_dpcm_be(fe, stream, dpcm) {

	for_each_dpcm_be(fe, stream, dpcm) {

		struct snd_pcm_substream *be_substream;

		struct snd_pcm_substream *be_substream;
@@ -2016,180 +2013,78 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, 
		dev_dbg(be->dev, "ASoC: trigger BE %s cmd %d\n",

		dev_dbg(be->dev, "ASoC: trigger BE %s cmd %d\n",

			be->dai_link->name, cmd);

			be->dai_link->name, cmd);





		do_trigger = false;

		switch (cmd) {

		switch (cmd) {

		case SNDRV_PCM_TRIGGER_START:

		case SNDRV_PCM_TRIGGER_START:

			spin_lock_irqsave(&fe->card->dpcm_lock, flags);

			if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_PREPARE) &&

			if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_PREPARE) &&

			    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) &&

			    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) &&

			    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED)) {

			    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED))

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				continue;

			}

			state = be->dpcm[stream].state;

			if (be->dpcm[stream].be_start == 0)

				do_trigger = true;

			be->dpcm[stream].be_start++;

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

			spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);



			if (!do_trigger)

				continue;

				continue;





			ret = soc_pcm_trigger(be_substream, cmd);

			ret = soc_pcm_trigger(be_substream, cmd);

			if (ret) {

			if (ret)

				spin_lock_irqsave(&fe->card->dpcm_lock, flags);

				be->dpcm[stream].state = state;

				be->dpcm[stream].be_start--;

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				goto end;

				goto end;

			}





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

			break;

			break;

		case SNDRV_PCM_TRIGGER_RESUME:

		case SNDRV_PCM_TRIGGER_RESUME:

			spin_lock_irqsave(&fe->card->dpcm_lock, flags);

			if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND))

			if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND) {

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				continue;

			}



			state = be->dpcm[stream].state;

			if (be->dpcm[stream].be_start == 0)

				do_trigger = true;

			be->dpcm[stream].be_start++;

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

			spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);



			if (!do_trigger)

				continue;

				continue;





			ret = soc_pcm_trigger(be_substream, cmd);

			ret = soc_pcm_trigger(be_substream, cmd);

			if (ret) {

			if (ret)

				spin_lock_irqsave(&fe->card->dpcm_lock, flags);

				be->dpcm[stream].state = state;

				be->dpcm[stream].be_start--;

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				goto end;

				goto end;

			}





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

			break;

			break;

		case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

		case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:

			spin_lock_irqsave(&fe->card->dpcm_lock, flags);

			if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED))

			if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED) {

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				continue;

			}



			state = be->dpcm[stream].state;

			if (be->dpcm[stream].be_start == 0)

				do_trigger = true;

			be->dpcm[stream].be_start++;

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

			spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);



			if (!do_trigger)

				continue;

				continue;





			ret = soc_pcm_trigger(be_substream, cmd);

			ret = soc_pcm_trigger(be_substream, cmd);

			if (ret) {

			if (ret)

				spin_lock_irqsave(&fe->card->dpcm_lock, flags);

				be->dpcm[stream].state = state;

				be->dpcm[stream].be_start--;

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				goto end;

				goto end;

			}





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

			break;

			break;

		case SNDRV_PCM_TRIGGER_STOP:

		case SNDRV_PCM_TRIGGER_STOP:

			spin_lock_irqsave(&fe->card->dpcm_lock, flags);

			if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) &&

			if ((be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) &&

			    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED)) {

			    (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED))

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				continue;

				continue;

			}

			if ((be->dpcm[stream].state == SND_SOC_DPCM_STATE_START &&

			     be->dpcm[stream].be_start == 1) ||

			    (be->dpcm[stream].state == SND_SOC_DPCM_STATE_PAUSED &&

			     be->dpcm[stream].be_start == 0))

				do_trigger = true;

			be->dpcm[stream].be_start--;

			spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);





			if (!do_trigger)

			if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream))

				continue;

				continue;





			spin_lock_irqsave(&fe->card->dpcm_lock, flags);

			state = be->dpcm[stream].state;

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

			spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);



			ret = soc_pcm_trigger(be_substream, cmd);

			ret = soc_pcm_trigger(be_substream, cmd);

			if (ret) {

			if (ret)

				spin_lock_irqsave(&fe->card->dpcm_lock, flags);

				be->dpcm[stream].state = state;

				be->dpcm[stream].be_start++;

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				goto end;

				goto end;

			}





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

			break;

			break;

		case SNDRV_PCM_TRIGGER_SUSPEND:

		case SNDRV_PCM_TRIGGER_SUSPEND:

			spin_lock_irqsave(&fe->card->dpcm_lock, flags);

			if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START)

			if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) {

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				continue;

				continue;

			}

			if (be->dpcm[stream].be_start == 1)

				do_trigger = true;

			be->dpcm[stream].be_start--;

			spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);





			if (!do_trigger)

			if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream))

				continue;

				continue;





			spin_lock_irqsave(&fe->card->dpcm_lock, flags);

			state = be->dpcm[stream].state;

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

			spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);



			ret = soc_pcm_trigger(be_substream, cmd);

			ret = soc_pcm_trigger(be_substream, cmd);

			if (ret) {

			if (ret)

				spin_lock_irqsave(&fe->card->dpcm_lock, flags);

				be->dpcm[stream].state = state;

				be->dpcm[stream].be_start++;

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				goto end;

				goto end;

			}





			be->dpcm[stream].state = SND_SOC_DPCM_STATE_SUSPEND;

			break;

			break;

		case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

		case SNDRV_PCM_TRIGGER_PAUSE_PUSH:

			spin_lock_irqsave(&fe->card->dpcm_lock, flags);

			if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START)

			if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) {

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				continue;

				continue;

			}

			if (be->dpcm[stream].be_start == 1)

				do_trigger = true;

			be->dpcm[stream].be_start--;

			spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);





			if (!do_trigger)

			if (!snd_soc_dpcm_can_be_free_stop(fe, be, stream))

				continue;

				continue;





			spin_lock_irqsave(&fe->card->dpcm_lock, flags);

			state = be->dpcm[stream].state;

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

			spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);



			ret = soc_pcm_trigger(be_substream, cmd);

			ret = soc_pcm_trigger(be_substream, cmd);

			if (ret) {

			if (ret)

				spin_lock_irqsave(&fe->card->dpcm_lock, flags);

				be->dpcm[stream].state = state;

				be->dpcm[stream].be_start++;

				spin_unlock_irqrestore(&fe->card->dpcm_lock, flags);

				goto end;

				goto end;

			}





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

			break;

			break;

		}

		}

	}

	}