aboutsummaryrefslogtreecommitdiff
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2019-06-17 17:15:09 +0900
committerTakashi Iwai <tiwai@suse.de>2019-06-18 08:45:32 +0200
commit2d103420c6eae2ef7d464798242f0d5283526054 (patch)
tree86d8c63d8eff73c55ca06368b6c5f0be463c89ae /sound/firewire
parent8edc56ec8f14a586a55b2ab2fda76e6bf4738ee6 (diff)
downloadlinux-stericsson-2d103420c6eae2ef7d464798242f0d5283526054.tar.gz
ALSA: firewire-motu: update isochronous resources when starting packet streaming after bus-reset
After bus reset, isochronous resource manager releases all of allocated isochronous resources. The nodes to transfer isochronous packet should request reallocation of the resources. However, between the bus-reset and invocation of 'struct fw_driver.update' handler, ALSA PCM application can detect this situation by XRUN because the target device cancelled to transmit packets once bus-reset occurs. Due to the above mechanism, ALSA fireface driver just stops packet streaming in the update handler, thus pcm.prepare handler should request the reallocation. This commit requests the reallocation in pcm.prepare callback when bus generation is changed. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/motu/motu-stream.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/firewire/motu/motu-stream.c b/sound/firewire/motu/motu-stream.c
index 5630a8f1f2f1..82891583b736 100644
--- a/sound/firewire/motu/motu-stream.c
+++ b/sound/firewire/motu/motu-stream.c
@@ -236,6 +236,7 @@ static int ensure_packet_formats(struct snd_motu *motu)
int snd_motu_stream_start_duplex(struct snd_motu *motu)
{
+ unsigned int generation = motu->rx_resources.generation;
int err = 0;
if (motu->substreams_counter == 0)
@@ -245,6 +246,16 @@ int snd_motu_stream_start_duplex(struct snd_motu *motu)
amdtp_streaming_error(&motu->tx_stream))
finish_session(motu);
+ if (generation != fw_parent_device(motu->unit)->card->generation) {
+ err = fw_iso_resources_update(&motu->rx_resources);
+ if (err < 0)
+ return err;
+
+ err = fw_iso_resources_update(&motu->tx_resources);
+ if (err < 0)
+ return err;
+ }
+
if (!amdtp_stream_running(&motu->rx_stream)) {
err = ensure_packet_formats(motu);
if (err < 0)