diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2021-05-20 13:01:54 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-05-20 14:01:17 +0200 |
| commit | bdaedca74d6293b6ac643a8ebe8231b52bf1171b (patch) | |
| tree | 3d7d64b6ed2b6111aec0f12f289e702d18e320ae /sound/firewire/tascam | |
| parent | 9b1fcd9bf802062c1b6c325b7762f4ecdc59f309 (diff) | |
| download | linux-bdaedca74d6293b6ac643a8ebe8231b52bf1171b.tar.bz2 | |
ALSA: firewire-lib: change waking up timing to process packets
When starting AMDTP domain, tasks in process context yields running CPU
till all of isochronous context get callback, with an assumption that
it's OK to process content of packet.
However several isochronous cycles are skipped to transfer rx packets, or
the content of rx packets are dropped, to manage the timing to start
processing the packets.
This commit changes the timing for tasks in process context to wake up
when processing content of packet is actually ready.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210520040154.80450-9-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/tascam')
| -rw-r--r-- | sound/firewire/tascam/tascam-stream.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/firewire/tascam/tascam-stream.c b/sound/firewire/tascam/tascam-stream.c index eb07e1decf9b..296ecf5f6ddc 100644 --- a/sound/firewire/tascam/tascam-stream.c +++ b/sound/firewire/tascam/tascam-stream.c @@ -11,7 +11,7 @@ #define CLOCK_STATUS_MASK 0xffff0000 #define CLOCK_CONFIG_MASK 0x0000ffff -#define CALLBACK_TIMEOUT 500 +#define READY_TIMEOUT_MS 500 static int get_clock(struct snd_tscm *tscm, u32 *data) { @@ -477,10 +477,7 @@ int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate) if (err < 0) return err; - if (!amdtp_stream_wait_callback(&tscm->rx_stream, - CALLBACK_TIMEOUT) || - !amdtp_stream_wait_callback(&tscm->tx_stream, - CALLBACK_TIMEOUT)) { + if (!amdtp_domain_wait_ready(&tscm->domain, READY_TIMEOUT_MS)) { err = -ETIMEDOUT; goto error; } |