From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [RFC PATCH 2/4] ALSA: core: add .notify callback for pcm ops
Date: Wed, 8 Jul 2015 05:10:34 -0500 [thread overview]
Message-ID: <1436350236-17509-3-git-send-email-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <1436350236-17509-1-git-send-email-pierre-louis.bossart@linux.intel.com>
When appl_ptr is updated let low-level driver know.
This is only enabled when the NO_REWIND hardware flag is used,
so that the low-level driver/hardware to opportunistically pre-fetch
data.
FIXME: should we rely on .ack for this?
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
include/sound/pcm.h | 2 ++
sound/core/pcm_native.c | 18 +++++++++++++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 25310b7..d5eff03 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -87,6 +87,8 @@ struct snd_pcm_ops {
unsigned long offset);
int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
int (*ack)(struct snd_pcm_substream *substream);
+ int (*notify)(struct snd_pcm_substream *substream);
+ /* FIXME: what's the difference between ack and notify ? */
};
/*
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index a70e52d..dd519b8 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -2565,6 +2565,10 @@ static snd_pcm_sframes_t snd_pcm_playback_forward(struct snd_pcm_substream *subs
appl_ptr -= runtime->boundary;
runtime->control->appl_ptr = appl_ptr;
ret = frames;
+
+ if (runtime->no_rewinds && substream->ops->notify)
+ substream->ops->notify(substream);
+
__end:
snd_pcm_stream_unlock_irq(substream);
return ret;
@@ -2614,6 +2618,10 @@ static snd_pcm_sframes_t snd_pcm_capture_forward(struct snd_pcm_substream *subst
appl_ptr -= runtime->boundary;
runtime->control->appl_ptr = appl_ptr;
ret = frames;
+
+ if (runtime->no_rewinds && substream->ops->notify)
+ substream->ops->notify(substream);
+
__end:
snd_pcm_stream_unlock_irq(substream);
return ret;
@@ -2713,8 +2721,16 @@ static int snd_pcm_sync_ptr(struct snd_pcm_substream *substream,
return err;
}
snd_pcm_stream_lock_irq(substream);
- if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_APPL))
+ if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_APPL)) {
+ /* FIXME: this code is used by mmap_commit, should it handle boundary
+ * wrap-around as done for read/write in pcm_lib.c
+ */
+
control->appl_ptr = sync_ptr.c.control.appl_ptr;
+ /* if supported, let low-level driver know about appl_ptr change */
+ if (runtime->no_rewinds && substream->ops->notify)
+ substream->ops->notify(substream);
+ }
else
sync_ptr.c.control.appl_ptr = control->appl_ptr;
if (!(sync_ptr.flags & SNDRV_PCM_SYNC_PTR_AVAIL_MIN))
--
1.9.1
next prev parent reply other threads:[~2015-07-08 10:10 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-08 10:10 [RFC PATCH 0/4] better support for bursty DMA usages Pierre-Louis Bossart
2015-07-08 10:10 ` [RFC PATCH 1/4] ALSA: core: let low-level driver or userspace disable rewinds Pierre-Louis Bossart
2015-07-08 14:21 ` Takashi Iwai
2015-07-08 16:58 ` Pierre-Louis Bossart
2015-07-11 17:06 ` Alexander E. Patrakov
2015-07-14 3:32 ` Raymond Yau
2015-07-14 17:39 ` Alexander E. Patrakov
2015-07-15 1:23 ` Raymond Yau
2015-07-15 4:51 ` Alexander E. Patrakov
2015-07-28 14:19 ` Pierre-Louis Bossart
2015-07-28 15:43 ` Alexander E. Patrakov
2015-07-29 17:46 ` Pierre-Louis Bossart
2015-07-30 6:11 ` Alexander E. Patrakov
2015-07-30 13:46 ` Pierre-Louis Bossart
2015-07-08 10:10 ` Pierre-Louis Bossart [this message]
2015-07-08 14:27 ` [RFC PATCH 2/4] ALSA: core: add .notify callback for pcm ops Takashi Iwai
2015-07-08 17:10 ` Pierre-Louis Bossart
2015-07-09 14:44 ` Takashi Iwai
2015-07-09 7:25 ` Raymond Yau
2015-07-09 7:35 ` Pierre-Louis Bossart
2015-07-08 10:10 ` [RFC PATCH 3/4] ALSA: core: add report of max dma burst Pierre-Louis Bossart
2015-07-08 14:37 ` Takashi Iwai
2015-07-08 17:46 ` Pierre-Louis Bossart
2015-07-10 2:35 ` Raymond Yau
2015-07-10 17:13 ` Lars-Peter Clausen
2015-07-11 17:46 ` Alexander E. Patrakov
2015-07-11 18:28 ` Jaroslav Kysela
2015-07-16 2:11 ` Raymond Yau
2015-07-08 10:10 ` [RFC PATCH 4/4] ALSA: hda: add default value for max_dma_burst Pierre-Louis Bossart
2015-07-08 14:31 ` [RFC PATCH 0/4] better support for bursty DMA usages Takashi Iwai
2015-07-08 17:50 ` Pierre-Louis Bossart
2015-07-15 10:14 ` Raymond Yau
2015-07-15 10:38 ` Alexander E. Patrakov
2015-07-22 14:44 ` Raymond Yau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436350236-17509-3-git-send-email-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.