]> git.alsa-project.org Git - alsa-lib.git/commitdiff
conf: Remove dmix.direct_memory_access setup
authorTakashi Iwai <tiwai@suse.de>
Wed, 3 May 2017 07:42:02 +0000 (09:42 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 3 May 2017 07:48:15 +0000 (09:48 +0200)
The commit [22eca6468b4a: pcm: dmix: Allow disabling x86
optimizations] introduced the new flag for dmix & co,
direct_memory_access.  However, it turned out that such an addition of
the new flag in the default pcm definition causes an error when it's
used with old alsa-lib codes.  Although the code added here is
correct, per se, and it works as expected, it's not wise to break the
configuration with old stuff -- even if the usage is somehow incorrect
and should be avoided.

Since the usage of the new flag is only for HDMI LPE audio, and the
usage of dmix itself should be limited with that hardware, this patch
removes the setup so that it works with the old alsa-lib again.  We
may introduce the dmix behavior change in a smarter way, e.g. passing
some flag from the hardware driver so that it works more generically
without the manual fiddling of config files.

Bugzilla: http://bugzilla.opensuse.org/show_bug.cgi?id=1037021
Signed-off-by: Takashi Iwai <tiwai@suse.de>
src/conf/cards/HdmiLpeAudio.conf
src/conf/pcm/dmix.conf

index 61bdfeae29176f0443b52268dc5eb30f4e5b5971..dae71facac6d8a10b9056439bfe8ee9d0e362e61 100644 (file)
@@ -20,29 +20,6 @@ HdmiLpeAudio.pcm.front.0 {
        }
 }
 
-# uncached memory reads have a high penalty
-HdmiLpeAudio.dmix.direct_memory_access false
-
-# default with dmix+softvol
-HdmiLpeAudio.pcm.default {
-       @args [ CARD ]
-       @args.CARD {
-               type string
-       }
-       type plug
-       slave.pcm {
-               type softvol
-               slave.pcm {
-                       @func concat
-                       strings [ "dmix:" $CARD ]
-               }
-               control {
-                       name "PCM Playback Volume"
-                       card $CARD
-               }
-       }
-}
-
 <confdir:pcm/surround40.conf>
 <confdir:pcm/surround21.conf>
 <confdir:pcm/surround41.conf>
index 2d3b329e533ae33fb26d3e42ba56e87b509cc2a9..7d0aa0158c429f1245f7a405f1ff825e1f1ff626 100644 (file)
@@ -49,21 +49,6 @@ pcm.!dmix {
                @func refer
                name defaults.pcm.ipc_perm
        }
-       direct_memory_access {
-               @func refer
-               name {
-                       @func concat
-                       strings [
-                               "cards."
-                               {
-                                       @func card_driver
-                                       card $CARD
-                               }
-                               ".dmix.direct_memory_access"
-                       ]
-               }
-               default true
-       }
        slave {
                pcm {
                        type hw