ALSA: usb-audio: Add quirk for Logitech PRO X 2 LIGHTSPEED
PATCH v4 1/1 ALSA: usb-audio: Add quirk for Logitech PRO X 2 LIGHTSPEED
The UAC mixer of Logitech PRO X 2 LIGHTSPEED works fine except that its volume GET_CUR method returns sticky values.
Since commit 86aa1ea1f15c
("ALSA: usb-audio: Do not expose sticky mixers"), the sticky check considers the mixer to be sticky and unnecessarily disables the mixer.
Add QUIRK_FLAG_MIXER_GET_CUR_BROKEN for Logitech PRO X 2 LIGHTSPEED (046d:0af7) to address this.
Compiled and tested on 7.2-rc5
---
Output with quirk enabled:
usb 3-2.1: New USB device found, idVendor=046d, idProduct=0af7, bcdDevice= 1.00
usb 3-2.1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
usb 3-2.1: Product: PRO X 2 LIGHTSPEED
usb 3-2.1: Manufacturer: Logitech
usb 3-2.1: SerialNumber: 0000000000000000
input: Logitech PRO X 2 LIGHTSPEED Consumer Control as /devices/pci0000:00/0000:00:08.1/0000:07:00.4/usb3/3-2/3-2.1/3-2.1:1.3/0003:046D:0AF7.0003/input/input6
input: Logitech PRO X 2 LIGHTSPEED as /devices/pci0000:00/0000:00:08.1/0000:07:00.4/usb3/3-2/3-2.1/3-2.1:1.3/0003:046D:0AF7.0003/input/input7
input: Logitech PRO X 2 LIGHTSPEED as /devices/pci0000:00/0000:00:08.1/0000:07:00.4/usb3/3-2/3-2.1/3-2.1:1.3/0003:046D:0AF7.0003/input/input8 usb 3-2.1: 2:0: broken mixer GET_CUR (-18944/0/256 => -2662)
usb 3-2.1: 6:0: broken mixer GET_CUR (-18944/0/256 => 0)
Changes in v2:
- Commmit message missed the version I compiled and tested it on.
- I forgot to add v2 to the patch.
Changes in v3:
- I included the wrong patchfile in which I forgot a comma. I did compile the correct fix but just to be sure I recompiled and tested the change again.
Changes in v4:
I don't know how that file deletion was added to the patch. I removed it, recompiled and tested again.
Hopefully this is okay now.
--- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+)
sound/usb/quirks.c +2 -0
@@ -2251,6 +2251,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {DEVICE_FLG (0x046d ,0x0a8f ,/* Logitech H390 headset */ QUIRK_FLAG_CTL_MSG_DELAY_1M |QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE ), +DEVICE_FLG (0x046d ,0x0af7 ,/* Logitech PRO X 2 LIGHTSPEED */ +QUIRK_FLAG_MIXER_GET_CUR_BROKEN ),DEVICE_FLG (0x0499 ,0x1506 ,/* Yamaha THR5 */ QUIRK_FLAG_GENERIC_IMPLICIT_FB ), DEVICE_FLG(0x0499, 0x1509, /* Steinberg UR22 */
base-commit: f5098b6bae761e346ebcd9da7f95622c04733cff
Signature · 1 line
2.55.0
Quoted 4 lines · Brian van den Berg
The UAC mixer of Logitech PRO X 2 LIGHTSPEED works fine except that its volume
GET_CURmethod returns sticky values.
Quoted 8 lines
Since commit
86aa1ea1f15c
("ALSA: usb-audio: Do not expose sticky mixers"), the sticky check considers the mixer to be sticky and unnecessarily disables the mixer.Add
QUIRK_FLAG_MIXER_GET_CUR_BROKENfor Logitech PRO X 2 LIGHTSPEED (046d:0af7) to address this.Compiled and tested on 7.2-rc5
There is a first time for everything. Happy to have helped with your first submission. The description still seems a bit vague to me as I do not have the mixer. Maybe there is a better way to phrase it. But I will leave this up to Takashi and Jaroslav. Hopefully next time you get most things right on the V1 ;)
Quoted 50 lines
Signed-off-by Brian van den Berg <[email protected]>---
Output with quirk enabled:usb 3-2.1: New USB device found, idVendor=046d, idProduct=0af7, bcdDevice= 1.00
usb 3-2.1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
usb 3-2.1: Product: PRO X 2 LIGHTSPEED
usb 3-2.1: Manufacturer: Logitech
usb 3-2.1: SerialNumber: 0000000000000000
input: Logitech PRO X 2 LIGHTSPEED Consumer Control as /devices/pci0000:00/0000:00:08.1/0000:07:00.4/usb3/3-2/3-2.1/3-2.1:1.3/0003:046D:0AF7.0003/input/input6
input: Logitech PRO X 2 LIGHTSPEED as /devices/pci0000:00/0000:00:08.1/0000:07:00.4/usb3/3-2/3-2.1/3-2.1:1.3/0003:046D:0AF7.0003/input/input7
input: Logitech PRO X 2 LIGHTSPEED as /devices/pci0000:00/0000:00:08.1/0000:07:00.4/usb3/3-2/3-2.1/3-2.1:1.3/0003:046D:0AF7.0003/input/input8 usb 3-2.1: 2:0: broken mixerGET_CUR(-18944/0/256 => -2662)
usb 3-2.1: 6:0: broken mixerGET_CUR(-18944/0/256 => 0)Changes in v2:
- Commmit message missed the version I compiled and tested it on.
- I forgot to add v2 to the patch.
Changes in v3:
- I included the wrong patchfile in which I forgot a comma. I did compile the correct fix but just to be sure I recompiled and tested the change again.
Changes in v4:
I don't know how that file deletion was added to the patch. I removed it, recompiled and tested again.
Hopefully this is okay now.--- sound/usb/quirks.c | 2 ++ 1 file changed, 2 insertions(+)sound/usb/quirks.c +2
-0@@ -2251,6 +2251,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {DEVICE_FLG (0x046d ,0x0a8f ,/* Logitech H390 headset */ QUIRK_FLAG_CTL_MSG_DELAY_1M |QUIRK_FLAG_MIXER_PLAYBACK_MIN_MUTE ), +DEVICE_FLG (0x046d ,0x0af7 ,/* Logitech PRO X 2 LIGHTSPEED */ +QUIRK_FLAG_MIXER_GET_CUR_BROKEN ),DEVICE_FLG (0x0499 ,0x1506 ,/* Yamaha THR5 */ QUIRK_FLAG_GENERIC_IMPLICIT_FB ), DEVICE_FLG(0x0499, 0x1509, /* Steinberg UR22 */base-commit:
f5098b6bae761e346ebcd9da7f95622c04733cff--
2.55.0
Quoted 15 lines · Antheas Kapenekakis
Quoted 4 lines · Brian van den Berg
The UAC mixer of Logitech PRO X 2 LIGHTSPEED works fine except that its volume
GET_CURmethod returns sticky values.Quoted 8 lines
Since commit
86aa1ea1f15c
("ALSA: usb-audio: Do not expose sticky mixers"), the sticky check considers the mixer to be sticky and unnecessarily disables the mixer.Add
QUIRK_FLAG_MIXER_GET_CUR_BROKENfor Logitech PRO X 2 LIGHTSPEED (046d:0af7) to address this.Compiled and tested on 7.2-rc5
Quoted 9 lines
There is a first time for everything. Happy to have helped with your first submission. The description still seems a bit vague to me as I do not have the mixer. Maybe there is a better way to phrase it. But I will leave this up to Takashi and Jaroslav. Hopefully next time you get most things right on the V1 ;)
Reviewed-by Antheas Kapenekakis <[email protected]>Quoted 1 line
Signed-off-by Brian van den Berg <[email protected]>
FYI, somehow this mail thread didn't reach to my inbox directly, so I took another fix from Rong already now -- which is the very same fix.
Takashi