ALSA: oxfw: use the same size of period for PCM substream in AMDTP streams

In current implementation, when opening a PCM substream, it's needed to
check whether the opposite PCM substream runs. This is to assign
effectual constraints (e.g. sampling rate) to opened PCM substream.

The number of PCM substreams and MIDI substreams on AMDTP streams in
domain is recorded in own structure. Usage of this count is an
alternative of the above check. This is better because the count is
incremented in pcm.hw_params earlier than pcm.trigger.

This idea has one issue because it's incremented for MIDI substreams as
well. In current implementation, for a case that any MIDI substream run
and a PCM substream is going to start, PCM application to start the PCM
substream can decide hardware parameters by restart packet streaming.
Just checking the substream count can brings regression.

Now AMDTP domain structure has a member for the size of PCM period in
PCM substream which starts AMDTP streams in domain. When the value has
zero and the substream count is greater than 1, it means that any MIDI
substream starts AMDTP streams in domain. Usage of the value can resolve
the above issue.

This commit replaces the check with the substream count and the value for
the size of PCM period.

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

diff --git a/sound/firewire/oxfw/oxfw-pcm.c b/sound/firewire/oxfw/oxfw-pcm.c
index 2d1b5038f7f64acfee53c1d74359948e010c92f8..f3e25898d27076a2a9900743b66a8ee4d70f5b84 100644 (file)
--- a/sound/firewire/oxfw/oxfw-pcm.c
+++ b/sound/firewire/oxfw/oxfw-pcm.c
@@ -170,30 +170,47 @@ end:
 static int pcm_open(struct snd_pcm_substream *substream)
 {
        struct snd_oxfw *oxfw = substream->private_data;
+       struct amdtp_domain *d = &oxfw->domain;
        int err;
 
        err = snd_oxfw_stream_lock_try(oxfw);
        if (err < 0)
-               goto end;
+               return err;
 
        err = init_hw_params(oxfw, substream);
        if (err < 0)
                goto err_locked;
 
-       /*
-        * When any PCM streams are already running, the available sampling
-        * rate is limited at current value.
-        */
-       if (amdtp_stream_pcm_running(&oxfw->tx_stream) ||
-           amdtp_stream_pcm_running(&oxfw->rx_stream)) {
+       mutex_lock(&oxfw->mutex);
+
+       // When source of clock is not internal or any stream is reserved for
+       // transmission of PCM frames, the available sampling rate is limited
+       // at current one.
+       if (oxfw->substreams_count > 0 && d->events_per_period > 0) {
+               unsigned int frames_per_period = d->events_per_period;
+
                err = limit_to_current_params(substream);
-               if (err < 0)
-                       goto end;
+               if (err < 0) {
+                       mutex_unlock(&oxfw->mutex);
+                       goto err_locked;
+               }
+
+               if (frames_per_period > 0) {
+                       err = snd_pcm_hw_constraint_minmax(substream->runtime,
+                                       SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
+                                       frames_per_period, frames_per_period);
+                       if (err < 0) {
+                               mutex_unlock(&oxfw->mutex);
+                               goto err_locked;
+                       }
+               }
        }
 
+       mutex_unlock(&oxfw->mutex);
+
        snd_pcm_set_sync(substream);
-end:
-       return err;
+
+       return 0;
 err_locked:
        snd_oxfw_stream_lock_release(oxfw);
        return err;