From c7ca02460761273de0d1a8432c5defaafed43664 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 20 Mar 2023 18:35:15 +0100 Subject: [PATCH] alsa: ucm: Fix spurious mixer path removal on initial profile set The code that removes the mixer path if probing fails can be called in the path that sets a non-off device profile on hotplug *before* card->active_profile is updated, which results in spuriously removing the mixer path. By this point, context->ucm->active_verb would be set to the same as the profile name, so we can use that instead to avoid the issue. On Apple Silicon machines with the UCM profiles in the Asahi Linux repo, this manifests as the headphones jack having hardware volume controls *only* if PA is started with headphones connected and until they are disconnected. Hotplugs end up triggering the bad codepath, and it falls back to software volume (which is particularly a problem when the hardware volume happens to be very low or 0 at that point). Fixes: a9cc1373e2a7 ("alsa: ucm - update the mixer path also after volume probe") Signed-off-by: Hector Martin --- spa/plugins/alsa/acp/alsa-ucm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spa/plugins/alsa/acp/alsa-ucm.c b/spa/plugins/alsa/acp/alsa-ucm.c index 977fa5636..bd71e6337 100644 --- a/spa/plugins/alsa/acp/alsa-ucm.c +++ b/spa/plugins/alsa/acp/alsa-ucm.c @@ -1440,8 +1440,11 @@ void pa_alsa_ucm_add_ports( * pa_alsa_ucm_port_data.path, which is not cleared by probe_volumes() if * the path gets removed, so we have to call update_mixer_paths() here to * unset the cached path if needed. */ - if (card->card.active_profile_index < card->card.n_profiles) - update_mixer_paths(*p, card->card.profiles[card->card.active_profile_index]->name); + if (context->ucm->active_verb) { + const char *verb_name; + verb_name = pa_proplist_gets(context->ucm->active_verb->proplist, PA_ALSA_PROP_UCM_NAME); + update_mixer_paths(*p, verb_name); + } /* then set property PA_PROP_DEVICE_INTENDED_ROLES */ merged_roles = pa_xstrdup(pa_proplist_gets(proplist, PA_PROP_DEVICE_INTENDED_ROLES));