Skip to contentSkip to conversation

ucm2: hdadsp: add basic ucm config

PATCH In review Mateusz Gorski 3 participants 3 messages Mar 18, 2020 – May 4, 2020

lore
Share & tools
lore
#0 lore raw

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

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

---

Changes in v4:
- adjusted folder and files names to hda-dsp instead of hdadsp

 ucm2/hda-dsp/Hdmi1.conf   | 24 ++++++++++
 ucm2/hda-dsp/Hdmi2.conf   | 24 ++++++++++
 ucm2/hda-dsp/HiFi.conf    | 96 +++++++++++++++++++++++++++++++++++++++
 ucm2/hda-dsp/hda-dsp.conf | 16 +++++++
 4 files changed, 160 insertions(+)
 create mode 100644 ucm2/hda-dsp/Hdmi1.conf
 create mode 100644 ucm2/hda-dsp/Hdmi2.conf
 create mode 100644 ucm2/hda-dsp/HiFi.conf
 create mode 100644 ucm2/hda-dsp/hda-dsp.conf
ucm2/hda-dsp/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/hda-dsp/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/hda-dsp/HiFi.conf new file +96 -0

96 lines not on this page · raw message

ucm2/hda-dsp/hda-dsp.conf new file +16 -0
new file mode 100644
index 0000000..48c07c8
@@ -0,0 +1,16 @@
+# UCM for Intel CAVS platforms
+# For Audio in HDA and DMIC mode
+
+Syntax 2
+
+SectionUseCase."HiFi" {
+        File "HiFi.conf"
+        Comment "Play HiFi quality Music"
+}
+
+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
Quoted 10 lines · Mateusz Gorski

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

---

Changes in v4:
- adjusted folder and files names to hda-dsp instead of hdadsp

Hello Jaroslav,

Kernel patch series:
[PATCH v6 0/3] Add support for different DMIC configurations

has already been merged by Mark and is now part of Skylake driver. UCM and topology patches are still missing though. I didn't find any review or issue that has not been addressed. Is there anything else you want us to do before merging? Patches have been tested using the exact same scope as kernel ones: Intel AVS platforms, RVP and production both.

Czarek

#2 lore raw

Dne 04. 05. 20 v 12:26 Cezary Rojewski napsal(a):

Quoted 14 lines · Mateusz Gorski
Quoted 10 lines

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

---

Changes in v4:
- adjusted folder and files names to hda-dsp instead of hdadsp

Hello Jaroslav,

Quoted 8 lines

Kernel patch series:
[PATCH v6 0/3] Add support for different DMIC configurations

has already been merged by Mark and is now part of Skylake driver. UCM and topology patches are still missing though. I didn't find any review or issue that has not been addressed. Is there anything else you want us to do before merging? Patches have been tested using the exact same scope as kernel ones: Intel AVS platforms, RVP and production both.

I already merged this:

https://github.com/alsa-project/alsa-ucm-conf/tree/master/ucm2/hda-dsp

I probably forgot to notify you. Thank you.

Jaroslav

Signature · 2 lines
Jaroslav Kysela <[email protected]>
Linux Sound Maintainer; ALSA Project; Red Hat, Inc.