Skip to content

audio/pcm: skip period_elapsed for streams that are not started #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vakarux12 wants to merge 2 commits into
base: aur
Choose a base branch
from
Open

audio/pcm: skip period_elapsed for streams that are not started #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78908b5
audio/pcm: skip period_elapsed for streams that are not started
Vakarux12 Jun 29, 2026
218ead9
audio/pcm: defer stop_io to workqueue to fix deadlock on PREEMPT kernels
Vakarux12 Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions audio/audio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ struct aaudio_subdevice {
bool is_pcm;
struct snd_pcm *pcm;
struct snd_jack *jack;
struct work_struct stop_work;
};
struct aaudio_alsa_pcm_id_mapping {
const char *name;
Expand Down
16 changes: 14 additions & 2 deletions audio/pcm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "pcm.h"
#include "audio.h"
#include <linux/workqueue.h>

static u64 aaudio_get_alsa_fmtbit(struct aaudio_apple_description *desc)
{
Expand Down Expand Up @@ -178,23 +179,29 @@ static void aaudio_pcm_start(struct snd_pcm_substream *substream)
pr_debug("aaudio: Started the audio device in %lluns\n", ktime_to_ns(time_end - time_start));
}

static void aaudio_pcm_stop_work(struct work_struct *work)
{
struct aaudio_subdevice *sdev = container_of(work, struct aaudio_subdevice, stop_work);
aaudio_cmd_stop_io(sdev->a, sdev->dev_id);
}

static int aaudio_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
{
struct aaudio_subdevice *sdev = snd_pcm_substream_chip(substream);
struct aaudio_stream *stream = aaudio_pcm_stream(substream);
pr_debug("aaudio_pcm_trigger %x\n", cmd);

/* We only supports triggers on the #0 buffer */
if (substream->number != 0)
return 0;
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
cancel_work_sync(&sdev->stop_work);
aaudio_pcm_start(substream);
stream->started = 1;
break;
case SNDRV_PCM_TRIGGER_STOP:
aaudio_cmd_stop_io(sdev->a, sdev->dev_id);
stream->started = 0;
schedule_work(&sdev->stop_work);
break;
default:
return -EINVAL;
Expand Down Expand Up @@ -265,6 +272,7 @@ int aaudio_create_pcm(struct aaudio_subdevice *sdev)
}
if (!id_mapping->name)
sdev->alsa_id = sdev->a->next_alsa_id++;
INIT_WORK(&sdev->stop_work, aaudio_pcm_stop_work);
err = snd_pcm_new(sdev->a->card, sdev->uid, sdev->alsa_id,
(int) sdev->out_stream_cnt, (int) sdev->in_stream_cnt, &pcm);
if (err < 0)
Expand All @@ -285,6 +293,10 @@ static void aaudio_handle_stream_timestamp(struct snd_pcm_substream *substream,

stream = aaudio_pcm_stream(substream);
snd_pcm_stream_lock_irqsave(substream, flags);
if (!stream->started) {
snd_pcm_stream_unlock_irqrestore(substream, flags);
return;
}
stream->remote_timestamp = timestamp;
if (stream->waiting_for_first_ts) {
stream->waiting_for_first_ts = false;
Expand Down