diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2021-10-28 22:03:25 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-10-28 17:33:11 +0200 |
| commit | cddcd5472abb7b8a9c37ccbcf0908b79740a01b5 (patch) | |
| tree | 75f78075ef4e548a50bc8b9fa7aa50617b5f7718 /sound/firewire/oxfw/oxfw-stream.c | |
| parent | 407359d44ed33974137b9158da356d53f999dcf2 (diff) | |
| download | linux-stable-cddcd5472abb7b8a9c37ccbcf0908b79740a01b5.tar.gz linux-stable-cddcd5472abb7b8a9c37ccbcf0908b79740a01b5.tar.bz2 linux-stable-cddcd5472abb7b8a9c37ccbcf0908b79740a01b5.zip | |
ALSA: oxfw: fix functional regression for Mackie Onyx 1640i in v5.14 or later
A user reports functional regression for Mackie Onyx 1640i that the device
generates slow sound with ALSA oxfw driver which supports media clock
recovery. Although the device is based on OXFW971 ASIC, it does not
transfer isochronous packet with own event frequency as expected. The
device seems to adjust event frequency according to events in received
isochronous packets in the beginning of packet streaming. This is
unknown quirk.
This commit fixes the regression to turn the recovery off in driver
side. As a result, nominal frequency is used in duplex packet streaming
between device and driver. For stability of sampling rate in events of
transferred isochronous packet, 4,000 isochronous packets are skipped
in the beginning of packet streaming.
Reference: https://github.com/takaswie/snd-firewire-improve/issues/38
Fixes: 029ffc429440 ("ALSA: oxfw: perform sequence replay for media clock recovery")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20211028130325.45772-1-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/oxfw/oxfw-stream.c')
| -rw-r--r-- | sound/firewire/oxfw/oxfw-stream.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/firewire/oxfw/oxfw-stream.c b/sound/firewire/oxfw/oxfw-stream.c index fff18b5d4e05..f4a702def397 100644 --- a/sound/firewire/oxfw/oxfw-stream.c +++ b/sound/firewire/oxfw/oxfw-stream.c @@ -9,7 +9,7 @@ #include <linux/delay.h> #define AVC_GENERIC_FRAME_MAXIMUM_BYTES 512 -#define READY_TIMEOUT_MS 200 +#define READY_TIMEOUT_MS 600 /* * According to datasheet of Oxford Semiconductor: @@ -367,6 +367,11 @@ int snd_oxfw_stream_start_duplex(struct snd_oxfw *oxfw) // Just after changing sampling transfer frequency, many cycles are // skipped for packet transmission. tx_init_skip_cycles = 400; + } else if (oxfw->quirks & SND_OXFW_QUIRK_VOLUNTARY_RECOVERY) { + // It takes a bit time for target device to adjust event frequency + // according to nominal event frequency in isochronous packets from + // ALSA oxfw driver. + tx_init_skip_cycles = 4000; } else { replay_seq = true; } |