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
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 24e63b75275e9c923c336b8dba3919b980e8f234 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Mon, 16 Jan 2017 16:21:52 +0100
|
|
Subject: [PATCH 15/43] pcm: direct: Fix deadlock in poll_descriptors
|
|
|
|
The recent change in PCM direct plugins to check XRUN in
|
|
poll_descriptors callback caused a regression; as consequence, the
|
|
whole playback hangs up.
|
|
|
|
The culprit is a mutex dead lock by the call in snd_pcm_state() inside
|
|
the new snd_pcm_direct_poll_descriptors(). The poll_descriptors code
|
|
path is protected with pcm mutex, thus an unlocked version
|
|
(__snd_pcm_state()) has to be used inside the callback instead.
|
|
|
|
Fixes: 789ee39727a1 ("pcm: direct: check state before enter poll on timer")
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_direct.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/src/pcm/pcm_direct.c
|
|
+++ b/src/pcm/pcm_direct.c
|
|
@@ -676,7 +676,8 @@ int snd_pcm_direct_poll_descriptors(snd_
|
|
}
|
|
|
|
/* this will also evaluate slave state and enter xrun if necessary */
|
|
- switch (snd_pcm_state(pcm)) {
|
|
+ /* using __snd_pcm_state() since this function is called inside lock */
|
|
+ switch (__snd_pcm_state(pcm)) {
|
|
case SND_PCM_STATE_XRUN:
|
|
return -EPIPE;
|
|
default:
|