Takashi Iwai
75216f4ef8
- Backport various upstream fixes for PCM (bnc#979702): 0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch 0002-pcm-Clean-up-error-paths-in-snd_pcm_plugin_-helpers.patch 0003-pcm-Fallback-open-as-the-first-instance-for-dmix-co.patch 0004-pcm-softvol-fix-conversion-of-TLVs-min_db-and-max_dB.patch 0005-pcm-Fix-suspend-resume-regression-with-dmix-co.patch 0006-pcm-dmix-Fix-doubly-resume-of-slave-PCM.patch OBS-URL: https://build.opensuse.org/request/show/395038 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=196
136 lines
4.7 KiB
Diff
136 lines
4.7 KiB
Diff
From 7c424edd116e76eee6218a1e9a6ff6c4daaf2a4d Mon Sep 17 00:00:00 2001
|
|
From: Shengjiu Wang <shengjiu.wang@freescale.com>
|
|
Date: Wed, 6 Apr 2016 19:02:12 +0800
|
|
Subject: [PATCH] pcm_plugin: fix appl pointer not correct when mmap_commit()
|
|
return error
|
|
|
|
When snd_pcm_mmap_commit() return error, the appl pointer is also updated.
|
|
which cause the avail_update()'s result wrong.
|
|
This patch move the snd_pcm_mmap_appl_forward() to the place when
|
|
snd_pcm_mmap_commit() is successfully returned.
|
|
|
|
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_plugin.c | 48 ++++++++++++++++++++++++++++++++----------------
|
|
1 file changed, 32 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
|
|
index d007e8c8bd4a..940491dbc84b 100644
|
|
--- a/src/pcm/pcm_plugin.c
|
|
+++ b/src/pcm/pcm_plugin.c
|
|
@@ -279,18 +279,22 @@ static snd_pcm_sframes_t snd_pcm_plugin_write_areas(snd_pcm_t *pcm,
|
|
return -EPIPE;
|
|
}
|
|
snd_atomic_write_begin(&plugin->watom);
|
|
- snd_pcm_mmap_appl_forward(pcm, frames);
|
|
result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames);
|
|
if (result > 0 && (snd_pcm_uframes_t)result != slave_frames) {
|
|
snd_pcm_sframes_t res;
|
|
res = plugin->undo_write(pcm, slave_areas, slave_offset + result, slave_frames, slave_frames - result);
|
|
- if (res < 0)
|
|
+ if (res < 0) {
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
return xfer > 0 ? (snd_pcm_sframes_t)xfer : res;
|
|
+ }
|
|
frames -= res;
|
|
}
|
|
- snd_atomic_write_end(&plugin->watom);
|
|
- if (result <= 0)
|
|
+ if (result <= 0) {
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
|
|
+ }
|
|
+ snd_pcm_mmap_appl_forward(pcm, frames);
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
offset += frames;
|
|
xfer += frames;
|
|
size -= frames;
|
|
@@ -325,19 +329,23 @@ static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm,
|
|
return -EPIPE;
|
|
}
|
|
snd_atomic_write_begin(&plugin->watom);
|
|
- snd_pcm_mmap_appl_forward(pcm, frames);
|
|
result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames);
|
|
if (result > 0 && (snd_pcm_uframes_t)result != slave_frames) {
|
|
snd_pcm_sframes_t res;
|
|
|
|
res = plugin->undo_read(slave, areas, offset, frames, slave_frames - result);
|
|
- if (res < 0)
|
|
+ if (res < 0) {
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
return xfer > 0 ? (snd_pcm_sframes_t)xfer : res;
|
|
+ }
|
|
frames -= res;
|
|
}
|
|
- snd_atomic_write_end(&plugin->watom);
|
|
- if (result <= 0)
|
|
+ if (result <= 0) {
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
|
|
+ }
|
|
+ snd_pcm_mmap_appl_forward(pcm, frames);
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
offset += frames;
|
|
xfer += frames;
|
|
size -= frames;
|
|
@@ -423,19 +431,23 @@ snd_pcm_plugin_mmap_commit(snd_pcm_t *pcm,
|
|
frames = plugin->write(pcm, areas, appl_offset, frames,
|
|
slave_areas, slave_offset, &slave_frames);
|
|
snd_atomic_write_begin(&plugin->watom);
|
|
- snd_pcm_mmap_appl_forward(pcm, frames);
|
|
result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames);
|
|
- snd_atomic_write_end(&plugin->watom);
|
|
if (result > 0 && (snd_pcm_uframes_t)result != slave_frames) {
|
|
snd_pcm_sframes_t res;
|
|
|
|
res = plugin->undo_write(pcm, slave_areas, slave_offset + result, slave_frames, slave_frames - result);
|
|
- if (res < 0)
|
|
+ if (res < 0) {
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
return xfer > 0 ? xfer : res;
|
|
+ }
|
|
frames -= res;
|
|
}
|
|
- if (result <= 0)
|
|
+ if (result <= 0) {
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
return xfer > 0 ? xfer : result;
|
|
+ }
|
|
+ snd_pcm_mmap_appl_forward(pcm, frames);
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
if (frames == cont)
|
|
appl_offset = 0;
|
|
else
|
|
@@ -490,19 +502,23 @@ static snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm)
|
|
frames = (plugin->read)(pcm, areas, hw_offset, frames,
|
|
slave_areas, slave_offset, &slave_frames);
|
|
snd_atomic_write_begin(&plugin->watom);
|
|
- snd_pcm_mmap_hw_forward(pcm, frames);
|
|
result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames);
|
|
- snd_atomic_write_end(&plugin->watom);
|
|
if (result > 0 && (snd_pcm_uframes_t)result != slave_frames) {
|
|
snd_pcm_sframes_t res;
|
|
|
|
res = plugin->undo_read(slave, areas, hw_offset, frames, slave_frames - result);
|
|
- if (res < 0)
|
|
+ if (res < 0) {
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
return xfer > 0 ? (snd_pcm_sframes_t)xfer : res;
|
|
+ }
|
|
frames -= res;
|
|
}
|
|
- if (result <= 0)
|
|
+ if (result <= 0) {
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
return xfer > 0 ? (snd_pcm_sframes_t)xfer : result;
|
|
+ }
|
|
+ snd_pcm_mmap_hw_forward(pcm, frames);
|
|
+ snd_atomic_write_end(&plugin->watom);
|
|
if (frames == cont)
|
|
hw_offset = 0;
|
|
else
|
|
--
|
|
2.8.2
|
|
|