Attachment 900961 Details for Bug 1095750 – backport of configuration changes needed

[patch] backport of configuration changes needed

fix-hdmi.patch (text/plain), 18.20 KB, created by Ray Strode [halfline] on 2014-05-30 20:15:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ray Strode [halfline]

Created: 2014-05-30 20:15:55 UTC

Size: 18.20 KB

patch

obsolete

>From c1c191f770fbe62c4c2572dd721862ac4e69e176 Mon Sep 17 00:00:00 2001
>From: David Henningsson <david.henningsson@canonical.com>
>Date: Thu, 23 Feb 2012 07:17:03 +0100
>Subject: [PATCH 1/2] alsa: Add port information to HDMI profiles
>
>For Nvidia and Intel, support probing of up to four HDMI devices.
>Also add port information to all HDMI profiles.
>
>Signed-off-by: David Henningsson <david.henningsson@canonical.com>
>---
> src/Makefile.am                                    |   5 +
> src/modules/alsa/mixer/paths/hdmi-output-0.conf    |   6 +
> src/modules/alsa/mixer/paths/hdmi-output-1.conf    |   6 +
> src/modules/alsa/mixer/paths/hdmi-output-2.conf    |   6 +
> src/modules/alsa/mixer/paths/hdmi-output-3.conf    |   6 +
> .../alsa/mixer/profile-sets/90-pulseaudio.rules    |   8 +-
> src/modules/alsa/mixer/profile-sets/default.conf   |   1 +
> .../alsa/mixer/profile-sets/extra-hdmi.conf        | 158 +++++++++++++++++++++
> 8 files changed, 195 insertions(+), 1 deletion(-)
> create mode 100644 src/modules/alsa/mixer/paths/hdmi-output-0.conf
> create mode 100644 src/modules/alsa/mixer/paths/hdmi-output-1.conf
> create mode 100644 src/modules/alsa/mixer/paths/hdmi-output-2.conf
> create mode 100644 src/modules/alsa/mixer/paths/hdmi-output-3.conf
> create mode 100644 src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
>
>diff --git a/src/Makefile.am b/src/Makefile.am
>index ffe7558..5a8082a 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -83,83 +83,88 @@ AM_CFLAGS = \
> 	-DPA_SYSTEM_STATE_PATH=\"$(PA_SYSTEM_STATE_PATH)\" \
> 	-DAO_REQUIRE_CAS \
> 	-DPULSE_LOCALEDIR=\"$(pulselocaledir)\" \
> 	-DPA_MACHINE_ID=\"$(localstatedir)/lib/dbus/machine-id\" \
>         -DPA_ALSA_PATHS_DIR=\"$(alsapathsdir)\" \
>         -DPA_ALSA_PROFILE_SETS_DIR=\"$(alsaprofilesetsdir)\"
> 
> AM_LIBADD = $(PTHREAD_LIBS) $(INTLLIBS)
> AM_LDADD = $(PTHREAD_LIBS) $(INTLLIBS)
> AM_LDFLAGS = $(NODELETE_LDFLAGS)
> 
> if STATIC_BINS
> BINLDFLAGS = -static
> endif
> 
> if OS_IS_WIN32
> AM_LDFLAGS+=-Wl,--export-all-symbols
> WINSOCK_LIBS=-lwsock32 -lws2_32 -lwininet
> endif
> 
> FOREIGN_CFLAGS = -w
> MODULE_LDFLAGS = -module -disable-static -avoid-version $(LDFLAGS_NOUNDEFINED)
> 
> ###################################
> #          Extra files            #
> ###################################
> 
> ALSA_PROFILES = \
> 		modules/alsa/mixer/profile-sets/default.conf \
> 		modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
>+		modules/alsa/mixer/profile-sets/extra-hdmi.conf \
> 		modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
> 		modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf
> 
> ALSA_PATHS = \
> 		modules/alsa/mixer/paths/analog-input-aux.conf \
> 		modules/alsa/mixer/paths/analog-input.conf \
> 		modules/alsa/mixer/paths/analog-input.conf.common \
> 		modules/alsa/mixer/paths/analog-input-fm.conf \
> 		modules/alsa/mixer/paths/analog-input-internal-mic.conf \
> 		modules/alsa/mixer/paths/analog-input-linein.conf \
> 		modules/alsa/mixer/paths/analog-input-mic.conf \
> 		modules/alsa/mixer/paths/analog-input-mic.conf.common \
> 		modules/alsa/mixer/paths/analog-input-mic-line.conf \
> 		modules/alsa/mixer/paths/analog-input-tvtuner.conf \
> 		modules/alsa/mixer/paths/analog-input-video.conf \
> 		modules/alsa/mixer/paths/analog-output.conf \
> 		modules/alsa/mixer/paths/analog-output-speaker.conf \
> 		modules/alsa/mixer/paths/analog-output.conf.common \
> 		modules/alsa/mixer/paths/analog-output-desktop-speaker.conf \
> 		modules/alsa/mixer/paths/analog-output-headphones.conf \
> 		modules/alsa/mixer/paths/analog-output-headphones-2.conf \
> 		modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \
> 		modules/alsa/mixer/paths/analog-output-mono.conf
>+		modules/alsa/mixer/paths/hdmi-output-0.conf \
>+		modules/alsa/mixer/paths/hdmi-output-1.conf \
>+		modules/alsa/mixer/paths/hdmi-output-2.conf \
>+		modules/alsa/mixer/paths/hdmi-output-3.conf
> 
> EXTRA_DIST = \
> 		pulse/client.conf.in \
> 		pulse/version.h.in \
> 		daemon/daemon.conf.in \
> 		daemon/default.pa.in \
> 		daemon/system.pa.in \
> 		daemon/default.pa.win32 \
> 		depmod.py \
> 		daemon/esdcompat.in \
> 		daemon/start-pulseaudio-x11.in \
> 		daemon/start-pulseaudio-kde.in \
> 		utils/padsp \
> 		modules/module-defs.h.m4 \
> 		daemon/pulseaudio.desktop.in \
> 		daemon/pulseaudio-kde.desktop.in \
> 		map-file \
> 		daemon/pulseaudio-system.conf \
> 		modules/alsa/mixer/profile-sets/90-pulseaudio.rules \
> 		${ALSA_PROFILES} \
> 		${ALSA_PATHS}
> 
> pulseconf_DATA = \
> 		default.pa \
> 		system.pa \
> 		daemon.conf \
> 		client.conf
> 
> dbuspolicy_DATA = \
> 		daemon/pulseaudio-system.conf
>diff --git a/src/modules/alsa/mixer/paths/hdmi-output-0.conf b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
>new file mode 100644
>index 0000000..46ee4fd
>--- /dev/null
>+++ b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
>@@ -0,0 +1,6 @@
>+[General]
>+description = HDMI / DisplayPort
>+priority = 59
>+
>+[Jack HDMI/DP,pcm=3]
>+required-any = any
>diff --git a/src/modules/alsa/mixer/paths/hdmi-output-1.conf b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
>new file mode 100644
>index 0000000..da8fcb4
>--- /dev/null
>+++ b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
>@@ -0,0 +1,6 @@
>+[General]
>+description = HDMI / DisplayPort 2
>+priority = 58
>+
>+[Jack HDMI/DP,pcm=7]
>+required-any = any
>diff --git a/src/modules/alsa/mixer/paths/hdmi-output-2.conf b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
>new file mode 100644
>index 0000000..5fcddc6
>--- /dev/null
>+++ b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
>@@ -0,0 +1,6 @@
>+[General]
>+description = HDMI / DisplayPort 3
>+priority = 57
>+
>+[Jack HDMI/DP,pcm=8]
>+required-any = any
>diff --git a/src/modules/alsa/mixer/paths/hdmi-output-3.conf b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
>new file mode 100644
>index 0000000..8200787
>--- /dev/null
>+++ b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
>@@ -0,0 +1,6 @@
>+[General]
>+description = HDMI / DisplayPort 4
>+priority = 56
>+
>+[Jack HDMI/DP,pcm=9]
>+required-any = any
>diff --git a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
>index b8e88d0..8252910 100644
>--- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
>+++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
>@@ -1,27 +1,33 @@
> # do not edit this file, it will be overwritten on update
> 
> # This file is part of PulseAudio.
> #
> # PulseAudio is free software; you can redistribute it and/or modify
> # it under the terms of the GNU Lesser General Public License as
> # published by the Free Software Foundation; either version 2.1 of the
> # License, or (at your option) any later version.
> #
> # PulseAudio is distributed in the hope that it will be useful, but
> # WITHOUT ANY WARRANTY; without even the implied warranty of
> # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>-# General Public License for more details.
>+# Lesser General Public License for more details.
> #
> # You should have received a copy of the GNU Lesser General Public License
> # along with PulseAudio; if not, write to the Free Software Foundation,
> # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
> 
> SUBSYSTEM!="sound", GOTO="pulseaudio_end"
> ACTION!="change", GOTO="pulseaudio_end"
> KERNEL!="card*", GOTO="pulseaudio_end"
>+SUBSYSTEMS=="usb", GOTO="pulseaudio_check_usb"
> 
> SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1978", ENV{PULSE_PROFILE_SET}="native-instruments-audio8dj.conf"
> SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="0839", ENV{PULSE_PROFILE_SET}="native-instruments-audio4dj.conf"
> SUBSYSTEMS=="usb", ATTRS{idVendor}=="0763", ATTRS{idProduct}=="2012", ENV{PULSE_PROFILE_SET}="maudio-fasttrack-pro.conf"
> 
>+# NVidia and Intel HDAs often have more than one HDMI codec/port on the same card
>+ATTRS{vendor}=="0x10de", ENV{PULSE_PROFILE_SET}="extra-hdmi.conf"
>+ATTRS{vendor}=="0x8086", ENV{PULSE_PROFILE_SET}="extra-hdmi.conf"
>+GOTO="pulseaudio_end"
>+
> LABEL="pulseaudio_end"
>diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
>index 5d352f1..71dd63f 100644
>--- a/src/modules/alsa/mixer/profile-sets/default.conf
>+++ b/src/modules/alsa/mixer/profile-sets/default.conf
>@@ -109,36 +109,37 @@ paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
> priority = 7
> direction = output
> 
> [Mapping iec958-stereo]
> device-strings = iec958:%f
> channel-map = left,right
> priority = 5
> 
> [Mapping iec958-surround-40]
> device-strings = iec958:%f
> channel-map = front-left,front-right,rear-left,rear-right
> priority = 1
> 
> [Mapping iec958-ac3-surround-40]
> device-strings = a52:%f
> channel-map = front-left,front-right,rear-left,rear-right
> priority = 2
> direction = output
> 
> [Mapping iec958-ac3-surround-51]
> device-strings = a52:%f
> channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
> priority = 3
> direction = output
> 
> [Mapping hdmi-stereo]
> device-strings = hdmi:%f
> channel-map = left,right
> priority = 4
> direction = output
>+paths-output = hdmi-output-0
> 
> ; An example for defining multiple-sink profiles
> #[Profile output:analog-stereo+output:iec958-stereo+input:analog-stereo]
> #description = Foobar
> #output-mappings = analog-stereo iec958-stereo
> #input-mappings = analog-stereo
>diff --git a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
>new file mode 100644
>index 0000000..d0bff6a
>--- /dev/null
>+++ b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
>@@ -0,0 +1,158 @@
>+# This file is part of PulseAudio.
>+#
>+# PulseAudio is free software; you can redistribute it and/or modify
>+# it under the terms of the GNU Lesser General Public License as
>+# published by the Free Software Foundation; either version 2.1 of the
>+# License, or (at your option) any later version.
>+#
>+# PulseAudio is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>+# General Public License for more details.
>+#
>+# You should have received a copy of the GNU Lesser General Public License
>+# along with PulseAudio; if not, write to the Free Software Foundation,
>+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
>+
>+; This is a profile for Nvidia and Intel cards - some cards have four HDMI codecs,
>+; and which ones are working seems to vary a lot between GPU boards. In addition,
>+; Nvidia and Intel make southbridges as well, so we need to keep the existing
>+; analog profiles.
>+; (And by not adding all these extra profiles to default.conf, we make sure
>+; there is no performance hit for non-Nvidia/Intel cards.)
>+
>+[General]
>+auto-profiles = yes
>+
>+[Mapping analog-mono]
>+device-strings = hw:%f
>+channel-map = mono
>+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
>+paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
>+priority = 1
>+
>+[Mapping analog-stereo]
>+device-strings = front:%f hw:%f
>+channel-map = left,right
>+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
>+paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
>+priority = 10
>+
>+[Mapping analog-surround-40]
>+device-strings = surround40:%f
>+channel-map = front-left,front-right,rear-left,rear-right
>+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
>+priority = 7
>+direction = output
>+
>+[Mapping analog-surround-41]
>+device-strings = surround41:%f
>+channel-map = front-left,front-right,rear-left,rear-right,lfe
>+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
>+priority = 8
>+direction = output
>+
>+[Mapping analog-surround-50]
>+device-strings = surround50:%f
>+channel-map = front-left,front-right,rear-left,rear-right,front-center
>+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
>+priority = 7
>+direction = output
>+
>+[Mapping analog-surround-51]
>+device-strings = surround51:%f
>+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
>+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
>+priority = 8
>+direction = output
>+
>+[Mapping analog-surround-71]
>+device-strings = surround71:%f
>+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
>+description = Analog Surround 7.1
>+paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
>+priority = 7
>+direction = output
>+
>+[Mapping iec958-stereo]
>+device-strings = iec958:%f
>+channel-map = left,right
>+paths-input = iec958-stereo-input
>+paths-output = iec958-stereo-output
>+priority = 5
>+
>+[Mapping iec958-ac3-surround-40]
>+device-strings = a52:%f
>+channel-map = front-left,front-right,rear-left,rear-right
>+priority = 2
>+direction = output
>+
>+[Mapping iec958-ac3-surround-51]
>+device-strings = a52:%f
>+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
>+priority = 3
>+direction = output
>+
>+[Mapping hdmi-stereo]
>+device-strings = hdmi:%f
>+description = Digital Stereo (HDMI)
>+paths-output = hdmi-output-0
>+channel-map = left,right
>+priority = 4
>+direction = output
>+
>+[Mapping hdmi-surround]
>+description = Digital Surround 5.1 (HDMI)
>+device-strings = hdmi:%f
>+paths-output = hdmi-output-0
>+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
>+priority = 3
>+direction = output
>+
>+[Mapping hdmi-stereo-extra1]
>+description = Digital Stereo (HDMI)
>+device-strings = hdmi:%f,1
>+paths-output = hdmi-output-1
>+channel-map = left,right
>+priority = 2
>+direction = output
>+
>+[Mapping hdmi-surround-extra1]
>+description = Digital Surround 5.1 (HDMI)
>+device-strings = hdmi:%f,1
>+paths-output = hdmi-output-1
>+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
>+priority = 1
>+direction = output
>+
>+[Mapping hdmi-stereo-extra2]
>+description = Digital Stereo (HDMI)
>+device-strings = hdmi:%f,2
>+paths-output = hdmi-output-2
>+channel-map = left,right
>+priority = 2
>+direction = output
>+
>+[Mapping hdmi-surround-extra2]
>+description = Digital Surround 5.1 (HDMI)
>+device-strings = hdmi:%f,2
>+paths-output = hdmi-output-2
>+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
>+priority = 1
>+direction = output
>+
>+[Mapping hdmi-stereo-extra3]
>+description = Digital Stereo (HDMI)
>+device-strings = hdmi:%f,3
>+paths-output = hdmi-output-3
>+channel-map = left,right
>+priority = 2
>+direction = output
>+
>+[Mapping hdmi-surround-extra3]
>+description = Digital Surround 5.1 (HDMI)
>+device-strings = hdmi:%f,3
>+paths-output = hdmi-output-3
>+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
>+priority = 1
>+direction = output
>-- 
>1.9.3
>
>
>From 0a72e1cc6aeede3e1d5ee2eb4b5e6486a14a9da3 Mon Sep 17 00:00:00 2001
>From: "Alexander E. Patrakov" <patrakov@gmail.com>
>Date: Thu, 10 Apr 2014 21:13:43 +0600
>Subject: [PATCH 2/2] Name HDMI outputs uniquely
>
>On Haswell hardware, there are multiple HDMI outputs capable of
>digital sound output. As they were identically named, KDE's control
>center was unable to distinguish them, restored the wrong profile and
>thus routed sound to the wrong HDMI monitor.
>
>Also, having identically-named menu items in other mixer applications
>looks like a bug.
>---
> src/modules/alsa/mixer/profile-sets/extra-hdmi.conf | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
>index d0bff6a..c721d48 100644
>--- a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
>+++ b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
>@@ -83,76 +83,76 @@ priority = 5
> 
> [Mapping iec958-ac3-surround-40]
> device-strings = a52:%f
> channel-map = front-left,front-right,rear-left,rear-right
> priority = 2
> direction = output
> 
> [Mapping iec958-ac3-surround-51]
> device-strings = a52:%f
> channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
> priority = 3
> direction = output
> 
> [Mapping hdmi-stereo]
> device-strings = hdmi:%f
> description = Digital Stereo (HDMI)
> paths-output = hdmi-output-0
> channel-map = left,right
> priority = 4
> direction = output
> 
> [Mapping hdmi-surround]
> description = Digital Surround 5.1 (HDMI)
> device-strings = hdmi:%f
> paths-output = hdmi-output-0
> channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
> priority = 3
> direction = output
> 
> [Mapping hdmi-stereo-extra1]
>-description = Digital Stereo (HDMI)
>+description = Digital Stereo (HDMI 2)
> device-strings = hdmi:%f,1
> paths-output = hdmi-output-1
> channel-map = left,right
> priority = 2
> direction = output
> 
> [Mapping hdmi-surround-extra1]
>-description = Digital Surround 5.1 (HDMI)
>+description = Digital Surround 5.1 (HDMI 2)
> device-strings = hdmi:%f,1
> paths-output = hdmi-output-1
> channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
> priority = 1
> direction = output
> 
> [Mapping hdmi-stereo-extra2]
>-description = Digital Stereo (HDMI)
>+description = Digital Stereo (HDMI 3)
> device-strings = hdmi:%f,2
> paths-output = hdmi-output-2
> channel-map = left,right
> priority = 2
> direction = output
> 
> [Mapping hdmi-surround-extra2]
>-description = Digital Surround 5.1 (HDMI)
>+description = Digital Surround 5.1 (HDMI 3)
> device-strings = hdmi:%f,2
> paths-output = hdmi-output-2
> channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
> priority = 1
> direction = output
> 
> [Mapping hdmi-stereo-extra3]
>-description = Digital Stereo (HDMI)
>+description = Digital Stereo (HDMI 4)
> device-strings = hdmi:%f,3
> paths-output = hdmi-output-3
> channel-map = left,right
> priority = 2
> direction = output
> 
> [Mapping hdmi-surround-extra3]
>-description = Digital Surround 5.1 (HDMI)
>+description = Digital Surround 5.1 (HDMI 4)
> device-strings = hdmi:%f,3
> paths-output = hdmi-output-3
> channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
> priority = 1
> direction = output
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1095750: 898084 | 898085 | 899504 | 899505 | 899506 | 900961