renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-12 07:34:08 +08:00
Code

staging: bcm2835-audio: Fix incorrect draining handling

Browse Source 
The handling of SNDRV_PCM_TRIGGER_STOP at the trigger callback is
incorrect: when the STOP is issued, the driver is supposed to drop the
stream immediately.  Meanwhile bcm2835 driver checks the DRAINING
state and tries to issue some different command.

This patch straightens things a bit, dropping the incorrect state
checks.  The draining behavior would be still not perfect at this
point, but will be improved in a later patch.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Takashi Iwai 2018-09-04 17:58:38 +02:00 committed by Greg Kroah-Hartman
parent c5e7824b57
commit bf1ad3e007
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
View File

@ -153,7 +153,6 @@ static int snd_bcm2835_playback_open_generic(
chip->alsa_stream[idx] = alsa_stream;
chip->opened |= (1 << idx);
alsa_stream->draining = 1;
out:
mutex_unlock(&chip->audio_mutex);
@ -268,6 +267,7 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
alsa_stream->buffer_size = snd_pcm_lib_buffer_bytes(substream);
alsa_stream->period_size = snd_pcm_lib_period_bytes(substream);
alsa_stream->pos = 0;
alsa_stream->draining = false;
audio_debug("buffer_size=%d, period_size=%d pos=%d frame_bits=%d\n",
alsa_stream->buffer_size, alsa_stream->period_size,
@ -312,21 +312,15 @@ static int snd_bcm2835_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
err = bcm2835_audio_start(alsa_stream);
if (!err)
alsa_stream->draining = 1;
else
if (err)
audio_error(" Failed to START alsa device (%d)\n", err);
break;
case SNDRV_PCM_TRIGGER_DRAIN:
alsa_stream->draining = true;
break;
case SNDRV_PCM_TRIGGER_STOP:
if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
audio_info("DRAINING\n");
alsa_stream->draining = 1;
} else {
audio_info("DROPPING\n");
alsa_stream->draining = 0;
}
err = bcm2835_audio_stop(alsa_stream);
if (err != 0)
if (err)
audio_error(" Failed to STOP alsa device (%d)\n", err);
break;
default: