blob: bb318aa06e3d800f223db14fed95d9cb5362b7e2 [file] [log] [blame]
Patrick Williamsf1e5d692016-03-30 15:21:19 -05001From 0136b73158f60d5dc630ae348b18df3b59a2a5c2 Mon Sep 17 00:00:00 2001
2From: Tanu Kaskinen <tanuk@iki.fi>
3Date: Fri, 23 Oct 2015 13:37:11 +0300
4Subject: [PATCH 4/4] alsa: set availability for (some) unavailable profiles
5
6The alsa card hasn't so far set any availability for profiles. That
7caused an issue with some HDMI hardware: the sound card has two HDMI
8outputs, but only the second of them is actually usable. The
9unavailable port is marked as unavailable and the available port is
10marked as available, but this information isn't propagated to the
11profile availability. Without profile availability information, the
12initial profile policy picks the unavailable one, since it has a
13higher priority value.
14
15This patch adds simple logic for marking some profiles unavailable:
16if the profile only contains unavailable ports, the profile is
17unavailable too. This can be improved in the future so that if a
18profile contains sinks or sources that only contain unavailable ports,
19the profile should be marked as unavailable. Implementing that
20requires adding more information about the sinks and sources to
21pa_card_profile, however.
22
23BugLink: https://bugzilla.yoctoproject.org/show_bug.cgi?id=8448
24
25Upstream-Status: Submitted [http://lists.freedesktop.org/archives/pulseaudio-discuss/2015-October/024614.html]
26Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
27---
28 src/modules/alsa/module-alsa-card.c | 24 ++++++++++++++++++++++++
29 1 file changed, 24 insertions(+)
30
31diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
32index 5b39654..73a846c 100644
33--- a/src/modules/alsa/module-alsa-card.c
34+++ b/src/modules/alsa/module-alsa-card.c
35@@ -366,6 +366,7 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask) {
36 void *state;
37 pa_alsa_jack *jack;
38 pa_device_port *port;
39+ pa_card_profile *profile;
40
41 pa_assert(u);
42
43@@ -396,6 +397,29 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask) {
44 }
45 report_port_state(port, u);
46 }
47+
48+ /* Update profile availabilities. The logic could be improved; for now we
49+ * only set obviously unavailable profiles (those that contain only
50+ * unavailable ports) to PA_AVAILABLE_NO and all others to
51+ * PA_AVAILABLE_UNKNOWN. */
52+ PA_HASHMAP_FOREACH(profile, u->card->profiles, state) {
53+ void *state2;
54+ pa_available_t available = PA_AVAILABLE_NO;
55+
56+ /* Don't touch the "off" profile. */
57+ if (pa_hashmap_size(profile->ports) == 0)
58+ continue;
59+
60+ PA_HASHMAP_FOREACH(port, profile->ports, state2) {
61+ if (port->available != PA_AVAILABLE_NO) {
62+ available = PA_AVAILABLE_UNKNOWN;
63+ break;
64+ }
65+ }
66+
67+ pa_card_profile_set_available(profile, available);
68+ }
69+
70 return 0;
71 }
72
73--
742.1.4
75