From b6227d3c09ff3bf02426446875557befea4608e9 Mon Sep 17 00:00:00 2001 From: Ashok Sidipotu Date: Thu, 4 Apr 2024 02:53:32 +0200 Subject: Enable ACP for HDMI on RaspberryPi4. -HDMI dectection is broken on RaspberryPi4, Enable Pipewire-ACP to fix it. -copy the ACP config files as well. Bug-AGL: SPEC-4418 Change-Id: Ice6f2a4417df56b2c00dc067590763a2c847c152 Signed-off-by: Ashok Sidipotu Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29800 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller (cherry picked from commit 5bb3283028af38cba6934be0fb0dc166941504ba) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29857 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- .../recipes-core/packagegroups/packagegroup-pipewire-base.bb | 1 + meta-pipewire/recipes-multimedia/pipewire/pipewire_1.0.0.bb | 2 +- .../wireplumber/wireplumber-config-agl/host.lua.d/30-alsa-monitor.lua | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire-base.bb b/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire-base.bb index 1d20b4705..6237dcf80 100644 --- a/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire-base.bb +++ b/meta-pipewire/recipes-core/packagegroups/packagegroup-pipewire-base.bb @@ -13,4 +13,5 @@ RDEPENDS:${PN} += "\ pipewire-modules-meta \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'pipewire-tools pipewire-spa-tools alsa-utils', '', d)} \ pipewire-alsa \ + pipewire-alsa-card-profile \ " diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire_1.0.0.bb b/meta-pipewire/recipes-multimedia/pipewire/pipewire_1.0.0.bb index 641c97e8f..6fa851caa 100644 --- a/meta-pipewire/recipes-multimedia/pipewire/pipewire_1.0.0.bb +++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire_1.0.0.bb @@ -84,7 +84,7 @@ PACKAGECONFIG ??= "\ # is why these two are marked in their respective packageconfigs # as being in conflict. -PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev" +PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev,,pipewire-alsa-card-profile" PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc" PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native" PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/30-alsa-monitor.lua b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/30-alsa-monitor.lua index 75a169675..d07f7ab85 100644 --- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/30-alsa-monitor.lua +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-config-agl/host.lua.d/30-alsa-monitor.lua @@ -8,7 +8,7 @@ alsa_monitor.properties = { } alsa_monitor.rules = { - -- disable ACP (PulseAudio-like profiles) + -- enable ACP (PulseAudio-like profiles) { matches = { { @@ -16,7 +16,7 @@ alsa_monitor.rules = { }, }, apply_properties = { - ["api.alsa.use-acp"] = false, + ["api.alsa.use-acp"] = true, }, }, -- cgit 1.2.3-korg