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

Commit 1c54d0d9 authored by Vinod Koul's avatar Vinod Koul Committed by Greg Kroah-Hartman
Browse files

ALSA: compress: fix partial_drain completion state 



[ Upstream commit f79a732a8325dfbd570d87f1435019d7e5501c6d ]

On partial_drain completion we should be in SNDRV_PCM_STATE_RUNNING
state, so set that for partially draining streams in
snd_compr_drain_notify() and use a flag for partially draining streams

While at it, add locks for stream state change in
snd_compr_drain_notify() as well.

Fixes: f44f2a54 ("ALSA: compress: fix drain calls blocking other compress functions (v6)")
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Tested-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Link: https://lore.kernel.org/r/20200629134737.105993-4-vkoul@kernel.org


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 175b5aa7

include/sound/compress_driver.h

+9 −1
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ struct snd_compr_runtime { 
 * @direction: stream direction, playback/recording

 * @direction: stream direction, playback/recording

 * @metadata_set: metadata set flag, true when set

 * @metadata_set: metadata set flag, true when set

 * @next_track: has userspace signal next track transition, true when set

 * @next_track: has userspace signal next track transition, true when set

 * @partial_drain: undergoing partial_drain for stream, true when set

 * @private_data: pointer to DSP private data

 * @private_data: pointer to DSP private data

 */

 */

struct snd_compr_stream {

struct snd_compr_stream {
@@ -70,6 +71,7 @@ struct snd_compr_stream { 
	enum snd_compr_direction direction;

	enum snd_compr_direction direction;

	bool metadata_set;

	bool metadata_set;

	bool next_track;

	bool next_track;

	bool partial_drain;

	void *private_data;

	void *private_data;

};

};
@@ -173,7 +175,13 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) 
	if (snd_BUG_ON(!stream))

	if (snd_BUG_ON(!stream))

		return;

		return;





	/* for partial_drain case we are back to running state on success */

	if (stream->partial_drain) {

		stream->runtime->state = SNDRV_PCM_STATE_RUNNING;

		stream->partial_drain = false; /* clear this flag as well */

	} else {

		stream->runtime->state = SNDRV_PCM_STATE_SETUP;

		stream->runtime->state = SNDRV_PCM_STATE_SETUP;

	}





	wake_up(&stream->runtime->sleep);

	wake_up(&stream->runtime->sleep);

}

}

sound/core/compress_offload.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -722,6 +722,9 @@ static int snd_compr_stop(struct snd_compr_stream *stream) 




	retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_STOP);

	retval = stream->ops->trigger(stream, SNDRV_PCM_TRIGGER_STOP);

	if (!retval) {

	if (!retval) {

		/* clear flags and stop any drain wait */

		stream->partial_drain = false;

		stream->metadata_set = false;

		snd_compr_drain_notify(stream);

		snd_compr_drain_notify(stream);

		stream->runtime->total_bytes_available = 0;

		stream->runtime->total_bytes_available = 0;

		stream->runtime->total_bytes_transferred = 0;

		stream->runtime->total_bytes_transferred = 0;
@@ -879,6 +882,7 @@ static int snd_compr_partial_drain(struct snd_compr_stream *stream) 
	if (stream->next_track == false)

	if (stream->next_track == false)

		return -EPERM;

		return -EPERM;





	stream->partial_drain = true;

	retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_PARTIAL_DRAIN);

	retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_PARTIAL_DRAIN);

	if (retval) {

	if (retval) {

		pr_debug("Partial drain returned failure\n");

		pr_debug("Partial drain returned failure\n");