Takashi Iwai
0658f0347a
- Update to alsa-ucm-conf 1.2.2: including previous fixes - Backport recent upstream fixes: SOF, BDW-rt5677 and jack fixes; 0001-sof-bdw-rt5677-initial-port-to-UCM2.patch 0002-ucm2-treewide-JackHWMute-fixes.patch 0003-sof-hda-dsp-Support-systems-without-integrated-graph.patch - Drop obsoleted patches: 0001-sof-hda-dsp-Fix-the-Dmic0-CaptureMixerElem-for-v1.4..patch 0002-sof-hda-dsp-Use-more-strict-names-according-latest-u.patch 0003-README-remove-topologies-note.patch 0004-bytcht-es8316-Fix-missing-including-of-HeadPhones.co.patch 0005-ucm2-fix-the-verb-path-in-chtrt5645-chtrt5645-dmic2..patch 0006-broadwell-rt286-add-support-for-hardware-volume-conf.patch 0007-broxton-rt298-corrections-cleanups.patch 0008-bytcr-rt5640-cleanups-and-corrections.patch 0009-bytcr-rt5651-cleanups-and-corrections.patch 0010-bytcht-cx2072x-cleanups-and-corrections.patch 0011-bytcht-es8316-cleanups-and-corrections.patch 0012-DAISY-I2S-added-back-PCM-devices.patch 0013-DB410c-cleanups-and-corrections.patch 0014-DB820c-cleanups-and-corrections.patch 0015-Dell-WD15-Dock-cleaups-and-corrections.patch 0016-HDA-Intel-HiFi-dual-fixes-and-corrections.patch 0017-cht-bsw-rt5672-fixes-and-corrections.patch 0018-chtnau8824-fixes-and-corrections.patch 0019-skylake-rt286-fixes-and-corrections.patch 0020-SDP4430-corrections-and-fixes.patch 0021-sof-hda-dsp-fix-typo-PlaybackMixerMaster-PlaybackMas.patch 0022-broadwell-rt286-add-correct-prefix-to-Priority-field.patch 0023-GoogleNyan-comment-CaptureControl-what-is-this.patch OBS-URL: https://build.opensuse.org/request/show/784660 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=9
141 lines
3.1 KiB
Diff
141 lines
3.1 KiB
Diff
From 4722f5b3859903521ba0f92a64d86af31083ca50 Mon Sep 17 00:00:00 2001
|
|
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
|
|
Date: Thu, 5 Mar 2020 14:59:56 +0200
|
|
Subject: [PATCH 3/3] sof-hda-dsp: Support systems without integrated graphics
|
|
audio
|
|
|
|
On systems where integrated graphics audio is not present
|
|
or is disabled, the HDMI PCM nodes are disabled. Add rules to
|
|
detect these systems by checking presence of HDMI jack controls
|
|
with UCM2 rules.
|
|
|
|
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
ucm2/sof-hda-dsp/Hdmi.conf | 96 +++++++++++++++++++++++++++++-----------------
|
|
1 file changed, 60 insertions(+), 36 deletions(-)
|
|
|
|
diff --git a/ucm2/sof-hda-dsp/Hdmi.conf b/ucm2/sof-hda-dsp/Hdmi.conf
|
|
index be6cb39945c5..6f2c4aa99db2 100644
|
|
--- a/ucm2/sof-hda-dsp/Hdmi.conf
|
|
+++ b/ucm2/sof-hda-dsp/Hdmi.conf
|
|
@@ -1,55 +1,79 @@
|
|
# Use case Configuration for sof-hda-dsp
|
|
|
|
-SectionDevice."HDMI1" {
|
|
- Comment "HDMI1/DP1 Output"
|
|
+If.hdmi1 {
|
|
+ Condition {
|
|
+ Type ControlExists
|
|
+ Control "iface=CARD,name='HDMI/DP,pcm=3 Jack'"
|
|
+ }
|
|
+ True {
|
|
+ SectionDevice."HDMI1" {
|
|
+ Comment "HDMI1/DP1 Output"
|
|
|
|
- EnableSequence [
|
|
- cset "name='IEC958 Playback Switch' on"
|
|
- ]
|
|
+ EnableSequence [
|
|
+ cset "name='IEC958 Playback Switch' on"
|
|
+ ]
|
|
|
|
- DisableSequence [
|
|
- cset "name='IEC958 Playback Switch' off"
|
|
- ]
|
|
+ DisableSequence [
|
|
+ cset "name='IEC958 Playback Switch' off"
|
|
+ ]
|
|
|
|
- Value {
|
|
- PlaybackPriority 500
|
|
- PlaybackPCM "hw:${CardId},3"
|
|
- JackControl "HDMI/DP,pcm=3 Jack"
|
|
+ Value {
|
|
+ PlaybackPriority 500
|
|
+ PlaybackPCM "hw:${CardId},3"
|
|
+ JackControl "HDMI/DP,pcm=3 Jack"
|
|
+ }
|
|
+ }
|
|
}
|
|
}
|
|
|
|
-SectionDevice."HDMI2" {
|
|
- Comment "HDMI2/DP2 Output"
|
|
+If.hdmi2 {
|
|
+ Condition {
|
|
+ Type ControlExists
|
|
+ Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'"
|
|
+ }
|
|
+ True {
|
|
+ SectionDevice."HDMI2" {
|
|
+ Comment "HDMI2/DP2 Output"
|
|
|
|
- EnableSequence [
|
|
- cset "name='IEC958 Playback Switch',index=1 on"
|
|
- ]
|
|
+ EnableSequence [
|
|
+ cset "name='IEC958 Playback Switch',index=1 on"
|
|
+ ]
|
|
|
|
- DisableSequence [
|
|
- cset "name='IEC958 Playback Switch',index=1 off"
|
|
- ]
|
|
+ DisableSequence [
|
|
+ cset "name='IEC958 Playback Switch',index=1 off"
|
|
+ ]
|
|
|
|
- Value {
|
|
- PlaybackPriority 600
|
|
- PlaybackPCM "hw:${CardId},4"
|
|
- JackControl "HDMI/DP,pcm=4 Jack"
|
|
+ Value {
|
|
+ PlaybackPriority 600
|
|
+ PlaybackPCM "hw:${CardId},4"
|
|
+ JackControl "HDMI/DP,pcm=4 Jack"
|
|
+ }
|
|
+ }
|
|
}
|
|
}
|
|
|
|
-SectionDevice."HDMI3" {
|
|
- Comment "HDMI3/DP3 Output"
|
|
+If.hdmi3 {
|
|
+ Condition {
|
|
+ Type ControlExists
|
|
+ Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'"
|
|
+ }
|
|
+ True {
|
|
+ SectionDevice."HDMI3" {
|
|
+ Comment "HDMI3/DP3 Output"
|
|
|
|
- EnableSequence [
|
|
- cset "name='IEC958 Playback Switch',index=2 on"
|
|
- ]
|
|
+ EnableSequence [
|
|
+ cset "name='IEC958 Playback Switch',index=2 on"
|
|
+ ]
|
|
|
|
- DisableSequence [
|
|
- cset "name='IEC958 Playback Switch',index=2 off"
|
|
- ]
|
|
+ DisableSequence [
|
|
+ cset "name='IEC958 Playback Switch',index=2 off"
|
|
+ ]
|
|
|
|
- Value {
|
|
- PlaybackPriority 700
|
|
- PlaybackPCM "hw:${CardId},5"
|
|
- JackControl "HDMI/DP,pcm=5 Jack"
|
|
+ Value {
|
|
+ PlaybackPriority 700
|
|
+ PlaybackPCM "hw:${CardId},5"
|
|
+ JackControl "HDMI/DP,pcm=5 Jack"
|
|
+ }
|
|
+ }
|
|
}
|
|
}
|
|
--
|
|
2.16.4
|
|
|