Skip to content

Commit 2c3ca8c

Browse files
Cryolitiatiwai
authored andcommitted
ALSA: usb-audio: move mixer_quirks' min_mute into common quirk
We have found more and more devices that have the same problem, that the mixer's minimum value is muted. Accroding to pipewire's MR[1] and Arch Linux wiki[2], this should be a very common problem in USB audio devices. Move the quirk into common quirk,as a preparation of more devices' quirk's patch coming on the road[3]. 1. https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2514 2. https://wiki.archlinux.org/index.php?title=PipeWire&oldid=804138#No_sound_from_USB_DAC_until_30%_volume 3. On the road, in the physical sense. We have been buying ton of these devices for testing the problem. Tested-by: Guoli An <[email protected]> Signed-off-by: Cryolitia PukNgae <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 051b02b commit 2c3ca8c

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

sound/usb/mixer_quirks.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4608,16 +4608,12 @@ void snd_usb_mixer_fu_apply_quirk(struct usb_mixer_interface *mixer,
46084608
if (unitid == 7 && cval->control == UAC_FU_VOLUME)
46094609
snd_dragonfly_quirk_db_scale(mixer, cval, kctl);
46104610
break;
4611+
}
4612+
46114613
/* lowest playback value is muted on some devices */
4612-
case USB_ID(0x0572, 0x1b09): /* Conexant Systems (Rockwell), Inc. */
4613-
case USB_ID(0x0d8c, 0x000c): /* C-Media */
4614-
case USB_ID(0x0d8c, 0x0014): /* C-Media */
4615-
case USB_ID(0x19f7, 0x0003): /* RODE NT-USB */
4616-
case USB_ID(0x2d99, 0x0026): /* HECATE G2 GAMING HEADSET */
4614+
if (mixer->chip->quirk_flags & QUIRK_FLAG_MIXER_MIN_MUTE)
46174615
if (strstr(kctl->id.name, "Playback"))
46184616
cval->min_mute = 1;
4619-
break;
4620-
}
46214617

46224618
/* ALSA-ify some Plantronics headset control names */
46234619
if (USB_ID_VENDOR(mixer->chip->usb_id) == 0x047f &&

sound/usb/quirks.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
21992199
QUIRK_FLAG_SET_IFACE_FIRST),
22002200
DEVICE_FLG(0x0556, 0x0014, /* Phoenix Audio TMX320VC */
22012201
QUIRK_FLAG_GET_SAMPLE_RATE),
2202+
DEVICE_FLG(0x0572, 0x1b09, /* Conexant Systems (Rockwell), Inc. */
2203+
QUIRK_FLAG_MIXER_MIN_MUTE),
22022204
DEVICE_FLG(0x05a3, 0x9420, /* ELP HD USB Camera */
22032205
QUIRK_FLAG_GET_SAMPLE_RATE),
22042206
DEVICE_FLG(0x05a7, 0x1020, /* Bose Companion 5 */
@@ -2245,8 +2247,10 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
22452247
QUIRK_FLAG_GET_SAMPLE_RATE),
22462248
DEVICE_FLG(0x0c45, 0x636b, /* Microdia JP001 USB Camera */
22472249
QUIRK_FLAG_GET_SAMPLE_RATE),
2248-
DEVICE_FLG(0x0d8c, 0x0014, /* USB Audio Device */
2249-
QUIRK_FLAG_CTL_MSG_DELAY_1M),
2250+
DEVICE_FLG(0x0d8c, 0x000c, /* C-Media */
2251+
QUIRK_FLAG_MIXER_MIN_MUTE),
2252+
DEVICE_FLG(0x0d8c, 0x0014, /* C-Media */
2253+
QUIRK_FLAG_CTL_MSG_DELAY_1M | QUIRK_FLAG_MIXER_MIN_MUTE),
22502254
DEVICE_FLG(0x0ecb, 0x205c, /* JBL Quantum610 Wireless */
22512255
QUIRK_FLAG_FIXED_RATE),
22522256
DEVICE_FLG(0x0ecb, 0x2069, /* JBL Quantum810 Wireless */
@@ -2293,6 +2297,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
22932297
QUIRK_FLAG_ITF_USB_DSD_DAC | QUIRK_FLAG_CTL_MSG_DELAY),
22942298
DEVICE_FLG(0x1901, 0x0191, /* GE B850V3 CP2114 audio interface */
22952299
QUIRK_FLAG_GET_SAMPLE_RATE),
2300+
DEVICE_FLG(0x19f7, 0x0003, /* RODE NT-USB */
2301+
QUIRK_FLAG_MIXER_MIN_MUTE),
22962302
DEVICE_FLG(0x19f7, 0x0035, /* RODE NT-USB+ */
22972303
QUIRK_FLAG_GET_SAMPLE_RATE),
22982304
DEVICE_FLG(0x1bcf, 0x2281, /* HD Webcam */
@@ -2353,6 +2359,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
23532359
QUIRK_FLAG_CTL_MSG_DELAY_1M),
23542360
DEVICE_FLG(0x2d95, 0x8021, /* VIVO USB-C-XE710 HEADSET */
23552361
QUIRK_FLAG_CTL_MSG_DELAY_1M),
2362+
DEVICE_FLG(0x2d99, 0x0026, /* HECATE G2 GAMING HEADSET */
2363+
QUIRK_FLAG_MIXER_MIN_MUTE),
23562364
DEVICE_FLG(0x2fc6, 0xf0b7, /* iBasso DC07 Pro */
23572365
QUIRK_FLAG_CTL_MSG_DELAY_1M),
23582366
DEVICE_FLG(0x30be, 0x0101, /* Schiit Hel */

sound/usb/usbaudio.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,9 @@ extern bool snd_usb_skip_validation;
196196
* for the given endpoint.
197197
* QUIRK_FLAG_MIC_RES_16 and QUIRK_FLAG_MIC_RES_384
198198
* Set the fixed resolution for Mic Capture Volume (mostly for webcams)
199+
* QUIRK_FLAG_MIXER_MIN_MUTE
200+
* Set minimum volume control value as mute for devices where the lowest
201+
* playback value represents muted state instead of minimum audible volume
199202
*/
200203

201204
#define QUIRK_FLAG_GET_SAMPLE_RATE (1U << 0)
@@ -222,5 +225,6 @@ extern bool snd_usb_skip_validation;
222225
#define QUIRK_FLAG_FIXED_RATE (1U << 21)
223226
#define QUIRK_FLAG_MIC_RES_16 (1U << 22)
224227
#define QUIRK_FLAG_MIC_RES_384 (1U << 23)
228+
#define QUIRK_FLAG_MIXER_MIN_MUTE (1U << 24)
225229

226230
#endif /* __USBAUDIO_H */

0 commit comments

Comments
 (0)