6977966888
- Backport upstream fix patches, including the deadlock fix for aplay/arecord (boo#1031525): 0001-ucm-Add-ATTRIBUTE_UNUSED-for-unused-parameters-of-ex.patch 0002-ucm-parser-needs-limits.h.patch 0003-pcm-direct-allow-users-to-configure-different-period.patch 0004-pcm-dshare-enable-silence.patch 0005-pcm-rate-fix-the-hw_ptr-update-until-the-boundary-av.patch 0006-plugin-dynamically-update-avail_min-on-slave.patch 0007-rate-dynamic-update-avail_min-on-slave.patch 0008-topology-fix-unused-const-variable-warning.patch 0009-seq-improve-documentation-about-new-get-pid-card-fun.patch 0010-pcm-direct-returning-semop-error-code-for-semaphore-.patch 0011-pcm-direct-Fix-for-sync-issue-on-xrun-recover.patch 0012-pcm-direct-check-state-before-enter-poll-on-timer.patch 0013-pcm-direct-don-t-return-bogus-buffer-levels-in-xrun-.patch 0014-conf-ucm-broxton-add-broxton-rt298-conf-files.patch 0015-pcm-direct-Fix-deadlock-in-poll_descriptors.patch 0016-ucm-Assure-the-user-input-card-name-not-to-exceed-ma.patch 0017-ucm-Load-device-specific-configuration-file-based-on.patch 0018-ucm-Add-command-get-_file-to-get-the-config-file-nam.patch 0019-topology-Fix-incorrect-license-in-source-comments.patch 0020-conf-cards-add-support-for-pistachio-card.patch 0021-pcm-multi-Drop-the-fixed-slave_map-in-snd_pcm_multi_.patch 0022-conf-Add-card-config-for-Intel-HDMI-DP-LPE-audio.patch 0023-pcm-Avoid-lock-for-snd_pcm_nonblock.patch 0024-pcm-Disable-locking-in-async-mode.patch 0025-pcm-dmix-Allow-disabling-x86-optimizations.patch 0026-pcm-dmix_rewind-corrupts-application-pointer-fix.patch 0027-pcm-direct-fix-race-on-clearing-timer-events.patch 0028-pcm-file-Enable-file-writing-for-capture-path.patch OBS-URL: https://build.opensuse.org/request/show/483406 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=210
105 lines
2.1 KiB
Diff
105 lines
2.1 KiB
Diff
From 7c2093b1c136e0766116a0b88b565b99176aed19 Mon Sep 17 00:00:00 2001
|
|
From: Boris Brezillon <boris.brezillon@free-electrons.com>
|
|
Date: Thu, 2 Mar 2017 11:49:33 +0100
|
|
Subject: [PATCH 41/43] conf/cards: add VC4-HDMI card
|
|
|
|
Add a conf file for the VC4-HDMI sound card.
|
|
|
|
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
|
Tested-by: Eric Anholt <eric@anholt.net>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/conf/cards/Makefile.am | 1
|
|
src/conf/cards/aliases.conf | 1
|
|
src/conf/cards/vc4-hdmi.conf | 64 +++++++++++++++++++++++++++++++++++++++++++
|
|
3 files changed, 66 insertions(+)
|
|
create mode 100644 src/conf/cards/vc4-hdmi.conf
|
|
|
|
--- a/src/conf/cards/Makefile.am
|
|
+++ b/src/conf/cards/Makefile.am
|
|
@@ -51,6 +51,7 @@ cfg_files = aliases.conf \
|
|
TRID4DWAVENX.conf \
|
|
USB-Audio.conf \
|
|
YMF744.conf \
|
|
+ vc4-hdmi.conf \
|
|
VIA686A.conf \
|
|
VIA8233.conf \
|
|
VIA8233A.conf \
|
|
--- a/src/conf/cards/aliases.conf
|
|
+++ b/src/conf/cards/aliases.conf
|
|
@@ -56,6 +56,7 @@ AV200 cards.CMI8788
|
|
CMI8786 cards.CMI8788
|
|
CMI8787 cards.CMI8788
|
|
pistachio cards.pistachio-card
|
|
+VC4-HDMI cards.vc4-hdmi
|
|
|
|
<confdir:pcm/default.conf>
|
|
<confdir:pcm/dmix.conf>
|
|
--- /dev/null
|
|
+++ b/src/conf/cards/vc4-hdmi.conf
|
|
@@ -0,0 +1,64 @@
|
|
+#
|
|
+# Configuration for the VC4-HDMI sound card using software IEC958
|
|
+# subframe conversion
|
|
+#
|
|
+
|
|
+<confdir:pcm/front.conf>
|
|
+
|
|
+vc4-hdmi.pcm.front.0 {
|
|
+ @args [ CARD ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ }
|
|
+ type hw
|
|
+ card $CARD
|
|
+}
|
|
+
|
|
+# default with dmix
|
|
+vc4-hdmi.pcm.default {
|
|
+ @args [ CARD ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ }
|
|
+ type asym
|
|
+ playback.pcm {
|
|
+ type plug
|
|
+ slave.pcm {
|
|
+ @func concat
|
|
+ strings [ "dmix:" $CARD ]
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+<confdir:pcm/iec958.conf>
|
|
+
|
|
+vc4-hdmi.pcm.iec958.0 {
|
|
+ @args [ CARD AES0 AES1 AES2 AES3 ]
|
|
+ @args.CARD {
|
|
+ type string
|
|
+ }
|
|
+ @args.AES0 {
|
|
+ type integer
|
|
+ }
|
|
+ @args.AES1 {
|
|
+ type integer
|
|
+ }
|
|
+ @args.AES2 {
|
|
+ type integer
|
|
+ }
|
|
+ @args.AES3 {
|
|
+ type integer
|
|
+ }
|
|
+ type iec958
|
|
+ slave {
|
|
+ format IEC958_SUBFRAME_LE
|
|
+ pcm {
|
|
+ type plug
|
|
+ slave.pcm {
|
|
+ type hw
|
|
+ card $CARD
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ status [ $AES0 $AES1 $AES2 $AES3 ]
|
|
+}
|