ALSA: firewire-digi00x: 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-7-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/digi00x/digi00x-midi.c b/sound/firewire/digi00x/digi00x-midi.c
index 2b57ece891018814e69868396df6f48db0ee1253..a407e795d8e7f6f0a410ce2863e1bc6c3efddbfb 100644 (file)
--- a/sound/firewire/digi00x/digi00x-midi.c
+++ b/sound/firewire/digi00x/digi00x-midi.c
@@ -17,7 +17,7 @@ static int midi_open(struct snd_rawmidi_substream *substream)
                return err;
 
        mutex_lock(&dg00x->mutex);
-       err = snd_dg00x_stream_reserve_duplex(dg00x, 0);
+       err = snd_dg00x_stream_reserve_duplex(dg00x, 0, 0);
        if (err >= 0) {
                ++dg00x->substreams_counter;
                err = snd_dg00x_stream_start_duplex(dg00x);

diff --git a/sound/firewire/digi00x/digi00x-pcm.c b/sound/firewire/digi00x/digi00x-pcm.c
index 18e561b26625d63fed15b1a0a2eee555c486fe11..9ced309d61facb9824fc3e0d49ad119e012110a8 100644 (file)
--- a/sound/firewire/digi00x/digi00x-pcm.c
+++ b/sound/firewire/digi00x/digi00x-pcm.c
@@ -167,9 +167,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(&dg00x->mutex);
-               err = snd_dg00x_stream_reserve_duplex(dg00x, rate);
+               err = snd_dg00x_stream_reserve_duplex(dg00x, rate,
+                                                     frames_per_period);
                if (err >= 0)
                        ++dg00x->substreams_counter;
                mutex_unlock(&dg00x->mutex);

diff --git a/sound/firewire/digi00x/digi00x-stream.c b/sound/firewire/digi00x/digi00x-stream.c
index d6a92460060f649eb7f006e4215a4dd36fdee855..96d331e47b0781c9544b10fabc8f626fd2fb25f2 100644 (file)
--- a/sound/firewire/digi00x/digi00x-stream.c
+++ b/sound/firewire/digi00x/digi00x-stream.c
@@ -283,7 +283,8 @@ void snd_dg00x_stream_destroy_duplex(struct snd_dg00x *dg00x)
        destroy_stream(dg00x, &dg00x->tx_stream);
 }
 
-int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate)
+int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate,
+                                   unsigned int frames_per_period)
 {
        unsigned int curr_rate;
        int err;
@@ -315,6 +316,14 @@ int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate)
                        fw_iso_resources_free(&dg00x->rx_resources);
                        return err;
                }
+
+               err = amdtp_domain_set_events_per_period(&dg00x->domain,
+                                                        frames_per_period);
+               if (err < 0) {
+                       fw_iso_resources_free(&dg00x->rx_resources);
+                       fw_iso_resources_free(&dg00x->tx_resources);
+                       return err;
+               }
        }
 
        return 0;

diff --git a/sound/firewire/digi00x/digi00x.h b/sound/firewire/digi00x/digi00x.h
index 8041c65f27362ef0db2d2c4122e1981a479444d1..d9369428256812dcccab653e24f1a58b413363f9 100644 (file)
--- a/sound/firewire/digi00x/digi00x.h
+++ b/sound/firewire/digi00x/digi00x.h
@@ -141,7 +141,8 @@ int snd_dg00x_stream_get_clock(struct snd_dg00x *dg00x,
 int snd_dg00x_stream_check_external_clock(struct snd_dg00x *dg00x,
                                          bool *detect);
 int snd_dg00x_stream_init_duplex(struct snd_dg00x *dg00x);
-int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate);
+int snd_dg00x_stream_reserve_duplex(struct snd_dg00x *dg00x, unsigned int rate,
+                                   unsigned int frames_per_period);
 int snd_dg00x_stream_start_duplex(struct snd_dg00x *dg00x);
 void snd_dg00x_stream_stop_duplex(struct snd_dg00x *dg00x);
 void snd_dg00x_stream_update_duplex(struct snd_dg00x *dg00x);