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
52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
From 79a358ae26f74ed9b92b2190d4725325edf0c787 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Pape <apape@de.adit-jv.com>
|
|
Date: Tue, 10 Jan 2017 12:04:09 +0530
|
|
Subject: [PATCH 13/43] pcm: direct: don't return bogus buffer levels in xrun
|
|
state
|
|
|
|
Signed-off-by: Andreas Pape <apape@de.adit-jv.com>
|
|
Signed-off-by: Mounesh Sutar <mounesh_sutar@mentor.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/pcm/pcm_dmix.c | 3 +++
|
|
src/pcm/pcm_dshare.c | 3 +++
|
|
src/pcm/pcm_dsnoop.c | 3 +++
|
|
3 files changed, 9 insertions(+)
|
|
|
|
--- a/src/pcm/pcm_dmix.c
|
|
+++ b/src/pcm/pcm_dmix.c
|
|
@@ -882,6 +882,9 @@ static snd_pcm_sframes_t snd_pcm_dmix_av
|
|
if ((err = snd_pcm_dmix_sync_ptr(pcm)) < 0)
|
|
return err;
|
|
}
|
|
+ if (dmix->state == SND_PCM_STATE_XRUN)
|
|
+ return -EPIPE;
|
|
+
|
|
return snd_pcm_mmap_playback_avail(pcm);
|
|
}
|
|
|
|
--- a/src/pcm/pcm_dshare.c
|
|
+++ b/src/pcm/pcm_dshare.c
|
|
@@ -570,6 +570,9 @@ static snd_pcm_sframes_t snd_pcm_dshare_
|
|
if ((err = snd_pcm_dshare_sync_ptr(pcm)) < 0)
|
|
return err;
|
|
}
|
|
+ if (dshare->state == SND_PCM_STATE_XRUN)
|
|
+ return -EPIPE;
|
|
+
|
|
return snd_pcm_mmap_playback_avail(pcm);
|
|
}
|
|
|
|
--- a/src/pcm/pcm_dsnoop.c
|
|
+++ b/src/pcm/pcm_dsnoop.c
|
|
@@ -454,6 +454,9 @@ static snd_pcm_sframes_t snd_pcm_dsnoop_
|
|
if (err < 0)
|
|
return err;
|
|
}
|
|
+ if (dsnoop->state == SND_PCM_STATE_XRUN)
|
|
+ return -EPIPE;
|
|
+
|
|
return snd_pcm_mmap_capture_avail(pcm);
|
|
}
|
|
|