Skip to contentSkip to conversation

ucm2: hdadsp: add basic ucm config

PATCH Superseded Mateusz Gorski 2 participants 3 messages Mar 13, 2020 – Mar 17, 2020

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ucm2: hdadsp: add basic ucm config

Basic UCM configuration for Intel Skylake SST HDA DSP generic machine driver enabling codec playback and capture on both HDA codec and DMIC ports.

---

Changes in v2:
- addressed Jaroslav hints about v1 patch
- added HiFi and Hdmi use cases
- adjusted to ucm2 syntax

 ucm2/hdadsp/Hdmi1.conf  | 24 +++++++++++
 ucm2/hdadsp/Hdmi2.conf  | 24 +++++++++++
 ucm2/hdadsp/HiFi.conf   | 88 +++++++++++++++++++++++++++++++++++++++++
 ucm2/hdadsp/hdadsp.conf | 21 ++++++++++
 4 files changed, 157 insertions(+)
 create mode 100644 ucm2/hdadsp/Hdmi1.conf
 create mode 100644 ucm2/hdadsp/Hdmi2.conf
 create mode 100644 ucm2/hdadsp/HiFi.conf
 create mode 100644 ucm2/hdadsp/hdadsp.conf
ucm2/hdadsp/Hdmi1.conf new file +24 -0
new file mode 100644
index 0000000..d402dab
@@ -0,0 +1,24 @@
+# Usecase for device HDMI1/Display Port stereo playback on Intel cAVS platforms
+# For Audio in HDA mode
+
+SectionDevice."HDMI1" {
+        Comment "HDMI/Display Port 1 Stereo"
+
+        Value {
+                PlaybackPriority 300
+                PlaybackPCM "hw:${CardId},10"
+                If.1 {
+                        Condition {
+                                Type ControlExists
+                                Control "iface=CARD,name='HDMI/DP,pcm=17 Jack'"
+                        }
+                        True {
+                                JackControl "HDMI/DP,pcm=17 Jack"
+                        }
+                        False {
+                                JackControl "HDMI/DP, pcm=17 Jack"
+                        }
+                }
+        }
+}
+
ucm2/hdadsp/Hdmi2.conf new file +24 -0
new file mode 100644
index 0000000..153bbe1
@@ -0,0 +1,24 @@
+# Usecase for device HDMI2/Display Port stereo playback on Intel cAVS platforms
+# For Audio in HDA mode
+
+SectionDevice."HDMI2" {
+        Comment "HDMI/Display Port 2 Stereo"
+
+        Value {
+                PlaybackPriority 400
+                PlaybackPCM "hw:${CardId},11"
+                If.1 {
+                        Condition {
+                                Type ControlExists
+                                Control "iface=CARD,name='HDMI/DP,pcm=18 Jack'"
+                        }
+                        True {
+                                JackControl "HDMI/DP,pcm=18 Jack"
+                        }
+                        False {
+                                JackControl "HDMI/DP, pcm=18 Jack"
+                        }
+                }
+        }
+}
+
ucm2/hdadsp/HiFi.conf new file +88 -0

88 lines not on this page · raw message

ucm2/hdadsp/hdadsp.conf new file +21 -0
new file mode 100644
index 0000000..a90299f
@@ -0,0 +1,21 @@
+# UCM for Intel CAVS platforms
+# For Audio in HDA and DMIC mode
+
+Syntax 2
+
+SectionUseCase."HiFi" {
+        File "HiFi.conf"
+        Comment "Play HiFi quality Music"
+}
+
+ValueDefaults {
+        PlaybackChannels "2"
+        CaptureChannels "2"
+}
+
+SectionDefaults [
+	cset "name='Master Playback Switch' 1"
+        cset "name='codec0_out mo media0_in mi Switch' 1"
+        cset "name='media0_out mo codec0_in mi Switch' 1"
+	cset "name='mch_cap_out mo mch_cap_in mi Switch' 1"
+]
Signature · 1 line
2.17.1
#1 lore raw

Dne 13. 03. 20 v 12:00 Mateusz Gorski napsal(a):

Quoted 6 lines

Basic UCM configuration for Intel Skylake SST HDA DSP generic machine driver enabling codec playback and capture on both HDA codec and DMIC ports.

---

...

Quoted 9 lines
ucm2/hdadsp/HiFi.conf new file +9 -0
+SectionDevice."Headphones" {
+	Comment "Headphones"
+
+	ConflictingDevice [
+		"Speaker"
+	]
+
+	EnableSequence [
+		cset "name='Headphone Playback Switch' 1,1"

ucm2/hdadsp/HiFi.conf line 33

Quoted 10 lines
ucm2/hdadsp/HiFi.conf new file +10 -0
+		cset "name='Speaker Playback Switch' 0,0"
+	]
+
+	Value [
+		PlaybackPriority 200
+		PlaybackPCM "hw:${CardId},7"
+		JackControl "Front Headphone Jack"
+		JackHWMute "Speaker"
+	]
+}

If there is a volume control, it should be defined via PlaybackMixerElem (like PlaybackMixerElem "Headphone").

ucm2/hdadsp/hdadsp.conf line 14

Quoted 4 lines
ucm2/hdadsp/hdadsp.conf new file +4 -0
+ValueDefaults {
+        PlaybackChannels "2"
+        CaptureChannels "2"
+}

This ValueDefaults {} section with this contents should be removed. The stereo is the default settings.

Jaroslav

Signature · 2 lines
Jaroslav Kysela <[email protected]>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
#2 lore raw
Quoted 23 lines
Quoted 7 lines

Basic UCM configuration for Intel Skylake SST HDA DSP generic machine driver enabling codec playback and capture on both HDA codec and DMIC ports.

---

...

Quoted 13 lines
ucm2/hdadsp/HiFi.conf new file +13 -0
+SectionDevice."Headphones" {
+    Comment "Headphones"
+
+    ConflictingDevice [
+        "Speaker"
+    ]
+
+    EnableSequence [
+        cset "name='Headphone Playback Switch' 1,1"
+        cset "name='Speaker Playback Switch' 0,0"
+    ]
+
+    Value [
Quoted 8 lines
Quoted 6 lines

+        PlaybackPriority 200
+        PlaybackPCM "hw:${CardId},7"
+        JackControl "Front Headphone Jack"
+        JackHWMute "Speaker"
+    ]
+}

If there is a volume control, it should be defined via PlaybackMixerElem (like PlaybackMixerElem "Headphone").

Thanks, added in v3.

Quoted 10 lines

ucm2/hdadsp/hdadsp.conf line 14

Quoted 5 lines
ucm2/hdadsp/hdadsp.conf new file +4 -0
+ValueDefaults {
+        PlaybackChannels "2"
+        CaptureChannels "2"
+}

This ValueDefaults {} section with this contents should be removed. The stereo is the default settings.

                        Jaroslav

Thanks, removed in v3.