ALSA: dice: share PCM buffer size for both direction

This commit allows ALSA dice driver to share PCM buffer size for both
capture and playback PCM substream. When AMDTP domain starts for one
of the PCM substream, buffer size of the PCM substream is stores to
AMDTP domain structure. Some AMDTP streams have already run with the
buffer size when another PCM substream starts, therefore the PCM
substream has a constraint to its buffer size.

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

diff --git a/sound/firewire/dice/dice-midi.c b/sound/firewire/dice/dice-midi.c
index 69c3c06bd7aa5ae0038a001f080005b95d34ed44..4c2998034313587ac8a53f18ad708db6fb32e4a7 100644 (file)
--- a/sound/firewire/dice/dice-midi.c
+++ b/sound/firewire/dice/dice-midi.c
@@ -17,7 +17,7 @@ static int midi_open(struct snd_rawmidi_substream *substream)
 
        mutex_lock(&dice->mutex);
 
-       err = snd_dice_stream_reserve_duplex(dice, 0, 0);
+       err = snd_dice_stream_reserve_duplex(dice, 0, 0, 0);
        if (err >= 0) {
                ++dice->substreams_counter;
                err = snd_dice_stream_start_duplex(dice);

diff --git a/sound/firewire/dice/dice-pcm.c b/sound/firewire/dice/dice-pcm.c
index 813c9ffbeced65fe61a15977d23309778f4aa0c5..7c0c34c5bd4791371977f539f7984fb0aa6cfc9a 100644 (file)
--- a/sound/firewire/dice/dice-pcm.c
+++ b/sound/firewire/dice/dice-pcm.c
@@ -204,6 +204,7 @@ static int pcm_open(struct snd_pcm_substream *substream)
        if (!internal ||
            (dice->substreams_counter > 0 && d->events_per_period > 0)) {
                unsigned int frames_per_period = d->events_per_period;
+               unsigned int frames_per_buffer = d->events_per_buffer;
                unsigned int rate;
 
                err = snd_dice_transaction_get_rate(dice, &rate);
@@ -217,8 +218,10 @@ static int pcm_open(struct snd_pcm_substream *substream)
 
                if (frames_per_period > 0) {
                        // For double_pcm_frame quirk.
-                       if (rate > 96000)
+                       if (rate > 96000) {
                                frames_per_period *= 2;
+                               frames_per_buffer *= 2;
+                       }
 
                        err = snd_pcm_hw_constraint_minmax(substream->runtime,
                                        SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
@@ -227,6 +230,14 @@ static int pcm_open(struct snd_pcm_substream *substream)
                                mutex_unlock(&dice->mutex);
                                goto err_locked;
                        }
+
+                       err = snd_pcm_hw_constraint_minmax(substream->runtime,
+                                       SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
+                                       frames_per_buffer, frames_per_buffer);
+                       if (err < 0) {
+                               mutex_unlock(&dice->mutex);
+                               goto err_locked;
+                       }
                }
        }
 
@@ -263,13 +274,16 @@ 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 events_per_period = params_period_size(hw_params);
+               unsigned int events_per_buffer = params_buffer_size(hw_params);
 
                mutex_lock(&dice->mutex);
                // For double_pcm_frame quirk.
-               if (rate > 96000)
+               if (rate > 96000) {
                        events_per_period /= 2;
+                       events_per_buffer /= 2;
+               }
                err = snd_dice_stream_reserve_duplex(dice, rate,
-                                                    events_per_period);
+                                       events_per_period, events_per_buffer);
                if (err >= 0)
                        ++dice->substreams_counter;
                mutex_unlock(&dice->mutex);

diff --git a/sound/firewire/dice/dice-stream.c b/sound/firewire/dice/dice-stream.c
index b4ef08bd7e8f4aaa325512a28fc9b141bf0ddc10..0cff346e805264b3e4807bc2686ce5b540ef4c95 100644 (file)
--- a/sound/firewire/dice/dice-stream.c
+++ b/sound/firewire/dice/dice-stream.c
@@ -279,7 +279,8 @@ static void finish_session(struct snd_dice *dice, struct reg_params *tx_params,
 }
 
 int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate,
-                                  unsigned int events_per_period)
+                                  unsigned int events_per_period,
+                                  unsigned int events_per_buffer)
 {
        unsigned int curr_rate;
        int err;
@@ -327,7 +328,7 @@ int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate,
                        goto error;
 
                err = amdtp_domain_set_events_per_period(&dice->domain,
-                                                        events_per_period, 0);
+                                       events_per_period, events_per_buffer);
                if (err < 0)
                        goto error;
        }

diff --git a/sound/firewire/dice/dice.h b/sound/firewire/dice/dice.h
index 1f9e3502974e3094224b6b7635ff82cba0779cde..16366773e22e841915df733874ab01009e99d14f 100644 (file)
--- a/sound/firewire/dice/dice.h
+++ b/sound/firewire/dice/dice.h
@@ -211,7 +211,8 @@ void snd_dice_stream_stop_duplex(struct snd_dice *dice);
 int snd_dice_stream_init_duplex(struct snd_dice *dice);
 void snd_dice_stream_destroy_duplex(struct snd_dice *dice);
 int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate,
-                                  unsigned int events_per_period);
+                                  unsigned int events_per_period,
+                                  unsigned int events_per_buffer);
 void snd_dice_stream_update_duplex(struct snd_dice *dice);
 int snd_dice_stream_detect_current_formats(struct snd_dice *dice);