ALSA: firewire-motu: register the size of PCM period to AMDTP domain

This commit is a preparation to share the size of PCM period between
PCM substreams on AMDTP streams in the same domain. At this time,
the size of PCM period in PCM substream which starts AMDTP streams in the
same domain is recorded.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20191007110532.30270-9-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/motu/motu-midi.c b/sound/firewire/motu/motu-midi.c
index 46a0035df31e5ea573df1af852bed26c92024fd9..997dd6c8ec319db06569d9e31d638fc9e36317bf 100644 (file)
--- a/sound/firewire/motu/motu-midi.c
+++ b/sound/firewire/motu/motu-midi.c
@@ -17,7 +17,7 @@ static int midi_open(struct snd_rawmidi_substream *substream)
 
        mutex_lock(&motu->mutex);
 
-       err = snd_motu_stream_reserve_duplex(motu, 0);
+       err = snd_motu_stream_reserve_duplex(motu, 0, 0);
        if (err >= 0) {
                ++motu->substreams_counter;
                err = snd_motu_stream_start_duplex(motu);

diff --git a/sound/firewire/motu/motu-pcm.c b/sound/firewire/motu/motu-pcm.c
index aa2e584da6fe65bdbf37576ea9718807f8066343..9a54c562494b348ae37d9552ffaed64840ef001b 100644 (file)
--- a/sound/firewire/motu/motu-pcm.c
+++ b/sound/firewire/motu/motu-pcm.c
@@ -202,9 +202,11 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
 
        if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {
                unsigned int rate = params_rate(hw_params);
+               unsigned int frames_per_period = params_period_size(hw_params);
 
                mutex_lock(&motu->mutex);
-               err = snd_motu_stream_reserve_duplex(motu, rate);
+               err = snd_motu_stream_reserve_duplex(motu, rate,
+                                                    frames_per_period);
                if (err >= 0)
                        ++motu->substreams_counter;
                mutex_unlock(&motu->mutex);

diff --git a/sound/firewire/motu/motu-stream.c b/sound/firewire/motu/motu-stream.c
index 813e38e6a86ec87ee7b797f2186d664212276979..52b7c375bb0bd203c5f920eaa3b612a53136e1b3 100644 (file)
--- a/sound/firewire/motu/motu-stream.c
+++ b/sound/firewire/motu/motu-stream.c
@@ -133,7 +133,8 @@ int snd_motu_stream_cache_packet_formats(struct snd_motu *motu)
        return 0;
 }
 
-int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate)
+int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate,
+                                  unsigned int frames_per_period)
 {
        unsigned int curr_rate;
        int err;
@@ -171,6 +172,14 @@ int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate)
                        fw_iso_resources_free(&motu->tx_resources);
                        return err;
                }
+
+               err = amdtp_domain_set_events_per_period(&motu->domain,
+                                                        frames_per_period);
+               if (err < 0) {
+                       fw_iso_resources_free(&motu->tx_resources);
+                       fw_iso_resources_free(&motu->rx_resources);
+                       return err;
+               }
        }
 
        return 0;

diff --git a/sound/firewire/motu/motu.h b/sound/firewire/motu/motu.h
index 350ee2c16f4a89f9c29dad04aff17d626e4b266a..a419e6e7daed19bfde622634ca4845c3e52ae092 100644 (file)
--- a/sound/firewire/motu/motu.h
+++ b/sound/firewire/motu/motu.h
@@ -154,7 +154,8 @@ void snd_motu_transaction_unregister(struct snd_motu *motu);
 int snd_motu_stream_init_duplex(struct snd_motu *motu);
 void snd_motu_stream_destroy_duplex(struct snd_motu *motu);
 int snd_motu_stream_cache_packet_formats(struct snd_motu *motu);
-int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate);
+int snd_motu_stream_reserve_duplex(struct snd_motu *motu, unsigned int rate,
+                                  unsigned int frames_per_period);
 int snd_motu_stream_start_duplex(struct snd_motu *motu);
 void snd_motu_stream_stop_duplex(struct snd_motu *motu);
 int snd_motu_stream_lock_try(struct snd_motu *motu);