diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2017-10-12 16:59:58 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2017-10-12 17:00:13 +0300 |
| commit | 805efbb11cf3e4982da201e86c72f238d47f2bc4 (patch) | |
| tree | 4a54419f5361d245163617861b85a717c81c4ccd /src/modules | |
| parent | ca63fbc1d806e63e083cb700567f15066ecfdc07 (diff) | |
| download | pulseaudio-805efbb11cf3e4982da201e86c72f238d47f2bc4.tar.gz | |
Revert "alsa-mixer: fix speaker output on a couple of Asus EeePC machines"
This reverts commit ca63fbc1d806e63e083cb700567f15066ecfdc07.
I applied the patch too hastily. force-speaker.conf is supposed to be
used only when the alsa mixer doesn't contain any elements that would
indicate the existence of a speaker port, but the reverted patch is a
workaround for a different problem. On the two affected EeePC machines
the Headphone element needs to be unmuted when using speakers. The
analog-output-speaker-always path happens to do that, but that's
unintentional. analog-output-speaker was changed[1] to mute the
headphone output when using the speaker port, and
analog-output-speaker-always should have been changed too, but that was
forgotten.
The kernel driver is buggy if it has a Headphone mixer element that
mutes both headphones and speakers, so this should be fixed in alsa. If
we end up having a workaround in PulseAudio for the broken driver, it
should be implemented with a new profile set and path configuration
files.
[1] https://cgit.freedesktop.org/pulseaudio/pulseaudio/commit/?id=22aac4e9fdb3786178f7815a0cb2150f588b1582
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules index ae3f34c28..2392ca507 100644 --- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules +++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules @@ -24,7 +24,6 @@ SUBSYSTEMS=="platform", DRIVERS=="thinkpad_acpi", ENV{PULSE_IGNORE}="1" # Force enable speaker and internal mic for some laptops # This should only be necessary for kernels 3.3, 3.4 and 3.5 (as they are lacking the phantom jack kctls). -# For the Asus EeePCs also with newer kernels (tested with 4.9). # Acer AOA150 ATTRS{subsystem_vendor}=="0x1025", ATTRS{subsystem_device}=="0x015b", ENV{PULSE_PROFILE_SET}="force-speaker-and-int-mic.conf" # Acer Aspire 4810TZ @@ -69,10 +68,6 @@ ATTRS{subsystem_vendor}=="0x1028", ATTRS{subsystem_device}=="0x0558", ENV{PULSE_ ATTRS{subsystem_vendor}=="0x1028", ATTRS{subsystem_device}=="0x0579", ENV{PULSE_PROFILE_SET}="force-speaker-and-int-mic.conf" # Asus 904HA (1000H) ATTRS{subsystem_vendor}=="0x1043", ATTRS{subsystem_device}=="0x831a", ENV{PULSE_PROFILE_SET}="force-speaker-and-int-mic.conf" -# Asus EeePC R11CX -ATTRS{subsystem_vendor}=="0x1043", ATTRS{subsystem_device}=="0x8516", ENV{PULSE_PROFILE_SET}="force-speaker.conf" -# Asus EeePC R011PX -ATTRS{subsystem_vendor}=="0x1043", ATTRS{subsystem_device}=="0x8437", ENV{PULSE_PROFILE_SET}="force-speaker.conf" # Asus T101MT ATTRS{subsystem_vendor}=="0x1043", ATTRS{subsystem_device}=="0x83ce", ENV{PULSE_PROFILE_SET}="force-speaker-and-int-mic.conf" # Sony Vaio VGN-SR21M |