Repository navigation
Commit 41ceafb
committed
Reject capture-tagged boost controls in ALSA volume auto-detection
- `_has_playback_volume()` accepts a bare `volume` capability (in addition
to `pvolume`) to support TAS58xx-based amplifier HATs, whose output PGA
is playback-only and reports `Capabilities: volume` rather than
`pvolume`. But ALSA also tags bidirectional analog gain stages with bare
`volume` when a codec driver registers them via SOC_SINGLE_TLV /
SOC_DOUBLE_TLV without a "Playback"/"Capture" qualifier in the control
name. Those are capture-side gain stages, disconnected from the playback
chain, and were being misdetected as playback-volume elements.
- Concrete case: Realtek RT5616 analog codec (FriendlyElec NanoPC-T6,
RK3588). Its "ADC Boost", "IN1 Boost", and "IN2 Boost" controls each
report bare `volume` with *both* a `Playback channels:` and a `Capture
channels:` line. "ADC Boost" enumerates before the real playback
elements in `scontrols` order, and none of RT5616's genuine playback
controls (DAC1/HP/OUT) match `_PREFERRED_ELEMENTS`
(Digital/Master/PCM) — so `find_mixer_element()` returned "ADC Boost".
Hardware-volume mode then silently adjusted an unused capture boost
stage with zero audible effect on playback loudness.
- Fix: only accept a bare `volume` / `volume-joined` match when the
element's `sget` output has no `Capture channels:` line, i.e. it is
genuinely output-only (the real TAS58xx case). The `pvolume` branch is
an unambiguous true positive and is left unchanged. With this, RT5616
correctly falls back to DAC1 (the first genuine pvolume element in
enumeration order). The existing TAS58xx fixtures have no `Capture
channels:` line and remain detected.
Assisted-by: Claude Opus 4.8 <noreply@anthropic.com>1 parent 511645a commit 41ceafb
2 files changed
Lines changed: 156 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
102 | 112 | | |
103 | 113 | | |
104 | 114 | | |
| |||
116 | 126 | | |
117 | 127 | | |
118 | 128 | | |
119 | | - | |
120 | | - | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
121 | 134 | | |
122 | 135 | | |
123 | 136 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
| |||
634 | 635 | | |
635 | 636 | | |
636 | 637 | | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
| 653 | + | |
| 654 | + | |
| 655 | + | |
| 656 | + | |
| 657 | + | |
| 658 | + | |
| 659 | + | |
| 660 | + | |
| 661 | + | |
| 662 | + | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
| 672 | + | |
| 673 | + | |
| 674 | + | |
| 675 | + | |
| 676 | + | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
| 686 | + | |
| 687 | + | |
| 688 | + | |
| 689 | + | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
| 705 | + | |
| 706 | + | |
| 707 | + | |
| 708 | + | |
| 709 | + | |
| 710 | + | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
| 721 | + | |
| 722 | + | |
| 723 | + | |
| 724 | + | |
| 725 | + | |
| 726 | + | |
| 727 | + | |
| 728 | + | |
| 729 | + | |
| 730 | + | |
| 731 | + | |
| 732 | + | |
| 733 | + | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
| 737 | + | |
| 738 | + | |
| 739 | + | |
| 740 | + | |
| 741 | + | |
| 742 | + | |
| 743 | + | |
| 744 | + | |
| 745 | + | |
| 746 | + | |
| 747 | + | |
| 748 | + | |
| 749 | + | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
| 755 | + | |
| 756 | + | |
| 757 | + | |
| 758 | + | |
| 759 | + | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
| 767 | + | |
| 768 | + | |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
0 commit comments