ALSA: dice: 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-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 c9e19bddfc09e812085a5771b3f3b7db876ceaac..69c3c06bd7aa5ae0038a001f080005b95d34ed44 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);
+       err = snd_dice_stream_reserve_duplex(dice, 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 94a4dccfc381b9ed5b76a810597843b9cc9c4768..570456a7751d9453bc717c447fc4e9f214b649f1 100644 (file)
--- a/sound/firewire/dice/dice-pcm.c
+++ b/sound/firewire/dice/dice-pcm.c
@@ -243,9 +243,14 @@ 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);
 
                mutex_lock(&dice->mutex);
-               err = snd_dice_stream_reserve_duplex(dice, rate);
+               // For double_pcm_frame quirk.
+               if (rate > 96000)
+                       events_per_period /= 2;
+               err = snd_dice_stream_reserve_duplex(dice, rate,
+                                                    events_per_period);
                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 f6a8627ae5a2b0ce417ecddda9485dae93630629..ef36bf588d11789bcba44eb79a2c0ac6b289b4c9 100644 (file)
--- a/sound/firewire/dice/dice-stream.c
+++ b/sound/firewire/dice/dice-stream.c
@@ -278,7 +278,8 @@ static void finish_session(struct snd_dice *dice, struct reg_params *tx_params,
        snd_dice_transaction_clear_enable(dice);
 }
 
-int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate)
+int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate,
+                                  unsigned int events_per_period)
 {
        unsigned int curr_rate;
        int err;
@@ -324,6 +325,11 @@ int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate)
                                          &rx_params);
                if (err < 0)
                        goto error;
+
+               err = amdtp_domain_set_events_per_period(&dice->domain,
+                                                        events_per_period);
+               if (err < 0)
+                       goto error;
        }
 
        return 0;

diff --git a/sound/firewire/dice/dice.h b/sound/firewire/dice/dice.h
index fa6d74303f54c578142d6f2d9cc216374a1eed38..1f9e3502974e3094224b6b7635ff82cba0779cde 100644 (file)
--- a/sound/firewire/dice/dice.h
+++ b/sound/firewire/dice/dice.h
@@ -210,7 +210,8 @@ int snd_dice_stream_start_duplex(struct snd_dice *dice);
 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);
+int snd_dice_stream_reserve_duplex(struct snd_dice *dice, unsigned int rate,
+                                  unsigned int events_per_period);
 void snd_dice_stream_update_duplex(struct snd_dice *dice);
 int snd_dice_stream_detect_current_formats(struct snd_dice *dice);